diff options
| author | nicolasroard <nicolasroard@google.com> | 2012-11-28 21:00:06 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-11-28 21:00:06 -0800 |
| commit | b25cb64654eda734fef66a4706a4ee8e51e374a3 (patch) | |
| tree | dfccf75e31d898fb2e863645cc7612ae283a2c6b | |
| parent | 69a77e9e8a34806615e4a04303a65b4782473dd6 (diff) | |
| parent | 68e4ae64380e2c9843faaec63b98ba51479c0f11 (diff) | |
| download | android_packages_apps_Gallery2-b25cb64654eda734fef66a4706a4ee8e51e374a3.tar.gz android_packages_apps_Gallery2-b25cb64654eda734fef66a4706a4ee8e51e374a3.tar.bz2 android_packages_apps_Gallery2-b25cb64654eda734fef66a4706a4ee8e51e374a3.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 9bec84b3c..4447ec4ee 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> |