summaryrefslogtreecommitdiffstats
path: root/AndroidManifest.xml
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2012-11-28 21:00:00 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-28 21:00:00 -0800
commit5e388fd3f5e9e80f8a484b5ec703139cb60f685f (patch)
tree6fd869781825d9b092ef0fdcb77084ba19e3d1bc /AndroidManifest.xml
parente3d06c85a047bc37c2ef3bb599da07ec036a2a5d (diff)
parent68e4ae64380e2c9843faaec63b98ba51479c0f11 (diff)
downloadandroid_packages_apps_Gallery2-5e388fd3f5e9e80f8a484b5ec703139cb60f685f.tar.gz
android_packages_apps_Gallery2-5e388fd3f5e9e80f8a484b5ec703139cb60f685f.tar.bz2
android_packages_apps_Gallery2-5e388fd3f5e9e80f8a484b5ec703139cb60f685f.zip
am 68e4ae64: Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches
* commit '68e4ae64380e2c9843faaec63b98ba51479c0f11': Fix overdraw in FilterShow activity
Diffstat (limited to 'AndroidManifest.xml')
-rw-r--r--AndroidManifest.xml2
1 files changed, 1 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e465479a6..25fe9dd9b 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -235,7 +235,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" />