From d6536c09d1c311b0160b2cb911c62c21b7254eba Mon Sep 17 00:00:00 2001
From: Michael Kolb <kolby@google.com>
Date: Mon, 6 May 2013 12:41:34 -0700
Subject: Fix lockscreen camera widget layout

  Bug: 8832891

Change-Id: I4658de74e7cc9d4ba80a561b3e71ae6339d4f236
---
 res/layout/menu_indicators.xml          |  2 +-
 res/layout/menu_indicators_keyguard.xml | 41 +++++++++++++++++++--------------
 2 files changed, 25 insertions(+), 18 deletions(-)

(limited to 'res/layout')

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
-- 
cgit v1.2.3