Fix lockscreen camera widget layout

  Bug: 8832891

Change-Id: I4658de74e7cc9d4ba80a561b3e71ae6339d4f236

4 files changed, 75 insertions, 65 deletions

diff --git a/res/layout-land/keyguard_widget.xml b/res/layout-land/keyguard_widget.xml
index 130e00710..f0f4362aa 100644
--- a/res/layout-land/keyguard_widget.xml
+++ b/res/layout-land/keyguard_widget.xml
@@ -13,48 +13,51 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/camera_controls"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/black">
-
-    <FrameLayout android:id="@+id/controls"
-        style="@style/CameraControls"
-        android:layout_alignParentRight="true"
-        android:layout_centerVertical="true">
-
-        <include layout="@layout/menu_indicators_keyguard"
-            android:layout_width="80dip"
-            android:layout_height="80dip"
-            android:layout_gravity="top|right"
-            android:layout_marginTop="-5dip"
-            android:layout_marginRight="-2dip" />
-
-    </FrameLayout>
+    android:background="@color/default_background" >
 
     <ImageView
+        android:id="@+id/shutter_button"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_alignParentRight="true"
         android:layout_centerVertical="true"
+        android:layout_alignParentRight="true"
         android:layout_marginRight="@dimen/shutter_offset"
+        android:contentDescription="@string/accessibility_shutter_button"
+        android:scaleType="center"
         android:src="@drawable/btn_new_shutter" />
 
+    <include
+        android:layout_width="64dip"
+        android:layout_height="64dip"
+        android:layout_above="@id/shutter_button"
+        android:layout_alignParentRight="true"
+        android:layout_marginRight="6dip"
+        android:layout_marginTop="-5dip"
+        layout="@layout/menu_indicators_keyguard" />
+
     <ImageView
+        android:id="@+id/camera_switcher"
         style="@style/SwitcherButton"
-        android:layout_alignBottom="@id/controls"
+        android:layout_below="@id/shutter_button"
         android:layout_alignParentRight="true"
         android:layout_marginRight="2dip"
-        android:src="@drawable/ic_switch_camera"
-        android:scaleType="center" />
+        android:contentDescription="@string/accessibility_mode_picker"
+        android:scaleType="center"
+        android:src="@drawable/ic_switch_camera" />
 
     <ImageView
+        android:id="@+id/camera_switcher_ind"
         style="@style/SwitcherButton"
-        android:layout_alignBottom="@id/controls"
+        android:layout_below="@id/shutter_button"
         android:layout_alignParentRight="true"
         android:layout_marginRight="2dip"
-        android:src="@drawable/ic_switcher_menu_indicator"
-        android:scaleType="center" />
+        android:contentDescription="@string/accessibility_mode_picker"
+        android:scaleType="center"
+        android:src="@drawable/ic_switcher_menu_indicator" />
 
 </RelativeLayout>
diff --git a/res/layout-port/keyguard_widget.xml b/res/layout-port/keyguard_widget.xml
index 1fdbb27e1..28b59c44d 100644
--- a/res/layout-port/keyguard_widget.xml
+++ b/res/layout-port/keyguard_widget.xml
@@ -13,27 +13,15 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/camera_controls"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@android:color/black">
-
-    <FrameLayout android:id="@+id/controls"
-        style="@style/CameraControls"
-        android:layout_alignParentBottom="true"
-        android:layout_centerHorizontal="true">
-
-        <include layout="@layout/menu_indicators_keyguard"
-            android:layout_width="80dip"
-            android:layout_height="80dip"
-            android:layout_gravity="bottom|right"
-            android:layout_marginBottom="-2dip"
-            android:layout_marginRight="-5dip" />
-
-    </FrameLayout>
+    android:background="@color/default_background" >
 
     <ImageView
+        android:id="@+id/shutter"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignParentBottom="true"
@@ -41,20 +29,32 @@
         android:layout_marginBottom="@dimen/shutter_offset"
         android:src="@drawable/btn_new_shutter" />
 
+    <include layout="@layout/menu_indicators_keyguard"
+        android:layout_width="64dip"
+        android:layout_height="64dip"
+        android:layout_toRightOf="@id/shutter"
+        android:layout_alignParentBottom="true"
+        android:layout_marginBottom="6dip"
+        android:layout_marginRight="-5dip" />
+
     <ImageView
+        android:id="@+id/camera_switcher"
         style="@style/SwitcherButton"
+        android:layout_toLeftOf="@id/shutter"
         android:layout_alignParentBottom="true"
-        android:layout_alignLeft="@id/controls"
         android:layout_marginBottom="2dip"
-        android:src="@drawable/ic_switch_camera"
-        android:scaleType="center" />
+        android:scaleType="center"
+        android:contentDescription="@string/accessibility_mode_picker"
+        android:src="@drawable/ic_switch_camera" />
 
     <ImageView
+        android:id="@+id/camera_switcher_ind"
         style="@style/SwitcherButton"
+        android:layout_toLeftOf="@id/shutter"
         android:layout_alignParentBottom="true"
-        android:layout_alignLeft="@id/controls"
         android:layout_marginBottom="2dip"
-        android:src="@drawable/ic_switcher_menu_indicator"
-        android:scaleType="center" />
+        android:scaleType="center"
+        android:contentDescription="@string/accessibility_mode_picker"
+        android:src="@drawable/ic_switcher_menu_indicator" />
 
 </RelativeLayout>
diff --git a/res/layout/menu_indicators.xml b/res/layout/menu_indicators.xml
index da81e8a11..037700349 100644
--- a/res/layout/menu_indicators.xml
+++ b/res/layout/menu_indicators.xml
@@ -46,7 +46,7 @@
         android:id="@+id/menu_location_indicator"
         style="@style/MenuIndicator"
         android:layout_gravity="center_horizontal|bottom"
-        android:src="@drawable/ic_indicator_loc_off" />
+        android:src="@drawable/ic_indicator_loc_on" />
 
     <ImageView
         android:id="@+id/menu_wb_indicator"
diff --git a/res/layout/menu_indicators_keyguard.xml b/res/layout/menu_indicators_keyguard.xml
index 6c838f6c5..7a8795d23 100644
--- a/res/layout/menu_indicators_keyguard.xml
+++ b/res/layout/menu_indicators_keyguard.xml
@@ -13,38 +13,45 @@
      See the License for the specific language governing permissions and
      limitations under the License.
 -->
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/on_screen_indicators"
-    android:layout_width="80dip"
-    android:layout_height="80dip" >
+    android:layout_width="64dip"
+    android:layout_height="64dip" >
 
     <ImageView
-        android:id="@+id/menu_hdr_indicator"
+        android:id="@+id/menu_scenemode_indicator"
+        style="@style/MenuIndicator"
+        android:layout_gravity="left|top"
+        android:src="@drawable/ic_indicator_sce_off" />
+
+    <ImageView
+        android:id="@+id/menu_timer_indicator"
         style="@style/MenuIndicator"
-        android:layout_alignParentLeft="true"
-        android:layout_alignParentTop="true"
-        android:src="@drawable/ic_indicator_hdr_off" />
+        android:layout_gravity="center_horizontal|top"
+        android:src="@drawable/ic_indicator_timer_off" />
 
     <ImageView
         android:id="@+id/menu_flash_indicator"
         style="@style/MenuIndicator"
-        android:layout_toRightOf="@id/menu_hdr_indicator"
-        android:layout_alignTop="@id/menu_hdr_indicator"
+        android:layout_gravity="right|top"
         android:src="@drawable/ic_indicator_flash_auto" />
 
     <ImageView
         android:id="@+id/menu_exposure_indicator"
         style="@style/MenuIndicator"
-        android:layout_below="@id/menu_hdr_indicator"
-        android:layout_alignLeft="@id/menu_hdr_indicator"
-        android:layout_alignParentLeft="true"
+        android:layout_gravity="left|bottom"
         android:src="@drawable/ic_indicator_ev_0" />
 
     <ImageView
-        android:id="@+id/menu_scenemode_indicator"
+        android:id="@+id/menu_location_indicator"
         style="@style/MenuIndicator"
-        android:layout_alignTop="@id/menu_exposure_indicator"
-        android:layout_toRightOf="@id/menu_exposure_indicator"
-        android:src="@drawable/ic_indicator_sce_off" />
+        android:layout_gravity="center_horizontal|bottom"
+        android:src="@drawable/ic_indicator_loc_on" />
+
+    <ImageView
+        android:id="@+id/menu_wb_indicator"
+        style="@style/MenuIndicator"
+        android:layout_gravity="right|bottom"
+        android:src="@drawable/ic_indicator_wb_off" />
 
-</RelativeLayout>
+</FrameLayout>
\ No newline at end of file