feifei-123
diff --git a/‎.idea/compiler.xml‎
Lines changed: 22 additions & 0 deletions b/‎.idea/compiler.xml‎
Lines changed: 22 additions & 0 deletions
diff --git a/‎.idea/copyright/profiles_settings.xml‎
Lines changed: 3 additions & 0 deletions b/‎.idea/copyright/profiles_settings.xml‎
Lines changed: 3 additions & 0 deletions
diff --git a/‎.idea/inspectionProfiles/Project_Default.xml‎
Lines changed: 0 additions & 36 deletions b/‎.idea/inspectionProfiles/Project_Default.xml‎
Lines changed: 0 additions & 36 deletions
diff --git a/‎.idea/misc.xml‎
Lines changed: 1 addition & 1 deletion b/‎.idea/misc.xml‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎.idea/modules.xml‎
Lines changed: 1 addition & 0 deletions b/‎.idea/modules.xml‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎app/build.gradle‎
Lines changed: 3 additions & 5 deletions b/‎app/build.gradle‎
Lines changed: 3 additions & 5 deletions
diff --git a/‎app/src/main/AndroidManifest.xml‎
Lines changed: 0 additions & 1 deletion b/‎app/src/main/AndroidManifest.xml‎
Lines changed: 0 additions & 1 deletion
diff --git a/‎app/src/main/res/layout/activity_main.xml‎
Lines changed: 2 additions & 2 deletions b/‎app/src/main/res/layout/activity_main.xml‎
Lines changed: 2 additions & 2 deletions
diff --git a/‎audiorecoder/build.gradle‎
Lines changed: 3 additions & 5 deletions b/‎audiorecoder/build.gradle‎
Lines changed: 3 additions & 5 deletions
diff --git a/‎audiorecoder/src/main/AndroidManifest.xml‎
Lines changed: 0 additions & 1 deletion b/‎audiorecoder/src/main/AndroidManifest.xml‎
Lines changed: 0 additions & 1 deletion
@@ -4,6 +4,7 @@ android {
     compileSdkVersion 27
     defaultConfig {
         applicationId "com.example.feifei.myexamplecode"
+        buildToolsVersion "24.0.1"
         minSdkVersion 15
         targetSdkVersion 27
         versionCode 1
@@ -16,12 +17,9 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    buildToolsVersion '25.0.0'
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+
 }
@@ -6,7 +6,6 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name=".MainActivity">
 
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
@@ -15,4 +15,4 @@
         app:layout_constraintRight_toRightOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-</android.support.constraint.ConstraintLayout>
+</LinearLayout>
@@ -7,6 +7,7 @@ android {
 
     defaultConfig {
         applicationId "com.example.audiorecoder"
+        buildToolsVersion '24.0.1'
         minSdkVersion 15
         targetSdkVersion 21
         versionCode 1
@@ -23,13 +24,10 @@ android {
         }
     }
 
+    buildToolsVersion '25.0.0'
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
+    fileTree(dir: 'libs', include: ['*.jar'])
 
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
 }
@@ -10,7 +10,6 @@
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name=".MainActivity"
Original file line number	Diff line number	Diff line change
`@@ -4,6 +4,7 @@ android {`
`4`	`4`	`compileSdkVersion 27`
`5`	`5`	`defaultConfig {`
`6`	`6`	`applicationId "com.example.feifei.myexamplecode"`
	`7`	`+ buildToolsVersion "24.0.1"`
`7`	`8`	`minSdkVersion 15`
`8`	`9`	`targetSdkVersion 27`
`9`	`10`	`versionCode 1`
`@@ -16,12 +17,9 @@ android {`
`16`	`17`	`proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'`
`17`	`18`	`}`
`18`	`19`	`}`
	`20`	`+ buildToolsVersion '25.0.0'`
`19`	`21`	`}`
`20`	`22`
`21`	`23`	`dependencies {`
`22`		`- implementation fileTree(dir: 'libs', include: ['*.jar'])`
`23`		`- implementation 'com.android.support.constraint:constraint-layout:1.0.2'`
`24`		`- testImplementation 'junit:junit:4.12'`
`25`		`- androidTestImplementation 'com.android.support.test:runner:1.0.1'`
`26`		`- androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'`
	`24`	`+`
`27`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -7,6 +7,7 @@ android {`
`7`	`7`
`8`	`8`	`defaultConfig {`
`9`	`9`	`applicationId "com.example.audiorecoder"`
	`10`	`+ buildToolsVersion '24.0.1'`
`10`	`11`	`minSdkVersion 15`
`11`	`12`	`targetSdkVersion 21`
`12`	`13`	`versionCode 1`
`@@ -23,13 +24,10 @@ android {`
`23`	`24`	`}`
`24`	`25`	`}`
`25`	`26`
	`27`	`+ buildToolsVersion '25.0.0'`
`26`	`28`	`}`
`27`	`29`
`28`	`30`	`dependencies {`
`29`		`- implementation fileTree(dir: 'libs', include: ['*.jar'])`
	`31`	`+ fileTree(dir: 'libs', include: ['*.jar'])`
`30`	`32`
`31`		`- implementation 'com.android.support.constraint:constraint-layout:1.0.2'`
`32`		`- testImplementation 'junit:junit:4.12'`
`33`		`- androidTestImplementation 'com.android.support.test:runner:1.0.1'`
`34`		`- androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'`
`35`	`33`	`}`