Merge pull request #4 from proppy/fix-lint

hello-jni/gl2: fix lint warning
android · Jun 18, 2015 · 26bf00b · 26bf00b
2 parents 89ee228 + f1692be
commit 26bf00b
Show file tree

Hide file tree

Showing 10 changed files with 4 additions and 4 deletions.
diff --git a/hello-gl2/app/src/main/AndroidManifest.xml b/hello-gl2/app/src/main/AndroidManifest.xml
@@ -20,7 +20,10 @@
 
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.android.gl2jni">
+    <uses-feature android:glEsVersion="0x00020000"/>
     <application
+            android:icon="@mipmap/ic_launcher"
+            android:allowBackup="false"
             android:label="@string/gl2jni_activity">
         <activity android:name="GL2JNIActivity"
                 android:theme="@android:style/Theme.NoTitleBar.Fullscreen"
@@ -32,6 +35,4 @@
             </intent-filter>
         </activity>
     </application>
-    <uses-feature android:glEsVersion="0x00020000"/>
-    <uses-sdk android:minSdkVersion="5"/>
 </manifest>
diff --git a/hello-gl2/app/src/main/res/mipmap-hdpi/ic_launcher.png b/hello-gl2/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/hello-gl2/app/src/main/res/mipmap-mdpi/ic_launcher.png b/hello-gl2/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/hello-gl2/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/hello-gl2/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/hello-gl2/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/hello-gl2/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
diff --git a/hello-jni/app/src/main/AndroidManifest.xml b/hello-jni/app/src/main/AndroidManifest.xml
@@ -3,9 +3,8 @@
       package="com.example.hellojni"
       android:versionCode="1"
       android:versionName="1.0">
-    <uses-sdk android:minSdkVersion="3" />
     <application android:label="@string/app_name"
-                 android:debuggable="true">
+                 android:icon="@mipmap/ic_launcher">
         <activity android:name=".HelloJni"
                   android:label="@string/app_name">
             <intent-filter>

diff --git a/hello-jni/app/src/main/res/mipmap-hdpi/ic_launcher.png b/hello-jni/app/src/main/res/mipmap-hdpi/ic_launcher.png
diff --git a/hello-jni/app/src/main/res/mipmap-mdpi/ic_launcher.png b/hello-jni/app/src/main/res/mipmap-mdpi/ic_launcher.png
diff --git a/hello-jni/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/hello-jni/app/src/main/res/mipmap-xhdpi/ic_launcher.png
diff --git a/hello-jni/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/hello-jni/app/src/main/res/mipmap-xxhdpi/ic_launcher.png