Increase camera preview frame size and other changes.

+ Increase camera preview frame size and align it to the left of the screen.
+ Move thumbnail to the lower left corner of the preview frame.
+ Move GPS indicator to the lower right corner of the preview frame.
+ Replace LinearLayout and negative margin with RelativeLayout.
+ Revise the look of the settings wheel based on new UI mock.
+ Add border to preview frame.
+ Make settings popup windows align with an invisible view in the root view.
  This makes it easier to adjust the location of the popup windows.

Bug: 3156693

Change-Id: I8843fec803f8418699df7e425ea74af708b4ea99

1 files changed, 10 insertions, 1 deletions

diff --git a/src/com/android/camera/PreviewFrameLayout.java b/src/com/android/camera/PreviewFrameLayout.java
index 4ceb58c..982e088 100644
--- a/src/com/android/camera/PreviewFrameLayout.java
+++ b/src/com/android/camera/PreviewFrameLayout.java
@@ -38,6 +38,7 @@ public class PreviewFrameLayout extends RelativeLayout {
 
     private double mAspectRatio = 4.0 / 3.0;
     private View mFrame;
+    private View mBorderView;
     private RadioGroup mCameraPicker;
     private OnSizeChangedListener mSizeListener;
     private final DisplayMetrics mMetrics = new DisplayMetrics();
@@ -61,6 +62,14 @@ public class PreviewFrameLayout extends RelativeLayout {
                     "must provide child with id as \"frame\"");
         }
         mCameraPicker = (RadioGroup) findViewById(R.id.camera_picker);
+
+        View preview = (View) findViewById(R.id.camera_preview);
+        ViewGroup.MarginLayoutParams params = (ViewGroup.MarginLayoutParams)
+                preview.getLayoutParams();
+        mBorderView = (View) findViewById(R.id.preview_border);
+        View f = mBorderView;
+        params.setMargins(f.getPaddingLeft(), f.getPaddingTop(), f.getPaddingRight(), f.getPaddingBottom());
+        preview.setLayoutParams(params);
     }
 
     public void setAspectRatio(double ratio) {
@@ -77,7 +86,7 @@ public class PreviewFrameLayout extends RelativeLayout {
         int frameWidth = getWidth();
         int frameHeight = getHeight();
 
-        View f = mFrame;
+        View f = mBorderView;
         int horizontalPadding = f.getPaddingLeft() + f.getPaddingRight();
         int verticalPadding = f.getPaddingBottom() + f.getPaddingTop();
         int previewHeight = frameHeight - verticalPadding;