diff options
author | Michael Jurka <mikejurka@google.com> | 2013-10-08 19:37:25 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-08 19:37:26 +0000 |
commit | fba90848168dcff3d31b1acb3bcf45c6b5daa9cd (patch) | |
tree | b88cd5c347d46c9d0d7f6cd93fc3c71a8e43d3ca | |
parent | 38848ca3a9527e62eef1816770d25e7382cc4e4e (diff) | |
parent | 507250cfb797eee52356c6a82cedc7038f91a090 (diff) | |
download | android_packages_apps_Trebuchet-fba90848168dcff3d31b1acb3bcf45c6b5daa9cd.tar.gz android_packages_apps_Trebuchet-fba90848168dcff3d31b1acb3bcf45c6b5daa9cd.tar.bz2 android_packages_apps_Trebuchet-fba90848168dcff3d31b1acb3bcf45c6b5daa9cd.zip |
Merge "Switch to using theme for translucent nav bars" into jb-ub-now-indigo-rose
-rw-r--r-- | res/values/styles.xml | 1 | ||||
-rw-r--r-- | src/com/android/launcher3/WallpaperCropActivity.java | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/WallpaperPickerActivity.java | 2 |
3 files changed, 1 insertions, 4 deletions
diff --git a/res/values/styles.xml b/res/values/styles.xml index 9f2a105f3..42704df29 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -22,6 +22,7 @@ <item name="android:actionBarStyle">@style/WallpaperCropperActionBar</item> <item name="android:windowFullscreen">true</item> <item name="android:windowActionBarOverlay">true</item> + <item name="android:windowTranslucentNavigation">true</item> </style> <style name="WallpaperCropperActionBar" parent="android:style/Widget.Holo.ActionBar"> diff --git a/src/com/android/launcher3/WallpaperCropActivity.java b/src/com/android/launcher3/WallpaperCropActivity.java index 78c8964b6..fe09a552c 100644 --- a/src/com/android/launcher3/WallpaperCropActivity.java +++ b/src/com/android/launcher3/WallpaperCropActivity.java @@ -102,8 +102,6 @@ public class WallpaperCropActivity extends Activity { cropImageAndSetWallpaper(imageUri, null, finishActivityWhenDone); } }); - TranslucentDecor transparentDecor = new TranslucentDecor(findViewById(R.id.wallpaper_root)); - transparentDecor.requestTranslucentDecor(true); } public boolean enableRotation() { diff --git a/src/com/android/launcher3/WallpaperPickerActivity.java b/src/com/android/launcher3/WallpaperPickerActivity.java index 82c9977c7..708d63095 100644 --- a/src/com/android/launcher3/WallpaperPickerActivity.java +++ b/src/com/android/launcher3/WallpaperPickerActivity.java @@ -181,8 +181,6 @@ public class WallpaperPickerActivity extends WallpaperCropActivity { protected void init() { setContentView(R.layout.wallpaper_picker); final WallpaperRootView root = (WallpaperRootView) findViewById(R.id.wallpaper_root); - TranslucentDecor transparentDecor = new TranslucentDecor(root); - transparentDecor.requestTranslucentDecor(true); mCropView = (CropView) findViewById(R.id.cropView); mWallpaperStrip = findViewById(R.id.wallpaper_strip); |