diff options
author | Danny Baumann <dannybaumann@web.de> | 2016-01-14 11:36:38 +0100 |
---|---|---|
committer | Gerrit Code Review <gerrit@cyanogenmod.org> | 2016-01-15 01:47:05 -0800 |
commit | 2233950e703e2532b01f9f2893d9f7d8f5845cb1 (patch) | |
tree | 7557bf4eee6074750db8913fc4aa008de36c2280 /src/com/android/camera/CameraActivity.java | |
parent | 607a2f0b99886cb07b2d2b042d38bfb26da0f166 (diff) | |
download | android_packages_apps_Snap-2233950e703e2532b01f9f2893d9f7d8f5845cb1.tar.gz android_packages_apps_Snap-2233950e703e2532b01f9f2893d9f7d8f5845cb1.tar.bz2 android_packages_apps_Snap-2233950e703e2532b01f9f2893d9f7d8f5845cb1.zip |
CameraActivity: Don't hide navigation bar
* Make it transparent instead.
Change-Id: I08b06ac72d88aaf62ae7f52a3dde9ba865bc3542
Diffstat (limited to 'src/com/android/camera/CameraActivity.java')
-rw-r--r-- | src/com/android/camera/CameraActivity.java | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index 09cb46707..8e0c144c1 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -100,6 +100,7 @@ import com.android.camera.data.MediaDetails; import com.android.camera.data.SimpleViewData; import com.android.camera.exif.ExifInterface; import com.android.camera.tinyplanet.TinyPlanetFragment; +import com.android.camera.ui.CameraRootView; import com.android.camera.ui.ModuleSwitcher; import com.android.camera.ui.DetailsDialog; import com.android.camera.ui.FilmStripView; @@ -189,7 +190,7 @@ public class CameraActivity extends Activity private int mCurrentModuleIndex; private CameraModule mCurrentModule; private FrameLayout mAboveFilmstripControlLayout; - private View mCameraModuleRootView; + private CameraRootView mCameraModuleRootView; private FilmStripView mFilmStripView; private ProgressBar mBottomProgress; private View mPanoStitchingPanel; @@ -632,7 +633,6 @@ public class CameraActivity extends Activity | (visible ? View.SYSTEM_UI_FLAG_VISIBLE : View.SYSTEM_UI_FLAG_LOW_PROFILE | View.SYSTEM_UI_FLAG_FULLSCREEN - | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY); if (newSystemUIVisibility != currentSystemUIVisibility) { decorView.setSystemUiVisibility(newSystemUIVisibility); @@ -1414,7 +1414,7 @@ public class CameraActivity extends Activity LayoutInflater inflater = getLayoutInflater(); View rootLayout = inflater.inflate(R.layout.camera, null, false); - mCameraModuleRootView = rootLayout.findViewById(R.id.camera_app_root); + mCameraModuleRootView = (CameraRootView) rootLayout.findViewById(R.id.camera_app_root); int moduleIndex = -1; if (MediaStore.INTENT_ACTION_VIDEO_CAMERA.equals(getIntent().getAction()) @@ -1932,6 +1932,10 @@ public class CameraActivity extends Activity private void openModule(CameraModule module) { module.init(this, mCameraModuleRootView); + // Re-apply the last fitSystemWindows() run. Our views rely on this, but + // the framework's ActionBarOverlayLayout effectively prevents this if the + // actual insets haven't changed. + mCameraModuleRootView.redoFitSystemWindows(); module.onResumeBeforeSuper(); module.onResumeAfterSuper(); } |