Add a black bar symmetric to nav bar

Also fix bug: 8323926
Change-Id: I4886b285dee8ad71ad72a55e96bf699b7c18c9f4

1 files changed, 13 insertions, 16 deletions

diff --git a/src/com/android/camera/CameraActivity.java b/src/com/android/camera/CameraActivity.java
index b1f0847d8..24c49ba8a 100644
--- a/src/com/android/camera/CameraActivity.java
+++ b/src/com/android/camera/CameraActivity.java
@@ -117,6 +117,8 @@ public class CameraActivity extends ActivityBase
     }
 
     public void init() {
+        boolean landscape = Util.getDisplayRotation(this) % 180 == 90;
+        setMargins(landscape);
         mControlsBackground = findViewById(R.id.blocker);
         mCameraControls = findViewById(R.id.camera_controls);
         mShutter = (ShutterButton) findViewById(R.id.shutter_button);
@@ -316,28 +318,22 @@ public class CameraActivity extends ActivityBase
     @Override
     public void onConfigurationChanged(Configuration config) {
         super.onConfigurationChanged(config);
+        boolean landscape = (config.orientation == Configuration.ORIENTATION_LANDSCAPE);
+        setMargins(landscape);
+        mCurrentModule.onConfigurationChanged(config);
+    }
 
+    private void setMargins(boolean landscape) {
         ViewGroup appRoot = (ViewGroup) findViewById(R.id.content);
-        boolean landscape = (config.orientation == Configuration.ORIENTATION_LANDSCAPE);
         FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) appRoot.getLayoutParams();
-        int offset = getResources().getDimensionPixelSize(R.dimen.margin_systemui_offset);
+        int navBarWidth = getResources().getDimensionPixelSize(R.dimen.navigation_bar_width);
         int navBarHeight = getResources().getDimensionPixelSize(R.dimen.navigation_bar_height);
         if (landscape) {
-            lp.rightMargin = offset;
+            lp.setMargins(navBarHeight, 0, navBarHeight - navBarWidth, 0);
         } else {
-            lp.rightMargin = 0;
+            lp.setMargins(0, navBarHeight, 0, 0);
         }
         appRoot.setLayoutParams(lp);
-
-        // Set padding to move camera controls away from the edge of the screen
-        // so that they are in the same place as if there was a navigation bar between
-        // the screen edge and the controls
-        if (landscape) {
-            mCameraControls.setPadding(navBarHeight, 0, 0, 0);
-        } else {
-            mCameraControls.setPadding(0, navBarHeight, 0, 0);
-        }
-        mCurrentModule.onConfigurationChanged(config);
     }
 
     @Override
@@ -478,9 +474,10 @@ public class CameraActivity extends ActivityBase
         }
         if ((mSwitcher != null) && mSwitcher.showsPopup() && !mSwitcher.isInsidePopup(m)) {
             return mSwitcher.onTouch(null, m);
+        } else if ((mSwitcher != null) && mSwitcher.isInsidePopup(m)) {
+            return superDispatchTouchEvent(m);
         } else {
-            return mCameraControls.dispatchTouchEvent(m)
-                    || mCurrentModule.dispatchTouchEvent(m);
+            return mCurrentModule.dispatchTouchEvent(m);
         }
     }