snap: UX improvements v1

 * Make the camera controls do sane things- get rid of the
   manual placement of every widget and use layouts
 * Animate everything correctly
 * Show ripples when clicking the shutter
 * Clean up a metric ton of dead code
 * Moved more code into BaseUI
 * Make setting up the camera controls less verbose and magical
 * Fixed up panorama layout

Change-Id: Iaed44ca0201a2e2641e1c2460d3ff9ec3eae2d85

11 files changed, 168 insertions, 84 deletions

diff --git a/res/anim/switcher_enter.xml b/res/anim/switcher_enter.xml
new file mode 100644
index 000000000..91653a25b
--- /dev/null
+++ b/res/anim/switcher_enter.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2009, 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.
+-->
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+        android:interpolator="@android:anim/decelerate_interpolator"
+        android:fromAlpha="0.0" android:toAlpha="1.0" android:duration="400" />
diff --git a/res/anim/switcher_exit.xml b/res/anim/switcher_exit.xml
new file mode 100644
index 000000000..252581608
--- /dev/null
+++ b/res/anim/switcher_exit.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (c) 2009, 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.
+-->
+<alpha xmlns:android="http://schemas.android.com/apk/res/android"
+        android:interpolator="@android:anim/accelerate_interpolator"
+        android:fromAlpha="1.0" android:toAlpha="0.0" android:duration="400" />
diff --git a/res/drawable/camera_controls_bg_opaque.xml b/res/drawable/camera_controls_bg_opaque.xml
new file mode 100644
index 000000000..b86cd047d
--- /dev/null
+++ b/res/drawable/camera_controls_bg_opaque.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/camera_controls_ripple"
+        android:radius="@dimen/bottom_bar_ripple_radius">
+    <item android:drawable="@color/camera_controls_bg_opaque" />
+</ripple>
diff --git a/res/drawable/camera_controls_bg_translucent.xml b/res/drawable/camera_controls_bg_translucent.xml
new file mode 100644
index 000000000..a03ebe0ae
--- /dev/null
+++ b/res/drawable/camera_controls_bg_translucent.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/camera_controls_ripple"
+        android:radius="@dimen/bottom_bar_ripple_radius">
+    <item android:drawable="@color/camera_controls_bg_translucent" />
+</ripple>
diff --git a/res/drawable/camera_controls_bg_transparent.xml b/res/drawable/camera_controls_bg_transparent.xml
new file mode 100644
index 000000000..490028523
--- /dev/null
+++ b/res/drawable/camera_controls_bg_transparent.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<ripple xmlns:android="http://schemas.android.com/apk/res/android"
+        android:color="@color/camera_controls_ripple"
+        android:radius="@dimen/bottom_bar_ripple_radius">
+    <item android:drawable="@color/camera_controls_bg_transparent" />
+</ripple>
diff --git a/res/layout/camera_controls.xml b/res/layout/camera_controls.xml
index 3f097425f..524198713 100644
--- a/res/layout/camera_controls.xml
+++ b/res/layout/camera_controls.xml
@@ -18,12 +18,53 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent" >
 
-    <View
-        android:id="@+id/blocker"
+    <LinearLayout
+        android:id="@+id/top_bar"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/switcher_size"
-        android:layout_gravity="bottom"
-        android:clickable="true" />
+        android:layout_height="0dp"
+        android:gravity="center_vertical"
+        android:orientation="horizontal">
+
+        <com.android.camera.ui.RotateImageView
+            android:id="@+id/menu"
+            style="@style/MenuButton"
+            android:contentDescription="@string/accessibility_menu_button"
+            android:layout_weight="1"
+            android:src="@drawable/ic_settings" />
+
+        <com.android.camera.ui.RotateImageView
+            android:id="@+id/front_back_switcher"
+            android:layout_weight="1"
+            style="@style/MenuButton" />
+
+        <com.android.camera.ui.RotateImageView
+            android:id="@+id/hdr_switcher"
+            android:layout_weight="1"
+            style="@style/MenuButton" />
+
+        <com.android.camera.ui.RotateImageView
+            android:id="@+id/ts_makeup_switcher"
+            android:layout_weight="1"
+            style="@style/MenuButton" />
+
+        <com.android.camera.ui.RotateImageView
+            android:id="@+id/filter_mode_switcher"
+            android:layout_weight="1"
+            style="@style/MenuButton" />
+
+        <com.android.camera.ui.RotateImageView
+            android:id="@+id/mute_button"
+            android:layout_weight="1"
+            style="@style/MenuButton"
+            android:contentDescription="@string/mute_button_desc"
+            android:src="@drawable/ic_unmuted_button" />
+
+        <com.android.camera.ui.RotateImageView
+            android:id="@+id/scene_mode_switcher"
+            android:layout_weight="1"
+            style="@style/MenuButton" />
+
+    </LinearLayout>
 
     <include
         android:layout_width="64dip"
@@ -33,80 +74,63 @@
         android:layout_marginRight="-8dip"
         layout="@layout/menu_indicators" />
 
-    <com.android.camera.ui.RotateImageView
-        android:id="@+id/filter_mode_switcher"
-        style="@style/ToggleButton" />
-
-    <com.android.camera.ui.RotateImageView
-        android:id="@+id/mute_button"
-        style="@style/MenuButton"
-        android:contentDescription="@string/mute_button_desc"
-        android:src="@drawable/ic_unmuted_button" />
-
-    <com.android.camera.ui.ModuleSwitcher
-        android:id="@+id/camera_switcher"
-        style="@style/SwitcherButton"
-        android:layout_gravity="bottom|left"
-        android:layout_marginBottom="2dip"
-        android:scaleType="center"
-        android:contentDescription="@string/accessibility_mode_picker" />
-
-    <com.android.camera.ShutterButton
-        android:id="@+id/shutter_button"
-        android:layout_width="@dimen/shutter_size"
-        android:layout_height="@dimen/shutter_size"
-        android:layout_gravity="bottom|center_horizontal"
-        android:layout_marginBottom="@dimen/shutter_offset"
-        android:layout_marginTop="@dimen/shutter_offset_top"
-        android:clickable="true"
-        android:contentDescription="@string/accessibility_shutter_button"
-        android:focusable="true"
-        android:scaleType="fitCenter"
-        android:src="@drawable/btn_new_shutter" />
-
-    <ImageView
-        android:id="@+id/video_button"
-        android:visibility="invisible"
-        android:layout_width="@dimen/shutter_size"
-        android:layout_height="@dimen/shutter_size"
-        android:layout_gravity="bottom|center_horizontal"
-        android:layout_marginBottom="@dimen/shutter_offset"
-        android:clickable="true"
-        android:contentDescription="@string/accessibility_shutter_button"
-        android:focusable="true"
-        android:scaleType="fitCenter"
-        android:src="@drawable/btn_new_shutter_video" />
-
-    <com.android.camera.ui.RotateImageView
-        android:id="@+id/preview_thumb"
-        android:layout_width="@dimen/capture_size"
-        android:layout_height="@dimen/capture_size"
-        android:layout_gravity="top|right"
-        android:background="@android:color/transparent"
-        android:contentDescription="@string/switch_photo_filmstrip"
-        android:scaleType="fitCenter" />
-
-    <com.android.camera.ui.RotateImageView
-        android:id="@+id/front_back_switcher"
-        style="@style/ToggleButton" />
-
-    <com.android.camera.ui.RotateImageView
-        android:id="@+id/hdr_switcher"
-        style="@style/ToggleButton" />
-
-    <com.android.camera.ui.RotateImageView
-        android:id="@+id/scene_mode_switcher"
-        style="@style/ToggleButton" />
-
-    <com.android.camera.ui.RotateImageView
-        android:id="@+id/menu"
-        style="@style/MenuButton"
-        android:contentDescription="@string/accessibility_menu_button"
-        android:src="@drawable/ic_settings" />
-
-    <com.android.camera.ui.RotateImageView
-        android:id="@+id/ts_makeup_switcher"
-        style="@style/ToggleButton" />
+    <LinearLayout
+        android:id="@+id/bottom_bar"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        android:gravity="center_vertical"
+        android:weightSum="3"
+        android:orientation="horizontal">
+
+		<com.android.camera.ui.RotateImageView
+			android:id="@+id/preview_thumb"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:layout_weight="1"
+            android:layout_gravity="center"
+			android:background="@android:color/transparent"
+			android:contentDescription="@string/switch_photo_filmstrip"
+            android:elevation="1dp"
+			android:scaleType="fitCenter" />
+
+		<com.android.camera.ShutterButton
+			android:id="@+id/shutter_button"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+            android:layout_gravity="center"
+			android:clickable="true"
+			android:contentDescription="@string/accessibility_shutter_button"
+			android:focusable="true"
+			android:scaleType="fitCenter"
+			android:layout_weight="1"
+            android:elevation="1dp"
+			android:src="@drawable/btn_new_shutter" />
+
+		<ImageView
+			android:id="@+id/video_button"
+			android:visibility="gone"
+			android:layout_width="0dp"
+			android:layout_height="wrap_content"
+			android:clickable="true"
+			android:contentDescription="@string/accessibility_shutter_button"
+			android:focusable="true"
+			android:scaleType="fitCenter"
+			android:layout_weight="1"
+            android:layout_gravity="center"
+            android:elevation="1dp"
+			android:src="@drawable/btn_new_shutter_video" />
+
+        <com.android.camera.ui.ModuleSwitcher
+            android:id="@+id/camera_switcher"
+            style="@style/SwitcherButton"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:scaleType="center"
+            android:layout_weight="1"
+            android:layout_gravity="center"
+            android:elevation="1dp"
+            android:contentDescription="@string/accessibility_mode_picker" />
+	</LinearLayout>
 
     <LinearLayout
         android:id="@+id/remaining_photos"
diff --git a/res/layout/list_menu.xml b/res/layout/list_menu.xml
index dd4354456..636e08064 100644
--- a/res/layout/list_menu.xml
+++ b/res/layout/list_menu.xml
@@ -30,6 +30,7 @@
     android:layout_width="@dimen/big_setting_popup_window_width"
     android:layout_height="wrap_content"
     android:background="@color/popup_background"
+    android:elevation="10dp"
     android:scrollbars="none" >
 
 </com.android.camera.ui.ListMenu>
diff --git a/res/layout/pano_module_capture.xml b/res/layout/pano_module_capture.xml
index ad34cf808..9f53ff102 100644
--- a/res/layout/pano_module_capture.xml
+++ b/res/layout/pano_module_capture.xml
@@ -23,7 +23,7 @@
         android:id="@+id/pano_preview_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
-        android:layout_gravity="center" >
+        android:layout_gravity="center_vertical|center_horizontal" >
 
         <TextureView
             android:id="@+id/pano_preview_textureview"
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 2f9ff101e..05c7834d4 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -70,15 +70,16 @@
     <color name="face_detect_fail">@color/red</color>
     <color name="focus_color">#ffffffff</color>
     <color name="gray">@color/grey</color>
+    <color name="camera_controls_bg_opaque">#1b1b1b</color>
+    <color name="camera_controls_bg_translucent">#401b1b1b</color>
+    <color name="camera_controls_bg_transparent">#101b1b1b</color>
+    <color name="camera_controls_ripple">#ff4285f4</color>
 
     <color name="setting_list_selected">#40fafafa</color>
     <color name="setting_list_pressed">#60fafafa</color>
     <color name="list_divider_color">#e0212121</color>
     <color name="scene_item_selected">@color/setting_list_selected</color>
 
-    <color name="camera_control_bg_opaque">@color/black</color>
-    <color name="camera_control_bg_transparent">#40212121</color>
-
     <color name="refocus_indicator_1">#a0ffffff</color>
     <color name="refocus_indicator_2">#ff29b6f6</color>
 
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 96f156017..c8c1896a2 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -172,7 +172,7 @@
     <dimen name="filter_mode_width">100dp</dimen>
     <dimen name="filter_mode_padding">10dp</dimen>
 
-    <dimen name="remaining_photos_margin">67dp</dimen>
+    <dimen name="remaining_photos_margin">70dp</dimen>
     <dimen name="tsmakeup_mode_paddingBottom">96dp</dimen>
     <dimen name="tsmakeup_mode_level_size">96dp</dimen>
 
@@ -185,4 +185,6 @@
     <dimen name="refocus_circle_diameter_3">95dp</dimen>
     <dimen name="refocus_cross_length">19dp</dimen>
     <dimen name="refocus_stroke_width">2dp</dimen>
+
+    <dimen name="bottom_bar_ripple_radius">30dp</dimen>
 </resources>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 58fb26079..252854682 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -246,11 +246,13 @@
         <item name="android:layout_width">@dimen/switcher_size</item>
         <item name="android:layout_height">@dimen/switcher_size</item>
         <item name="android:background">@drawable/bg_pressed_exit_fading</item>
+        <item name="android:elevation">1dp</item>
     </style>
     <style name="MenuButton">
         <item name="android:layout_width">@dimen/menu_outer_size</item>
         <item name="android:layout_height">@dimen/menu_outer_size</item>
         <item name="android:scaleType">center</item>
+        <item name="android:elevation">1dp</item>
     </style>
     <style name="MuteButton">
         <item name="android:layout_width">@dimen/mute_outer_size</item>