From 2deb6f518822055f4b60bbe8afabc938a9023cc9 Mon Sep 17 00:00:00 2001
From: cretin45 <cretin45@gmail.com>
Date: Sun, 14 Dec 2014 09:21:04 -0800
Subject: Gallery2: Materialization

- Material theme
- FAB
- New Icon
- Add missing resources for movie settings
- Fix action mode
- Vector drawables

Change-Id: I9c8cc81759502a417a5585fd1d3fd9b61e0bd68b
---
 AndroidManifest.xml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 4c9bf20cb..8b15d6cd0 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -24,7 +24,7 @@
 
     <original-package android:name="com.android.gallery3d" />
 
-    <uses-sdk android:minSdkVersion="14" android:targetSdkVersion="17" />
+    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="21" />
 
     <permission android:name="com.android.gallery3d.permission.GALLERY_PROVIDER"
             android:protectionLevel="signatureOrSystem" />
@@ -116,8 +116,9 @@
              </intent-filter>
         </activity>
 
-        <activity android:name="com.android.gallery3d.app.GalleryActivity" android:label="@string/app_name"
-                android:configChanges="keyboardHidden|orientation|screenSize">
+        <activity android:name="com.android.gallery3d.app.GalleryActivity"
+                  android:label="@string/app_name"
+                  android:configChanges="keyboardHidden|orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
@@ -195,8 +196,7 @@
 
         <!-- This activity acts as a trampoline to the new Gallery activity,
              so that existing shortcuts are preserved. -->
-        <activity android:name="com.android.gallery3d.app.Gallery"
-            android:theme="@style/android:Theme.NoDisplay">
+        <activity android:name="com.android.gallery3d.app.Gallery">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.DEFAULT" />
-- 
cgit v1.2.3