From 8c0570c14eb9cc72a86c191b90b1ff626a8aa039 Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Tue, 30 Apr 2013 15:34:19 -0700
Subject: Update capture animation

  Bug: 8253060

Update preview thumb margins and size
Add touch target for thumbnail

Change-Id: I2b298de330834c42a55b4cb082148d971727f530
---
 res/layout-land/camera_controls.xml    |  8 ++++++++
 res/layout-port/camera_controls.xml    |  7 +++++++
 res/values-land/dimensions.xml         |  2 +-
 res/values-sw360dp-land/dimensions.xml | 18 ++++++++++++++++++
 res/values-sw360dp/dimensions.xml      | 18 ++++++++++++++++++
 res/values-sw600dp/dimens.xml          |  2 ++
 6 files changed, 54 insertions(+), 1 deletion(-)
 create mode 100644 res/values-sw360dp-land/dimensions.xml
 create mode 100644 res/values-sw360dp/dimensions.xml

(limited to 'res')

diff --git a/res/layout-land/camera_controls.xml b/res/layout-land/camera_controls.xml
index e99c0cb0c..04841a013 100644
--- a/res/layout-land/camera_controls.xml
+++ b/res/layout-land/camera_controls.xml
@@ -57,4 +57,12 @@
             android:focusable="true"
             android:scaleType="center"
             android:src="@drawable/btn_new_shutter" />
+
+        <View
+            android:id="@+id/preview_thumb"
+            android:visibility="invisible"
+            android:layout_width="@dimen/capture_size"
+            android:layout_height="@dimen/capture_size"
+            android:layout_gravity="top|right" />
+
 </com.android.camera.ui.CameraControls>
diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml
index 77a19e9e6..4ed9e63c3 100644
--- a/res/layout-port/camera_controls.xml
+++ b/res/layout-port/camera_controls.xml
@@ -58,4 +58,11 @@
             android:scaleType="center"
             android:src="@drawable/btn_new_shutter" />
 
+        <View
+            android:id="@+id/preview_thumb"
+            android:visibility="invisible"
+            android:layout_width="@dimen/capture_size"
+            android:layout_height="@dimen/capture_size"
+            android:layout_gravity="top|right" />
+
 </com.android.camera.ui.CameraControls>
\ No newline at end of file
diff --git a/res/values-land/dimensions.xml b/res/values-land/dimensions.xml
index b15017978..3eae85647 100644
--- a/res/values-land/dimensions.xml
+++ b/res/values-land/dimensions.xml
@@ -16,5 +16,5 @@
 <resources>
     <!-- for manage cache bar -->
     <dimen name="manage_cache_bottom_height">39dp</dimen>
-    <dimen name="capture_margin_top">8dip</dimen>
+    <dimen name="capture_top_margin">0dip</dimen>
 </resources>
diff --git a/res/values-sw360dp-land/dimensions.xml b/res/values-sw360dp-land/dimensions.xml
new file mode 100644
index 000000000..fe3e6f5ed
--- /dev/null
+++ b/res/values-sw360dp-land/dimensions.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <dimen name="capture_margin_top">8dip</dimen>
+</resources>
diff --git a/res/values-sw360dp/dimensions.xml b/res/values-sw360dp/dimensions.xml
new file mode 100644
index 000000000..b18b93417
--- /dev/null
+++ b/res/values-sw360dp/dimensions.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2013 The Android Open Source Project
+
+     Licensed under the Apache License, Version 2.0 (the "License");
+     you may not use this file except in compliance with the License.
+     You may obtain a copy of the License at
+
+          http://www.apache.org/licenses/LICENSE-2.0
+
+     Unless required by applicable law or agreed to in writing, software
+     distributed under the License is distributed on an "AS IS" BASIS,
+     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+     See the License for the specific language governing permissions and
+     limitations under the License.
+-->
+<resources>
+    <dimen name="capture_margin_top">16dip</dimen>
+</resources>
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index ce506cc17..59d86d900 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -20,4 +20,6 @@
     <dimen name="setting_item_icon_width">@dimen/setting_item_icon_width_large</dimen>
     <dimen name="onscreen_indicators_height">@dimen/onscreen_indicators_height_large</dimen>
     <dimen name="shutter_offset">-33dp</dimen>
+    <dimen name="capture_size">80dip</dimen>
+    <dimen name="capture_top_margin">16dip</dimen>
 </resources>
-- 
cgit v1.2.3