diff options
| author | nicolasroard <nicolasroard@google.com> | 2013-09-24 14:20:04 -0700 |
|---|---|---|
| committer | nicolasroard <nicolasroard@google.com> | 2013-09-24 14:21:05 -0700 |
| commit | 7432c528b1185983fef8c2abbc4d8a1355cdcc50 (patch) | |
| tree | 21cd3140e33831db8c408c63f6c160cdefee2858 | |
| parent | 1a65cb127c8002d8be57e767147d86bd131c556c (diff) | |
| download | android_packages_apps_Gallery2-7432c528b1185983fef8c2abbc4d8a1355cdcc50.tar.gz android_packages_apps_Gallery2-7432c528b1185983fef8c2abbc4d8a1355cdcc50.tar.bz2 android_packages_apps_Gallery2-7432c528b1185983fef8c2abbc4d8a1355cdcc50.zip | |
Fix style for crop activity
bug:10786662
Change-Id: Ie104b8ba2484455ad5cdf90d8c26157480143b0b
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | res/layout/crop_activity.xml | 3 | ||||
| -rw-r--r-- | res/values/styles.xml | 8 |
3 files changed, 10 insertions, 3 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 2c280106f..41eb461ba 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 9ff223f04..0620cf4d9 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 58c87ce98..33dcbecb6 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> |