Properly respect navigation bar size when laying out menus.

For top level menus, add padding so all menu items can be scrolled to
not be covered by the navigation bar. For sub menus, place them to not
be covered by the navigation bar.

Change-Id: I22961c19b7bf80a26eec03b5feabfda10e910669

1 files changed, 11 insertions, 14 deletions

diff --git a/src/com/android/camera/VideoMenu.java b/src/com/android/camera/VideoMenu.java
index 5abb727ee..15d1839cb 100644
--- a/src/com/android/camera/VideoMenu.java
+++ b/src/com/android/camera/VideoMenu.java
@@ -38,6 +38,7 @@ import android.widget.LinearLayout;
 import android.widget.FrameLayout;
 import android.widget.FrameLayout.LayoutParams;
 
+import com.android.camera.ui.CameraRootView;
 import com.android.camera.ui.ListSubMenu;
 import com.android.camera.ui.ListMenu;
 import com.android.camera.ui.TimeIntervalPopup;
@@ -47,8 +48,6 @@ import org.codeaurora.snapcam.R;
 import android.widget.HorizontalScrollView;
 import android.widget.Toast;
 import android.view.ViewGroup;
-import android.view.WindowManager;
-import android.view.Display;
 import com.android.camera.ui.RotateLayout;
 import com.android.camera.util.CameraUtil;
 import android.text.TextUtils;
@@ -549,8 +548,6 @@ public class VideoMenu extends MenuController
         if (!mIsDefaultToPortrait) {
             rotation = (rotation + 90) % 360;
         }
-        WindowManager wm = (WindowManager) mActivity.getSystemService(Context.WINDOW_SERVICE);
-        Display display = wm.getDefaultDisplay();
         CharSequence[] entries = pref.getEntries();
 
         Resources r = mActivity.getResources();
@@ -581,22 +578,23 @@ public class VideoMenu extends MenuController
                 gridRes, null, false);
 
         mUI.dismissSceneModeMenu();
-        LinearLayout previewMenuLayout = new LinearLayout(mActivity);
-        mUI.setPreviewMenuLayout(previewMenuLayout);
+        mUI.setPreviewMenuLayout(basic);
         ViewGroup.LayoutParams params = null;
+        CameraRootView rootView = mUI.getRootView();
         if (portrait) {
             params = new ViewGroup.LayoutParams(size, LayoutParams.MATCH_PARENT);
-            previewMenuLayout.setLayoutParams(params);
-            ((ViewGroup) mUI.getRootView()).addView(previewMenuLayout);
         } else {
             params = new ViewGroup.LayoutParams(LayoutParams.MATCH_PARENT, size);
-            previewMenuLayout.setLayoutParams(params);
-            ((ViewGroup) mUI.getRootView()).addView(previewMenuLayout);
-            previewMenuLayout.setY(display.getHeight() - size);
+
+            int rootViewBottom = rootView.getClientRectForOrientation(rotation).bottom;
+            basic.setY(rootViewBottom - size);
         }
-        basic.setLayoutParams(new FrameLayout.LayoutParams(LayoutParams.MATCH_PARENT,
-                LayoutParams.MATCH_PARENT));
+        basic.setLayoutParams(params);
+        rootView.addView(basic);
+
         LinearLayout layout = (LinearLayout) basic.findViewById(R.id.layout);
+        Rect insets = rootView.getInsetsForOrientation(rotation);
+        layout.setPadding(insets.left, insets.top, insets.right, insets.bottom);
 
         final View[] views = new View[entries.length];
         int init = pref.getCurrentIndex();
@@ -635,7 +633,6 @@ public class VideoMenu extends MenuController
             label.setText(entries[i]);
             layout.addView(layout2);
         }
-        previewMenuLayout.addView(basic);
         mPreviewMenu = basic;
     }