summaryrefslogtreecommitdiffstats
path: root/res/layout/mode_selector.xml
diff options
context:
space:
mode:
authorDoris Liu <tianliu@google.com>2014-02-04 16:57:55 -0800
committerDoris Liu <tianliu@google.com>2014-02-07 18:29:20 -0800
commit213a4a086b54904cee543adf60b16fc1a61efe38 (patch)
tree93b76ec9db4942e6b60e4c385a2728d3d6dabf6c /res/layout/mode_selector.xml
parente69b88893922350461c3a30586aa9194783ff612 (diff)
downloadandroid_packages_apps_Camera2-213a4a086b54904cee543adf60b16fc1a61efe38.tar.gz
android_packages_apps_Camera2-213a4a086b54904cee543adf60b16fc1a61efe38.tar.bz2
android_packages_apps_Camera2-213a4a086b54904cee543adf60b16fc1a61efe38.zip
New mode drawer.
-Changed the entire look of the mode drawer by using a live preview as background, and use circle icons rather than block shaped icons -Fade in the blurred preview frame during mode switch -Add highlighted and selected states to mode icons -Center the mode drawer in preview rather than whole screen -Swapped mode order in the drawer TODO: -Add settings access point -Refine swipe in/out behavior of the drawer Change-Id: Ibab0fe960bcfbb9635ca7f45d50178cb1ef2941f
Diffstat (limited to 'res/layout/mode_selector.xml')
-rw-r--r--res/layout/mode_selector.xml16
1 files changed, 9 insertions, 7 deletions
diff --git a/res/layout/mode_selector.xml b/res/layout/mode_selector.xml
index c9d937535..939ed07dd 100644
--- a/res/layout/mode_selector.xml
+++ b/res/layout/mode_selector.xml
@@ -17,21 +17,23 @@
<com.android.camera.ui.ModeSelectorItem
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
- android:layout_height="match_parent">
+ android:layout_height="@dimen/mode_selector_item_height"
+ android:paddingLeft="16dp"
+ android:paddingTop="6dp"
+ android:paddingBottom="6dp">
<TextView
android:id="@+id/selector_text"
- android:layout_gravity="left"
- android:paddingLeft="24dp"
- android:paddingRight="24dp"
+ android:layout_gravity="left|center_vertical"
+ android:paddingLeft="16dp"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_vertical"
- android:textSize="21sp"
+ android:textSize="14sp"
android:textColor="@color/mode_selector_text_color"
android:layout_marginLeft="@dimen/mode_selector_icon_block_width" />
- <ImageView
+ <com.android.camera.ui.ModeIconView
android:id="@+id/selector_icon"
android:scaleType="centerInside"
android:layout_width="@dimen/mode_selector_icon_block_width"
- android:layout_height="match_parent" />
+ android:layout_height="@dimen/mode_selector_icon_block_width" />
</com.android.camera.ui.ModeSelectorItem> \ No newline at end of file