diff options
| -rw-r--r-- | src/com/android/camera/CameraActivity.java | 21 | ||||
| -rw-r--r-- | src/com/android/camera/ui/CameraRootView.java | 28 |
2 files changed, 13 insertions, 36 deletions
diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java index b18f4e993..d4a72055d 100644 --- a/src/com/android/camera/CameraActivity.java +++ b/src/com/android/camera/CameraActivity.java @@ -93,12 +93,6 @@ public class CameraActivity extends Activity private static final String TAG = "CAM_Activity"; - /** - * The visibility flags to use to switch the system in either lights-out - * mode (pre-K) or hideybar mode (K and up). - */ - private static final int IMMERSIVE_FLAGS = getImmersiveFlags(); - private static final String INTENT_ACTION_STILL_IMAGE_CAMERA_SECURE = "android.media.action.STILL_IMAGE_CAMERA_SECURE"; public static final String ACTION_IMAGE_CAPTURE_SECURE = @@ -287,19 +281,6 @@ public class CameraActivity extends Activity mOnActionBarVisibilityListener = listener; } - private static int getImmersiveFlags() { - if (ApiHelper.HAS_HIDEYBARS) { - return View.SYSTEM_UI_FLAG_IMMERSIVE - | View.SYSTEM_UI_FLAG_TRANSPARENT_STATUS - | View.SYSTEM_UI_FLAG_TRANSPARENT_NAVIGATION - | View.SYSTEM_UI_FLAG_HIDE_NAVIGATION - | View.SYSTEM_UI_FLAG_FULLSCREEN; - } else { - // Pre-KitKat we use lights-out mode. - return View.SYSTEM_UI_FLAG_LOW_PROFILE; - } - } - public static boolean isFirstStartAfterScreenOn() { return sFirstStartAfterScreenOn; } @@ -453,7 +434,7 @@ public class CameraActivity extends Activity if (visible != currentlyVisible) { int visibility = DEFAULT_SYSTEM_UI_VISIBILITY | (visible ? View.SYSTEM_UI_FLAG_VISIBLE - : IMMERSIVE_FLAGS); + : View.SYSTEM_UI_FLAG_LOW_PROFILE); 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 35a585e92..83f2dd8f4 100644 --- a/src/com/android/camera/ui/CameraRootView.java +++ b/src/com/android/camera/ui/CameraRootView.java @@ -27,9 +27,8 @@ import android.util.AttributeSet; import android.view.View; import android.widget.FrameLayout; -import com.android.camera.CameraActivity; -import com.android.camera.util.CameraUtil; import com.android.camera.util.ApiHelper; +import com.android.camera.util.CameraUtil; @SuppressLint("NewApi") public class CameraRootView extends FrameLayout { @@ -56,22 +55,19 @@ public class CameraRootView extends FrameLayout { @Override protected boolean fitSystemWindows(Rect insets) { - if (!ApiHelper.HAS_HIDEYBARS) { - mCurrentInsets = insets; - // insets include status bar, navigation bar, etc - // In this case, we are only concerned with the size of nav bar - if (mOffset > 0) { - return true; - } - - if (insets.bottom > 0) { - mOffset = insets.bottom; - } else if (insets.right > 0) { - mOffset = insets.right; - } + mCurrentInsets = insets; + // insets include status bar, navigation bar, etc + // In this case, we are only concerned with the size of nav bar + if (mOffset > 0) { return true; } - return super.fitSystemWindows(insets); + + if (insets.bottom > 0) { + mOffset = insets.bottom; + } else if (insets.right > 0) { + mOffset = insets.right; + } + return true; } public void initDisplayListener() { |