From 9cd730836cb40d66d98db893eca28e94b14500cd Mon Sep 17 00:00:00 2001
From: nicolasroard <nicolasroard@google.com>
Date: Wed, 28 Nov 2012 19:11:42 -0800
Subject: Fix overdraw in FilterShow activity

bug:7634701
Change-Id: I2da3e3fdb1ef853fa1a0340a1697e5a013ee87f2
---
 AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b8b4461b0..0ef4fba34 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -231,7 +231,7 @@
         <activity
             android:name="com.android.gallery3d.filtershow.FilterShowActivity"
             android:label="@string/title_activity_filter_show"
-            android:theme="@style/Theme.Gallery"
+            android:theme="@style/Theme.FilterShow"
             android:configChanges="keyboardHidden|orientation|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.EDIT" />
-- 
cgit v1.2.3


From d10468b65396dd1fa4f20006fa8cea1221cc613c Mon Sep 17 00:00:00 2001
From: Your Name <jreck@google.com>
Date: Mon, 3 Dec 2012 14:14:19 -0800
Subject: Change themes

 Bug: 7587841

Change-Id: Ie283c23015ae94ba6eeb69ba55a0523899718d4e
---
 AndroidManifest.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'AndroidManifest.xml')

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b8b4461b0..43e4e173a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -394,7 +394,7 @@
             </intent-filter>
         </activity>
         <activity android:name="com.android.camera.ProxyLauncher"
-                android:theme="@android:style/Theme.NoDisplay">
+                android:theme="@style/Theme.ProxyLauncher">
         </activity>
     </application>
 </manifest>
-- 
cgit v1.2.3