Merge "Switch to using theme for translucent nav bars" into jb-ub-now-indigo-rose

This commit is contained in:
Michael Jurka 2013-10-08 19:37:25 +00:00 committed by Android (Google) Code Review
commit fba9084816
3 changed files with 1 additions and 4 deletions

View File

@ -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">

View File

@ -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() {

View File

@ -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);