new intent bottom bar ux

bug: 12969738
Change-Id: I938a7266a71ed6a6eb4cf3e8a0153d938df11e1f

12 files changed, 5 insertions, 74 deletions

diff --git a/res/drawable-hdpi/ic_confirm_disabled.png b/res/drawable-hdpi/ic_confirm_disabled.png
index 5bbdcc44c..0aae805f4 100644
--- a/res/drawable-hdpi/ic_confirm_disabled.png
+++ b/res/drawable-hdpi/ic_confirm_disabled.png
diff --git a/res/drawable-hdpi/ic_confirm_normal.png b/res/drawable-hdpi/ic_confirm_normal.png
index d920d6f4a..c2f6eb4d1 100644
--- a/res/drawable-hdpi/ic_confirm_normal.png
+++ b/res/drawable-hdpi/ic_confirm_normal.png
diff --git a/res/drawable-mdpi/ic_confirm_disabled.png b/res/drawable-mdpi/ic_confirm_disabled.png
index cc18158c8..7519d5eb8 100644
--- a/res/drawable-mdpi/ic_confirm_disabled.png
+++ b/res/drawable-mdpi/ic_confirm_disabled.png
diff --git a/res/drawable-mdpi/ic_confirm_normal.png b/res/drawable-mdpi/ic_confirm_normal.png
index 44d7ef3cd..d2c98b850 100644
--- a/res/drawable-mdpi/ic_confirm_normal.png
+++ b/res/drawable-mdpi/ic_confirm_normal.png
diff --git a/res/drawable-xhdpi/ic_confirm_disabled.png b/res/drawable-xhdpi/ic_confirm_disabled.png
index 4bcfe9c52..d36e66367 100644
--- a/res/drawable-xhdpi/ic_confirm_disabled.png
+++ b/res/drawable-xhdpi/ic_confirm_disabled.png
diff --git a/res/drawable-xhdpi/ic_confirm_normal.png b/res/drawable-xhdpi/ic_confirm_normal.png
index 230f01c03..8214d6ce8 100644
--- a/res/drawable-xhdpi/ic_confirm_normal.png
+++ b/res/drawable-xhdpi/ic_confirm_normal.png
diff --git a/res/drawable-xxhdpi/ic_confirm_disabled.png b/res/drawable-xxhdpi/ic_confirm_disabled.png
index e6cae84a8..dcfb840a8 100644
--- a/res/drawable-xxhdpi/ic_confirm_disabled.png
+++ b/res/drawable-xxhdpi/ic_confirm_disabled.png
diff --git a/res/drawable-xxhdpi/ic_confirm_normal.png b/res/drawable-xxhdpi/ic_confirm_normal.png
index d0b3615e9..c67843951 100644
--- a/res/drawable-xxhdpi/ic_confirm_normal.png
+++ b/res/drawable-xxhdpi/ic_confirm_normal.png
diff --git a/res/drawable/ic_back.xml b/res/drawable/ic_back.xml
index f02fd8f75..e6f9052c7 100644
--- a/res/drawable/ic_back.xml
+++ b/res/drawable/ic_back.xml
@@ -21,30 +21,6 @@
             android:gravity="center"
             android:src="@drawable/ic_back_disabled" />
     </item>
-    <item android:state_pressed="true">
-        <level-list>
-            <item android:maxLevel="0">
-                <layer-list>
-                   <item android:drawable="@drawable/button_background_pressed_light" />
-                   <item>
-                       <bitmap
-                            android:gravity="center"
-                            android:src="@drawable/ic_back_normal" />
-                   </item>
-                </layer-list>
-            </item>
-            <item android:maxLevel="1">
-                <layer-list>
-                   <item android:drawable="@drawable/button_background_pressed_dark" />
-                   <item>
-                       <bitmap
-                            android:gravity="center"
-                            android:src="@drawable/ic_back_normal" />
-                   </item>
-                </layer-list>
-            </item>
-        </level-list>
-    </item>
     <item>
         <bitmap
             android:gravity="center"
diff --git a/res/drawable/ic_cancel.xml b/res/drawable/ic_cancel.xml
index 0bb1c8b93..9dadbea6b 100644
--- a/res/drawable/ic_cancel.xml
+++ b/res/drawable/ic_cancel.xml
@@ -21,30 +21,6 @@
             android:gravity="center"
             android:src="@drawable/ic_cancel_disabled" />
     </item>
-    <item android:state_pressed="true">
-        <level-list>
-            <item android:maxLevel="0">
-                <layer-list>
-                   <item android:drawable="@drawable/button_background_pressed_light" />
-                   <item>
-                       <bitmap
-                            android:gravity="center"
-                            android:src="@drawable/ic_cancel_normal" />
-                   </item>
-                </layer-list>
-            </item>
-            <item android:maxLevel="1">
-                <layer-list>
-                   <item android:drawable="@drawable/button_background_pressed_dark" />
-                   <item>
-                       <bitmap
-                            android:gravity="center"
-                            android:src="@drawable/ic_cancel_normal" />
-                   </item>
-                </layer-list>
-            </item>
-        </level-list>
-    </item>
     <item>
         <bitmap
             android:gravity="center"
diff --git a/res/drawable/ic_confirm.xml b/res/drawable/ic_confirm.xml
index da5b70787..b6a6dd663 100644
--- a/res/drawable/ic_confirm.xml
+++ b/res/drawable/ic_confirm.xml
@@ -21,30 +21,6 @@
             android:gravity="center"
             android:src="@drawable/ic_confirm_disabled" />
     </item>
-    <item android:state_pressed="true">
-        <level-list>
-            <item android:maxLevel="0">
-                <layer-list>
-                   <item android:drawable="@drawable/button_background_pressed_light" />
-                   <item>
-                       <bitmap
-                            android:gravity="center"
-                            android:src="@drawable/ic_confirm_normal" />
-                   </item>
-                </layer-list>
-            </item>
-            <item android:maxLevel="1">
-                <layer-list>
-                   <item android:drawable="@drawable/button_background_pressed_dark" />
-                   <item>
-                       <bitmap
-                            android:gravity="center"
-                            android:src="@drawable/ic_confirm_normal" />
-                   </item>
-                </layer-list>
-            </item>
-        </level-list>
-    </item>
     <item>
         <bitmap
             android:gravity="center"
diff --git a/res/layout/bottom_bar_contents.xml b/res/layout/bottom_bar_contents.xml
index a5304a272..6ef01f9e4 100644
--- a/res/layout/bottom_bar_contents.xml
+++ b/res/layout/bottom_bar_contents.xml
@@ -46,14 +46,16 @@
         android:id="@+id/retake_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="left|center_vertical"
+        android:padding="12dp"
         android:src="@drawable/ic_back"
-        android:layout_weight="1"
         android:background="@null"
         android:contentDescription="@string/retake_button_description" />
     <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:layout_weight="1"
         android:background="@null"
@@ -62,8 +64,9 @@
         android:id="@+id/cancel_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_gravity="right|center_vertical"
+        android:padding="12dp"
         android:src="@drawable/ic_cancel"
-        android:layout_weight="1"
         android:background="@null"
         android:contentDescription="@string/cancel_button_description" />
   </com.android.camera.ui.TopRightWeightedLayout>