diff options
| author | Chung-yih Wang <cywang@google.com> | 2011-09-15 10:11:52 +0800 |
|---|---|---|
| committer | Chung-yih Wang <cywang@google.com> | 2011-09-20 14:24:03 +0800 |
| commit | 6b3f2ff14ca0a0d694d5af13e4d5a392c8552191 (patch) | |
| tree | 2de89479fdb3c6ee37c40cee2440eaf385ff9d73 /res | |
| parent | 23a5e416ca6564cafcc80f7ee7f822e1dbe4d16b (diff) | |
| download | LegacyCamera-6b3f2ff14ca0a0d694d5af13e4d5a392c8552191.zip LegacyCamera-6b3f2ff14ca0a0d694d5af13e4d5a392c8552191.tar.gz LegacyCamera-6b3f2ff14ca0a0d694d5af13e4d5a392c8552191.tar.bz2 | |
Follow UI redlines for indicator bars.
bug:5287560
1. options icons:
No dark background. Use the dark background only when in advanced
options. Make sure the position of the icons match the
redlines, specifically the padding at the top and bottom.
2. second-level indicator bars:
Modify the icons and spacing inbetween.
Change-Id: Ic8d1382b8e07719c5f86b309e3853023e76dccd3
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/indicator_bar.xml | 31 |
1 files changed, 20 insertions, 11 deletions
diff --git a/res/layout/indicator_bar.xml b/res/layout/indicator_bar.xml index 0d5cb78..0422e68 100644 --- a/res/layout/indicator_bar.xml +++ b/res/layout/indicator_bar.xml @@ -37,14 +37,14 @@ <RelativeLayout android:id="@+id/control_bars" android:layout_toRightOf="@+id/zoom_index_bar" - android:layout_width="60dp" - android:layout_height="match_parent" - android:background="@color/indicator_background"> + android:layout_width="48dp" + android:layout_height="match_parent"> <com.android.camera.ui.IndicatorControlBar android:id="@+id/indicator_bar" - android:layout_centerHorizontal="true" - android:layout_width="48dp" - android:layout_height="match_parent"> + android:padding="8dp" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_centerHorizontal="true"> <com.android.camera.ui.ColorFilterImageView android:id="@+id/zoom_control_icon" android:layout_width="match_parent" @@ -62,15 +62,24 @@ <com.android.camera.ui.ZoomControlBar android:id="@+id/zoom_control" - android:layout_width="48dp" - android:layout_centerHorizontal="true" + android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_centerHorizontal="true" android:visibility="gone" /> <com.android.camera.ui.SecondLevelIndicatorControlBar android:id="@+id/second_level_indicator_bar" - android:layout_width="48dp" - android:layout_centerHorizontal="true" + android:padding="8dp" + android:layout_width="match_parent" android:layout_height="match_parent" - android:visibility="gone" /> + android:layout_centerHorizontal="true" + android:background="@color/indicator_background" + android:visibility="gone"> + <View android:id="@+id/divider" + android:layout_width="match_parent" + android:layout_height="1dp" + android:layout_marginTop="8dp" + android:background="@android:color/white"/> + </com.android.camera.ui.SecondLevelIndicatorControlBar> + </RelativeLayout> </com.android.camera.ui.IndicatorControlBarContainer> |