summaryrefslogtreecommitdiffstats
path: root/res/layout-land/keyguard_widget.xml
diff options
context:
space:
mode:
authorMichael Kolb <kolby@google.com>2013-05-06 12:41:34 -0700
committerMichael Kolb <kolby@google.com>2013-05-06 12:43:16 -0700
commit055305005cf90a25437cc0f88e4087633e7d529f (patch)
tree121d92590c35777d15e79111abdd786b5cecf3df /res/layout-land/keyguard_widget.xml
parent5650f420ff94d0d91c30d7f2d528028a412fe1dd (diff)
downloadandroid_packages_apps_Snap-055305005cf90a25437cc0f88e4087633e7d529f.tar.gz
android_packages_apps_Snap-055305005cf90a25437cc0f88e4087633e7d529f.tar.bz2
android_packages_apps_Snap-055305005cf90a25437cc0f88e4087633e7d529f.zip
Fix lockscreen camera widget layout
Bug: 8832891 Change-Id: I4658de74e7cc9d4ba80a561b3e71ae6339d4f236
Diffstat (limited to 'res/layout-land/keyguard_widget.xml')
-rw-r--r--res/layout-land/keyguard_widget.xml51
1 files changed, 27 insertions, 24 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>