diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/indicator_bar.xml | 80 | ||||
| -rw-r--r-- | res/values/colors.xml | 1 |
2 files changed, 53 insertions, 28 deletions
diff --git a/res/layout/indicator_bar.xml b/res/layout/indicator_bar.xml index 8f2fead..359b4ad 100644 --- a/res/layout/indicator_bar.xml +++ b/res/layout/indicator_bar.xml @@ -15,38 +15,62 @@ --> <com.android.camera.ui.IndicatorControlBarContainer xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/indicator_control" - android:layout_width="48dp" + android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_marginRight="6dp" android:clickable="true" android:layout_alignParentRight="true"> - <com.android.camera.ui.IndicatorControlBar - android:id="@+id/indicator_bar" - android:layout_width="match_parent" - android:layout_height="match_parent"> - <ImageView - android:id="@+id/zoom_control_icon" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_centerInParent="true" - android:src="@drawable/btn_zoom_control" - android:visibility="gone" /> - <com.android.camera.ui.RotateImageView - android:id="@+id/second_level_indicator_bar_icon" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:src="@drawable/ic_settings_holo_light" /> - </com.android.camera.ui.IndicatorControlBar> - <com.android.camera.ui.ZoomControlBar - android:id="@+id/zoom_control" - android:layout_width="match_parent" + <com.android.camera.ui.ZoomIndexBar + android:id="@+id/zoom_index_bar" + android:layout_width="5dp" android:layout_height="match_parent" - android:visibility="gone" /> - <com.android.camera.ui.SecondLevelIndicatorControlBar - android:id="@+id/second_level_indicator_bar" - android:layout_width="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" + android:layout_width="60dp" android:layout_height="match_parent" - android:visibility="gone" /> + android:background="@color/indicator_background"> + <com.android.camera.ui.IndicatorControlBar + android:id="@+id/indicator_bar" + android:layout_centerHorizontal="true" + android:layout_width="48dp" + android:layout_height="match_parent"> + <ImageView + android:id="@+id/zoom_control_icon" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_centerInParent="true" + android:src="@drawable/btn_zoom_control" + android:visibility="gone" /> + <com.android.camera.ui.RotateImageView + android:id="@+id/second_level_indicator_bar_icon" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:src="@drawable/ic_settings_holo_light" /> + </com.android.camera.ui.IndicatorControlBar> + + <com.android.camera.ui.ZoomControlBar + android:id="@+id/zoom_control" + android:layout_width="48dp" + android:layout_centerHorizontal="true" + android:layout_height="match_parent" + android:visibility="gone" /> + <com.android.camera.ui.SecondLevelIndicatorControlBar + android:id="@+id/second_level_indicator_bar" + android:layout_width="48dp" + android:layout_centerHorizontal="true" + android:layout_height="match_parent" + android:visibility="gone" /> + </RelativeLayout> </com.android.camera.ui.IndicatorControlBarContainer> diff --git a/res/values/colors.xml b/res/values/colors.xml index 2ef40b4..a0bbf7f 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -27,4 +27,5 @@ <color name="dark_gray">#151515</color> <color name="share_popup_background">#B0000000</color> <color name="share_icon_background">#40000000</color> + <color name="indicator_background">#40000000</color> </resources> |