diff options
| author | Michael Kolb <kolby@google.com> | 2013-04-26 16:01:44 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-04-26 16:01:44 -0700 |
| commit | 87ea8cf55157fd2a540285a8c94d5128970c62fe (patch) | |
| tree | 595dd95748639a16e74d41f899b6241dec3dfefb /res/layout | |
| parent | aa65998a5de7106d16213c78f57e0039669034cf (diff) | |
| parent | 5cdaaf84486306bea697a4e3487cda3c8e4815cb (diff) | |
| download | android_packages_apps_Snap-87ea8cf55157fd2a540285a8c94d5128970c62fe.tar.gz android_packages_apps_Snap-87ea8cf55157fd2a540285a8c94d5128970c62fe.tar.bz2 android_packages_apps_Snap-87ea8cf55157fd2a540285a8c94d5128970c62fe.zip | |
am 8021e39d: Merge "Add new indicators" into gb-ub-photos-bryce
* commit '8021e39d649be4603e66d5f82cef607ada87d56b':
Add new indicators
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/menu_indicators.xml | 43 |
1 files changed, 25 insertions, 18 deletions
diff --git a/res/layout/menu_indicators.xml b/res/layout/menu_indicators.xml index 08e04659d..da81e8a11 100644 --- a/res/layout/menu_indicators.xml +++ b/res/layout/menu_indicators.xml @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2011 The Android Open Source Project +<!-- Copyright (C) 2013 The Android Open Source Project Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. @@ -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_off" /> <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_off" /> + + <ImageView + android:id="@+id/menu_wb_indicator" + style="@style/MenuIndicator" + android:layout_gravity="right|bottom" + android:src="@drawable/ic_indicator_wb_off" /> -</RelativeLayout> +</FrameLayout> |