summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornicolasroard <nicolasroard@google.com>2013-09-24 14:20:04 -0700
committernicolasroard <nicolasroard@google.com>2013-09-24 14:21:05 -0700
commit7432c528b1185983fef8c2abbc4d8a1355cdcc50 (patch)
tree21cd3140e33831db8c408c63f6c160cdefee2858
parent1a65cb127c8002d8be57e767147d86bd131c556c (diff)
downloadandroid_packages_apps_Gallery2-7432c528b1185983fef8c2abbc4d8a1355cdcc50.zip
android_packages_apps_Gallery2-7432c528b1185983fef8c2abbc4d8a1355cdcc50.tar.gz
android_packages_apps_Gallery2-7432c528b1185983fef8c2abbc4d8a1355cdcc50.tar.bz2
Fix style for crop activity
bug:10786662 Change-Id: Ie104b8ba2484455ad5cdf90d8c26157480143b0b
-rw-r--r--AndroidManifest.xml2
-rw-r--r--res/layout/crop_activity.xml3
-rw-r--r--res/values/styles.xml8
3 files changed, 10 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 2c28010..41eb461 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -266,7 +266,7 @@
<activity
android:name="com.android.gallery3d.filtershow.crop.CropActivity"
android:label="@string/crop"
- android:theme="@style/Theme.FilterShow"
+ android:theme="@style/Theme.Crop"
android:configChanges="keyboardHidden|orientation|screenSize">
<intent-filter android:label="@string/crop_label">
<action android:name="com.android.camera.action.CROP" />
diff --git a/res/layout/crop_activity.xml b/res/layout/crop_activity.xml
index 9ff223f..0620cf4 100644
--- a/res/layout/crop_activity.xml
+++ b/res/layout/crop_activity.xml
@@ -18,8 +18,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:id="@+id/mainView"
- android:background="@drawable/filtershow_tiled_background">
+ android:id="@+id/mainView">
<LinearLayout
android:id="@+id/mainPanel"
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 58c87ce..33dcbec 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -31,6 +31,14 @@
<style name="Theme.FilterShow" parent="Theme.Gallery">
<item name="android:windowBackground">@null</item>
</style>
+ <style name="Theme.Crop" parent="Theme.GalleryBase">
+ <item name="android:displayOptions"></item>
+ <item name="android:windowContentOverlay">@null</item>
+ <item name="android:actionBarStyle">@style/Holo.ActionBar</item>
+ <item name="android:colorBackground">@null</item>
+ <item name="android:colorBackgroundCacheHint">@null</item>
+ <item name="android:windowBackground">@drawable/filtershow_tiled_background</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>