diff options
| author | nicolasroard <nicolasroard@google.com> | 2012-11-28 20:58:35 -0800 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-11-28 20:58:35 -0800 |
| commit | 68e4ae64380e2c9843faaec63b98ba51479c0f11 (patch) | |
| tree | c01627e3921d8cd1dabf32f56783247b95e3bce6 | |
| parent | 3507b925ce1edb2563c076d2d9f01bfadf9f61e5 (diff) | |
| parent | 9cd730836cb40d66d98db893eca28e94b14500cd (diff) | |
| download | android_packages_apps_Gallery2-68e4ae64380e2c9843faaec63b98ba51479c0f11.tar.gz android_packages_apps_Gallery2-68e4ae64380e2c9843faaec63b98ba51479c0f11.tar.bz2 android_packages_apps_Gallery2-68e4ae64380e2c9843faaec63b98ba51479c0f11.zip | |
Merge "Fix overdraw in FilterShow activity" into gb-ub-photos-arches
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | res/values/styles.xml | 4 |
2 files changed, 5 insertions, 1 deletions
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" /> diff --git a/res/values/styles.xml b/res/values/styles.xml index c534ad895..df150e105 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -28,6 +28,10 @@ <item name="android:colorBackground">@null</item> <item name="android:colorBackgroundCacheHint">@null</item> </style> + <style name="Theme.FilterShow" parent="Theme.Gallery"> + <item name="android:windowBackground">@null</item> + <item name="android:windowContentOverlay">@null</item> + </style> <style name="Holo.ActionBar" parent="android:Widget.Holo.ActionBar"> <item name="android:displayOptions">useLogo|showHome</item> <item name="android:background">@drawable/actionbar_translucent</item> |