diff options
| author | nicolasroard <nicolasroard@google.com> | 2012-11-28 21:00:00 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-28 21:00:00 -0800 |
| commit | 5e388fd3f5e9e80f8a484b5ec703139cb60f685f (patch) | |
| tree | 6fd869781825d9b092ef0fdcb77084ba19e3d1bc | |
| parent | e3d06c85a047bc37c2ef3bb599da07ec036a2a5d (diff) | |
| parent | 68e4ae64380e2c9843faaec63b98ba51479c0f11 (diff) | |
| download | android_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
| -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 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" /> diff --git a/res/values/styles.xml b/res/values/styles.xml index 0a2689e71..92d164835 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> |