removing level 1 button backround circles

Change-Id: I4ae7eae6ad80288f7113ad0480adc60c92c6c9a2

13 files changed, 104 insertions, 286 deletions

diff --git a/res/drawable/ic_flash_auto.xml b/res/drawable/ic_flash_auto.xml
index f228cc494..fe9ac3f1c 100644
--- a/res/drawable/ic_flash_auto.xml
+++ b/res/drawable/ic_flash_auto.xml
@@ -22,28 +22,14 @@
             android:src="@drawable/ic_flash_auto_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_flash_auto_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_flash_auto_normal" />
-                   </item>
-                </layer-list>
-            </item>
-        </level-list>
+        <layer-list>
+           <item android:drawable="@drawable/button_background_pressed_dark" />
+           <item>
+               <bitmap
+                    android:gravity="center"
+                    android:src="@drawable/ic_flash_auto_normal" />
+           </item>
+        </layer-list>
     </item>
     <item>
         <bitmap
diff --git a/res/drawable/ic_flash_off.xml b/res/drawable/ic_flash_off.xml
index 8d85de1c5..a349b26d4 100644
--- a/res/drawable/ic_flash_off.xml
+++ b/res/drawable/ic_flash_off.xml
@@ -22,28 +22,14 @@
             android:src="@drawable/ic_flash_off_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_flash_off_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_flash_off_normal" />
-                   </item>
-                </layer-list>
-            </item>
-        </level-list>
+        <layer-list>
+           <item android:drawable="@drawable/button_background_pressed_dark" />
+           <item>
+               <bitmap
+                    android:gravity="center"
+                    android:src="@drawable/ic_flash_off_normal" />
+           </item>
+        </layer-list>
     </item>
     <item>
         <bitmap
diff --git a/res/drawable/ic_flash_on.xml b/res/drawable/ic_flash_on.xml
index 5578c795f..f584d6f3b 100644
--- a/res/drawable/ic_flash_on.xml
+++ b/res/drawable/ic_flash_on.xml
@@ -22,28 +22,14 @@
             android:src="@drawable/ic_flash_on_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_flash_on_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_flash_on_normal" />
-                   </item>
-                </layer-list>
-            </item>
-        </level-list>
+        <layer-list>
+           <item android:drawable="@drawable/button_background_pressed_dark" />
+           <item>
+               <bitmap
+                    android:gravity="center"
+                    android:src="@drawable/ic_flash_on_normal" />
+           </item>
+        </layer-list>
     </item>
     <item>
         <bitmap
diff --git a/res/drawable/ic_grid_off.xml b/res/drawable/ic_grid_off.xml
index 89c9b4e43..99a6974f5 100644
--- a/res/drawable/ic_grid_off.xml
+++ b/res/drawable/ic_grid_off.xml
@@ -22,28 +22,14 @@
             android:src="@drawable/ic_grid_off_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_grid_off_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_grid_off_normal" />
-                   </item>
-                </layer-list>
-            </item>
-        </level-list>
+        <layer-list>
+           <item android:drawable="@drawable/button_background_pressed_dark" />
+           <item>
+               <bitmap
+                    android:gravity="center"
+                    android:src="@drawable/ic_grid_off_normal" />
+           </item>
+        </layer-list>
     </item>
     <item>
         <bitmap
diff --git a/res/drawable/ic_grid_on.xml b/res/drawable/ic_grid_on.xml
index 869b07c5f..45f96ac69 100644
--- a/res/drawable/ic_grid_on.xml
+++ b/res/drawable/ic_grid_on.xml
@@ -22,28 +22,14 @@
             android:src="@drawable/ic_grid_on_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_grid_on_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_grid_on_normal" />
-                   </item>
-                </layer-list>
-            </item>
-        </level-list>
+        <layer-list>
+           <item android:drawable="@drawable/button_background_pressed_dark" />
+           <item>
+               <bitmap
+                    android:gravity="center"
+                    android:src="@drawable/ic_grid_on_normal" />
+           </item>
+        </layer-list>
     </item>
     <item>
         <bitmap
diff --git a/res/drawable/ic_hdr_off.xml b/res/drawable/ic_hdr_off.xml
index 0c6e54475..3f759439b 100644
--- a/res/drawable/ic_hdr_off.xml
+++ b/res/drawable/ic_hdr_off.xml
@@ -22,28 +22,14 @@
             android:src="@drawable/ic_hdr_off_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_hdr_off_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_hdr_off_normal" />
-                   </item>
-                </layer-list>
-            </item>
-        </level-list>
+        <layer-list>
+           <item android:drawable="@drawable/button_background_pressed_dark" />
+           <item>
+               <bitmap
+                    android:gravity="center"
+                    android:src="@drawable/ic_hdr_off_normal" />
+           </item>
+        </layer-list>
     </item>
     <item>
         <bitmap
diff --git a/res/drawable/ic_hdr_on.xml b/res/drawable/ic_hdr_on.xml
index 2623a2214..f44e92623 100644
--- a/res/drawable/ic_hdr_on.xml
+++ b/res/drawable/ic_hdr_on.xml
@@ -22,28 +22,14 @@
             android:src="@drawable/ic_hdr_on_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_hdr_on_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_hdr_on_normal" />
-                   </item>
-                </layer-list>
-            </item>
-        </level-list>
+        <layer-list>
+           <item android:drawable="@drawable/button_background_pressed_dark" />
+           <item>
+               <bitmap
+                    android:gravity="center"
+                    android:src="@drawable/ic_hdr_on_normal" />
+           </item>
+        </layer-list>
     </item>
     <item>
         <bitmap
diff --git a/res/drawable/ic_hdr_plus_off.xml b/res/drawable/ic_hdr_plus_off.xml
index 5d2ce0fcb..2b9bd2370 100644
--- a/res/drawable/ic_hdr_plus_off.xml
+++ b/res/drawable/ic_hdr_plus_off.xml
@@ -22,28 +22,14 @@
             android:src="@drawable/ic_hdr_plus_off_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_hdr_plus_off_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_hdr_plus_off_normal" />
-                   </item>
-                </layer-list>
-            </item>
-        </level-list>
+        <layer-list>
+           <item android:drawable="@drawable/button_background_pressed_dark" />
+           <item>
+               <bitmap
+                    android:gravity="center"
+                    android:src="@drawable/ic_hdr_plus_off_normal" />
+           </item>
+        </layer-list>
     </item>
     <item>
         <bitmap
diff --git a/res/drawable/ic_hdr_plus_on.xml b/res/drawable/ic_hdr_plus_on.xml
index 9e001546a..a8f951848 100644
--- a/res/drawable/ic_hdr_plus_on.xml
+++ b/res/drawable/ic_hdr_plus_on.xml
@@ -22,28 +22,14 @@
             android:src="@drawable/ic_hdr_plus_on_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_hdr_plus_on_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_hdr_plus_on_normal" />
-                   </item>
-                </layer-list>
-            </item>
-        </level-list>
+        <layer-list>
+           <item android:drawable="@drawable/button_background_pressed_dark" />
+           <item>
+               <bitmap
+                    android:gravity="center"
+                    android:src="@drawable/ic_hdr_plus_on_normal" />
+           </item>
+        </layer-list>
     </item>
     <item>
         <bitmap
diff --git a/res/drawable/ic_refocus.xml b/res/drawable/ic_refocus.xml
index 9d1136978..df927d877 100644
--- a/res/drawable/ic_refocus.xml
+++ b/res/drawable/ic_refocus.xml
@@ -22,28 +22,14 @@
             android:src="@drawable/ic_refocus_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_refocus_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_refocus_normal" />
-                   </item>
-                </layer-list>
-            </item>
-        </level-list>
+        <layer-list>
+           <item android:drawable="@drawable/button_background_pressed_dark" />
+           <item>
+               <bitmap
+                    android:gravity="center"
+                    android:src="@drawable/ic_refocus_normal" />
+           </item>
+        </layer-list>
     </item>
     <item>
         <bitmap
diff --git a/res/drawable/ic_refocus_off.xml b/res/drawable/ic_refocus_off.xml
index 294e6c85b..560a04e0d 100644
--- a/res/drawable/ic_refocus_off.xml
+++ b/res/drawable/ic_refocus_off.xml
@@ -22,28 +22,14 @@
             android:src="@drawable/ic_refocus_off_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_refocus_off_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_refocus_off_normal" />
-                   </item>
-                </layer-list>
-            </item>
-        </level-list>
+        <layer-list>
+           <item android:drawable="@drawable/button_background_pressed_dark" />
+           <item>
+               <bitmap
+                    android:gravity="center"
+                    android:src="@drawable/ic_refocus_off_normal" />
+           </item>
+        </layer-list>
     </item>
     <item>
         <bitmap
diff --git a/res/drawable/ic_switch_camera_back.xml b/res/drawable/ic_switch_camera_back.xml
index d104be284..3de2a3ae7 100644
--- a/res/drawable/ic_switch_camera_back.xml
+++ b/res/drawable/ic_switch_camera_back.xml
@@ -22,28 +22,14 @@
             android:src="@drawable/ic_switch_camera_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_switch_camera_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_switch_camera_back_normal" />
-                   </item>
-                </layer-list>
-            </item>
-        </level-list>
+        <layer-list>
+           <item android:drawable="@drawable/button_background_pressed_dark" />
+           <item>
+               <bitmap
+                    android:gravity="center"
+                    android:src="@drawable/ic_switch_camera_back_normal" />
+           </item>
+        </layer-list>
     </item>
     <item>
         <bitmap
diff --git a/res/drawable/ic_switch_camera_front.xml b/res/drawable/ic_switch_camera_front.xml
index 8bf9459de..f9b39f8eb 100644
--- a/res/drawable/ic_switch_camera_front.xml
+++ b/res/drawable/ic_switch_camera_front.xml
@@ -22,28 +22,14 @@
             android:src="@drawable/ic_switch_camera_front_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_switch_camera_front_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_switch_camera_front_normal" />
-                   </item>
-                </layer-list>
-            </item>
-        </level-list>
+        <layer-list>
+           <item android:drawable="@drawable/button_background_pressed_dark" />
+           <item>
+               <bitmap
+                    android:gravity="center"
+                    android:src="@drawable/ic_switch_camera_front_normal" />
+           </item>
+        </layer-list>
     </item>
     <item>
         <bitmap