diff options
author | Sascha Haeberling <haeberling@google.com> | 2013-10-01 02:36:39 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-10-01 02:36:40 +0000 |
commit | 4d21fc2e3f7e7e64e5910b9ee4f6b7662a441427 (patch) | |
tree | 728d8df0953314d44a3c3d3f734275123a3604d1 /src | |
parent | 4feabff8b87e1b71e8040dbcd6289a313bf9f593 (diff) | |
parent | 0156d9179bb9ba8718b25ee05985a7c71e5578c7 (diff) | |
download | android_packages_apps_Snap-4d21fc2e3f7e7e64e5910b9ee4f6b7662a441427.tar.gz android_packages_apps_Snap-4d21fc2e3f7e7e64e5910b9ee4f6b7662a441427.tar.bz2 android_packages_apps_Snap-4d21fc2e3f7e7e64e5910b9ee4f6b7662a441427.zip |
Merge "Show status bar in filmstrip mode" into gb-ub-photos-carlsbad
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/camera/CameraActivity.java | 2 | ||||
-rw-r--r-- | src/com/android/camera/ui/CameraRootView.java | 2 | ||||
-rw-r--r-- | src/com/android/camera/ui/FilmStripView.java | 5 |
3 files changed, 1 insertions, 8 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 21be8e740..e8e34327a 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -432,7 +432,7 @@ public class CameraActivity extends Activity if (visible != currentlyVisible) { int visibility = DEFAULT_SYSTEM_UI_VISIBILITY | (visible ? View.SYSTEM_UI_FLAG_VISIBLE - : View.SYSTEM_UI_FLAG_LOW_PROFILE); + : View.SYSTEM_UI_FLAG_LOW_PROFILE | View.SYSTEM_UI_FLAG_FULLSCREEN); mAboveFilmstripControlLayout.setSystemUiVisibility(visibility); if (visible) { mActionBar.show(); diff --git a/src/com/android/camera/ui/CameraRootView.java b/src/com/android/camera/ui/CameraRootView.java index 83f2dd8f4..1e4708ec7 100644 --- a/src/com/android/camera/ui/CameraRootView.java +++ b/src/com/android/camera/ui/CameraRootView.java @@ -49,8 +49,6 @@ public class CameraRootView extends FrameLayout { public CameraRootView(Context context, AttributeSet attrs) { super(context, attrs); initDisplayListener(); - setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION - | View.SYSTEM_UI_FLAG_LAYOUT_STABLE); } @Override diff --git a/src/com/android/camera/ui/FilmStripView.java b/src/com/android/camera/ui/FilmStripView.java index f28637c9d..955b904bf 100644 --- a/src/com/android/camera/ui/FilmStripView.java +++ b/src/com/android/camera/ui/FilmStripView.java @@ -636,11 +636,6 @@ public class FilmStripView extends ViewGroup implements BottomControlsListener { } private void init(CameraActivity cameraActivity) { - // This is for positioning camera controller at the same place in - // different orientations. - setSystemUiVisibility(View.SYSTEM_UI_FLAG_LAYOUT_FULLSCREEN - | View.SYSTEM_UI_FLAG_LAYOUT_HIDE_NAVIGATION); - setWillNotDraw(false); mActivity = cameraActivity; mScale = 1.0f; |