for intent capture and pano,

fix the redo/ok/cancel button sizes so touch ripples show up right.

bug: 17505149
Change-Id: I29d8222ff0588d0410cf1f8a94bed963b4bf32f6

4 files changed, 60 insertions, 36 deletions

diff --git a/res/layout-land-v21/retake_done_cancel_layout.xml b/res/layout-land-v21/retake_done_cancel_layout.xml
index 7bdd9c24e..9e1f7bcff 100644
--- a/res/layout-land-v21/retake_done_cancel_layout.xml
+++ b/res/layout-land-v21/retake_done_cancel_layout.xml
@@ -30,26 +30,32 @@
         android:id="@+id/cancel_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom|center_horizontal"
-        android:paddingTop="24dp"
+        android:layout_gravity="center"
+        android:padding="24dp"
         android:src="@drawable/ic_cancel"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/cancel_button_description" />
-      <ImageButton
-        android:id="@+id/done_button"
+      <FrameLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:src="@drawable/ic_confirm"
         android:layout_weight="1"
-        android:background="?android:attr/selectableItemBackgroundBorderless"
-        android:contentDescription="@string/done_button_description" />
+        android:background="@null" >
+        <ImageButton
+          android:id="@+id/done_button"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_gravity="center"
+          android:src="@drawable/ic_confirm"
+          android:background="?android:attr/selectableItemBackgroundBorderless"
+          android:contentDescription="@string/done_button_description" />
+      </FrameLayout>
       <ImageButton
         android:id="@+id/retake_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="top|center_horizontal"
-        android:paddingBottom="24dp"
+        android:layout_gravity="center"
+        android:padding="24dp"
         android:src="@drawable/ic_back"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/retake_button_description" />
diff --git a/res/layout-land/retake_done_cancel_layout.xml b/res/layout-land/retake_done_cancel_layout.xml
index a2c9c7067..b343f60e0 100644
--- a/res/layout-land/retake_done_cancel_layout.xml
+++ b/res/layout-land/retake_done_cancel_layout.xml
@@ -30,26 +30,32 @@
         android:id="@+id/cancel_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="top|center_horizontal"
-        android:paddingTop="24dp"
+        android:layout_gravity="center"
+        android:padding="24dp"
         android:src="@drawable/ic_cancel"
         android:background="@null"
         android:contentDescription="@string/cancel_button_description" />
-      <ImageButton
-        android:id="@+id/done_button"
+      <FrameLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:src="@drawable/ic_confirm"
         android:layout_weight="1"
-        android:background="@null"
-        android:contentDescription="@string/done_button_description" />
+        android:background="@null" >
+        <ImageButton
+          android:id="@+id/done_button"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_gravity="center"
+          android:src="@drawable/ic_confirm"
+          android:background="@null"
+          android:contentDescription="@string/done_button_description" />
+      </FrameLayout>
       <ImageButton
         android:id="@+id/retake_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="bottom|center_horizontal"
-        android:paddingBottom="24dp"
+        android:layout_gravity="center"
+        android:padding="24dp"
         android:src="@drawable/ic_back"
         android:background="@null"
         android:contentDescription="@string/retake_button_description" />
diff --git a/res/layout-port-v21/retake_done_cancel_layout.xml b/res/layout-port-v21/retake_done_cancel_layout.xml
index b85ebe267..545d14db3 100644
--- a/res/layout-port-v21/retake_done_cancel_layout.xml
+++ b/res/layout-port-v21/retake_done_cancel_layout.xml
@@ -30,26 +30,32 @@
         android:id="@+id/retake_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="left|center_vertical"
-        android:paddingLeft="24dp"
+        android:layout_gravity="center"
+        android:padding="24dp"
         android:src="@drawable/ic_back"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/retake_button_description" />
-      <ImageButton
-        android:id="@+id/done_button"
+      <FrameLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:src="@drawable/ic_confirm"
         android:layout_weight="1"
-        android:background="?android:attr/selectableItemBackgroundBorderless"
-        android:contentDescription="@string/done_button_description" />
+        android:background="@null" >
+        <ImageButton
+          android:id="@+id/done_button"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_gravity="center"
+          android:src="@drawable/ic_confirm"
+          android:background="?android:attr/selectableItemBackgroundBorderless"
+          android:contentDescription="@string/done_button_description" />
+      </FrameLayout>
       <ImageButton
         android:id="@+id/cancel_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="right|center_vertical"
-        android:paddingRight="24dp"
+        android:layout_gravity="center"
+        android:padding="24dp"
         android:src="@drawable/ic_cancel"
         android:background="?android:attr/selectableItemBackgroundBorderless"
         android:contentDescription="@string/cancel_button_description" />
diff --git a/res/layout-port/retake_done_cancel_layout.xml b/res/layout-port/retake_done_cancel_layout.xml
index 306820fe7..e00ad5d23 100644
--- a/res/layout-port/retake_done_cancel_layout.xml
+++ b/res/layout-port/retake_done_cancel_layout.xml
@@ -30,26 +30,32 @@
         android:id="@+id/retake_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="left|center_vertical"
-        android:paddingLeft="24dp"
+        android:layout_gravity="center"
+        android:padding="24dp"
         android:src="@drawable/ic_back"
         android:background="@null"
         android:contentDescription="@string/retake_button_description" />
-      <ImageButton
-        android:id="@+id/done_button"
+      <FrameLayout
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_gravity="center"
-        android:src="@drawable/ic_confirm"
         android:layout_weight="1"
-        android:background="@null"
-        android:contentDescription="@string/done_button_description" />
+        android:background="@null" >
+        <ImageButton
+          android:id="@+id/done_button"
+          android:layout_width="wrap_content"
+          android:layout_height="wrap_content"
+          android:layout_gravity="center"
+          android:src="@drawable/ic_confirm"
+          android:background="@null"
+          android:contentDescription="@string/done_button_description" />
+      </FrameLayout>
       <ImageButton
         android:id="@+id/cancel_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="right|center_vertical"
-        android:paddingRight="24dp"
+        android:layout_gravity="center"
+        android:padding="24dp"
         android:src="@drawable/ic_cancel"
         android:background="@null"
         android:contentDescription="@string/cancel_button_description" />