diff options
| author | Chung-yih Wang <cywang@google.com> | 2011-09-23 01:28:50 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-09-23 01:28:50 -0700 |
| commit | 50117d0316f93d0cfbfc18c249d2b57013170ce9 (patch) | |
| tree | ae87a1a6c10c13e0161e9211c5f457c400397860 /res/layout | |
| parent | 08ab29a60a4f847b449c9e64f8f4649b545070a2 (diff) | |
| parent | 842f11c8716bc6320b1b7c228742c0dd1cab2d0b (diff) | |
| download | LegacyCamera-50117d0316f93d0cfbfc18c249d2b57013170ce9.zip LegacyCamera-50117d0316f93d0cfbfc18c249d2b57013170ce9.tar.gz LegacyCamera-50117d0316f93d0cfbfc18c249d2b57013170ce9.tar.bz2 | |
Merge "Show the hightlight bar of the active indicator button." into ics-factoryrom
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/indicator_bar.xml | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/res/layout/indicator_bar.xml b/res/layout/indicator_bar.xml index 11276e3..cbbfcef 100644 --- a/res/layout/indicator_bar.xml +++ b/res/layout/indicator_bar.xml @@ -20,20 +20,6 @@ android:clickable="true" android:layout_alignParentRight="true"> - <com.android.camera.ui.ZoomIndexBar - android:id="@+id/zoom_index_bar" - android:layout_width="5dp" - android:layout_height="match_parent" - android:background="@android:color/transparent" - android:layout_alignParentLeft="true" - android:visibility="gone"> - <View android:id="@+id/zoom_index" - android:scaleType="fitXY" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/review_control_pressed_color"/> - </com.android.camera.ui.ZoomIndexBar> - <RelativeLayout android:id="@+id/control_bars" android:layout_toRightOf="@+id/zoom_index_bar" @@ -60,17 +46,23 @@ <com.android.camera.ui.SecondLevelIndicatorControlBar android:id="@+id/second_level_indicator_bar" - android:padding="8dp" android:layout_width="match_parent" android:layout_height="match_parent" + android:paddingTop="8dp" + android:paddingBottom="8dp" 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"/> + android:background="@android:color/white" /> + <View android:id="@+id/indicator_highlight" + android:layout_alignParentLeft="true" + android:layout_width="3dp" + android:layout_height="0dp" + android:background="@color/mode_selection_border" + android:visibility="gone" /> </com.android.camera.ui.SecondLevelIndicatorControlBar> </RelativeLayout> |