Use "Start" button instead for Panorama.

The shutter button in panorama is replaced by a start button.

bug:5141569
Change-Id: Idb3f6cc621be5b83fae70bce7ef35636079e31f3

5 files changed, 15 insertions, 45 deletions

diff --git a/res/layout-w1024dp/pano_control.xml b/res/layout-w1024dp/pano_control.xml
deleted file mode 100644
index e218fa5..0000000
--- a/res/layout-w1024dp/pano_control.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<com.android.camera.ui.ControlPanelLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:minWidth="260dp"
-        android:background="@drawable/bg_camera_pattern">
-
-    <include layout="@layout/review_thumbnail"/>
-
-    <com.android.camera.ShutterButton android:id="@+id/pano_shutter_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerVertical="true"
-            android:layout_alignParentRight="true"
-            android:clickable="true"
-            android:focusable="true"
-            android:background="@drawable/btn_shutter"/>
-
-    <include layout="@layout/mode_picker"/>
-</com.android.camera.ui.ControlPanelLayout>
diff --git a/res/layout/pano_control.xml b/res/layout/pano_control.xml
index 4a1175a..3e2d4e8 100644
--- a/res/layout/pano_control.xml
+++ b/res/layout/pano_control.xml
@@ -17,20 +17,18 @@
 <com.android.camera.ui.ControlPanelLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
-        android:minWidth="76dp"
-        android:paddingTop="13dp"
+        android:minWidth="@dimen/pano_control_layout_min_width"
         android:background="@drawable/bg_camera_pattern">
 
     <include layout="@layout/review_thumbnail"/>
 
-    <com.android.camera.ShutterButton android:id="@+id/pano_shutter_button"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
+    <Button android:id="@+id/pano_start_button"
+            android:text="@string/pano_capture_start"
+            android:onClick="onStartButtonClicked"
+            android:textSize="24dp"
             android:layout_centerInParent="true"
-            android:clickable="true"
-            android:focusable="true"
-            android:onClick="onShutterButtonClicked"
-            android:background="@drawable/btn_shutter"/>
+            android:layout_width="@dimen/pano_control_start_button_size"
+            android:layout_height="@dimen/pano_control_start_button_size" />
 
     <include layout="@layout/mode_picker"/>
 </com.android.camera.ui.ControlPanelLayout>
diff --git a/res/values-w1024dp/dimens.xml b/res/values-w1024dp/dimens.xml
index 4aa86c7..ad0edf5 100644
--- a/res/values-w1024dp/dimens.xml
+++ b/res/values-w1024dp/dimens.xml
@@ -30,4 +30,6 @@
     <dimen name="share_image_max_width_portrait">480dp</dimen>
     <dimen name="share_image_max_height_portrait">480dp</dimen>
     <dimen name="share_list_width_landscape">200dp</dimen>
+    <dimen name="pano_control_layout_min_width">260dp</dimen>
+    <dimen name="pano_control_start_button_size">180dp</dimen>
 </resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 7978d9c..a571bf6 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -24,4 +24,6 @@
     <dimen name="share_image_max_width_portrait">240dp</dimen>
     <dimen name="share_image_max_height_portrait">240dp</dimen>
     <dimen name="share_list_width_landscape">180dp</dimen>
+    <dimen name="pano_control_layout_min_width">76dp</dimen>
+    <dimen name="pano_control_start_button_size">70dp</dimen>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 800a99b..8bad5d5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -265,6 +265,9 @@
     <!-- Toast saying that there is no video to share. [CHAR LIMIT=30] -->
     <string name="no_video_to_share">No video to share</string>
 
-    <!-- The text shown for stopping panorama capturing [CHAR LIMIT=7] -->
+    <!-- The text shown on the button for stopping panorama capturing [CHAR LIMIT=7] -->
     <string name="pano_capture_stop">Stop</string>
+
+    <!-- The text shown on the button for starting panorama capturing [CHAR LIMIT=10] -->
+    <string name="pano_capture_start">Start</string>
 </resources>