snap: UI checkpoint #2

 * Fix bugs from previous commit
 * Factor out recording controls
 * Clean up layouts
 * Asynchronous control for video module
 * Performance improvements

Change-Id: I9d5833cecbd9280845b740ee8a3c47f023470625

1 files changed, 13 insertions, 1 deletions

diff --git a/src/com/android/camera/util/CameraUtil.java b/src/com/android/camera/util/CameraUtil.java
index 653cc9a8d..5af83bcf9 100644
--- a/src/com/android/camera/util/CameraUtil.java
+++ b/src/com/android/camera/util/CameraUtil.java
@@ -44,6 +44,7 @@ import android.telephony.TelephonyManager;
 import android.text.TextUtils;
 import android.util.DisplayMetrics;
 import android.util.Log;
+import android.util.Pair;
 import android.util.TypedValue;
 import android.view.Display;
 import android.view.OrientationEventListener;
@@ -83,7 +84,7 @@ import java.util.TreeSet;
  * Collection of utility functions used in this package.
  */
 public class CameraUtil {
-    private static final String TAG = "Util";
+    private static final String TAG = "CAM_Util";
 
     // For calculate the best fps range for still image capture.
     private final static int MAX_PREVIEW_FPS_TIMES_1000 = 400000;
@@ -1285,6 +1286,17 @@ public class CameraUtil {
         return ".3gp";
     }
 
+    public static Pair<Integer, Integer> calculateMargins(Activity activity) {
+        Point size = new Point();
+        activity.getWindowManager().getDefaultDisplay().getRealSize(size);
+        int l = size.x > size.y ? size.x : size.y;
+        int tm = activity.getResources().getDimensionPixelSize(R.dimen.preview_top_margin);
+        int bm = activity.getResources().getDimensionPixelSize(R.dimen.preview_bottom_margin);
+        int top = l / 4 * tm / (tm + bm);
+        int bottom = l / 4 - top;
+        return Pair.create(top, bottom);
+    }
+
     /**
      * Compares two {@code Size}s based on their areas.
      */