diff options
| author | Chung-yih Wang <cywang@google.com> | 2011-08-19 00:06:51 +0800 |
|---|---|---|
| committer | Chung-yih Wang <cywang@google.com> | 2011-08-23 19:01:11 +0800 |
| commit | ff45331706e2fe361b4ff736d90b0ad4af0e7be9 (patch) | |
| tree | b2e242b2ef9808b93fbc7eb853ed61a4a336b47c /res | |
| parent | e285af9d6df325a8c3dfd70248add8ab62fe5b3b (diff) | |
| download | LegacyCamera-ff45331706e2fe361b4ff736d90b0ad4af0e7be9.zip LegacyCamera-ff45331706e2fe361b4ff736d90b0ad4af0e7be9.tar.gz LegacyCamera-ff45331706e2fe361b4ff736d90b0ad4af0e7be9.tar.bz2 | |
Refactor indicator wheel.
+add IndicatorControlWheel container.
Change-Id: Ia3c7f0441de75a70c8a2172e86d3812b2ef1a15b
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout-w1024dp/camera_control.xml | 50 | ||||
| -rw-r--r-- | res/layout/indicator_bar.xml | 10 |
2 files changed, 31 insertions, 29 deletions
diff --git a/res/layout-w1024dp/camera_control.xml b/res/layout-w1024dp/camera_control.xml index 2ce91b6..23bad2b 100644 --- a/res/layout-w1024dp/camera_control.xml +++ b/res/layout-w1024dp/camera_control.xml @@ -28,33 +28,35 @@ <include layout="@layout/review_thumbnail" /> - <com.android.camera.ui.IndicatorWheel android:id="@+id/indicator_control" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_alignParentRight="true"> + <com.android.camera.ui.IndicatorControlWheelContainer android:id="@+id/indicator_control" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_alignParentRight="true"> <com.android.camera.ShutterButton android:id="@+id/shutter_button" - android:layout_height="wrap_content" - android:layout_width="wrap_content" - android:scaleType="center" - android:clickable="true" - android:focusable="true" - android:background="@drawable/btn_shutter" /> - <com.android.camera.ui.RotateImageView android:id="@+id/zoom_increment" - android:clickable="true" - android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/btn_zoom_in" - android:visibility="gone" /> - - <com.android.camera.ui.RotateImageView android:id="@+id/zoom_decrement" - android:clickable="true" android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/btn_zoom_out" - android:visibility="gone" /> - </com.android.camera.ui.IndicatorWheel> - + android:scaleType="center" + android:clickable="true" + android:focusable="true" + android:background="@drawable/btn_shutter" /> + <com.android.camera.ui.IndicatorControlWheel android:id="@+id/indicator_control_wheel" + android:layout_width="match_parent" + android:layout_height="match_parent"> + <com.android.camera.ui.RotateImageView android:id="@+id/zoom_increment" + android:clickable="true" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/btn_zoom_in" + android:visibility="gone" /> + <com.android.camera.ui.RotateImageView android:id="@+id/zoom_decrement" + android:clickable="true" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/btn_zoom_out" + android:visibility="gone" /> + </com.android.camera.ui.IndicatorControlWheel> + </com.android.camera.ui.IndicatorControlWheelContainer> <com.android.camera.ui.ZoomPicker android:id="@+id/zoom_control" android:layout_width="wrap_content" diff --git a/res/layout/indicator_bar.xml b/res/layout/indicator_bar.xml index e57cf45..8f2fead 100644 --- a/res/layout/indicator_bar.xml +++ b/res/layout/indicator_bar.xml @@ -13,14 +13,14 @@ See the License for the specific language governing permissions and limitations under the License. --> -<com.android.camera.ui.IndicatorControlContainer xmlns:android="http://schemas.android.com/apk/res/android" +<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_height="match_parent" android:layout_marginRight="6dp" android:clickable="true" android:layout_alignParentRight="true"> - <com.android.camera.ui.IndicatorBar + <com.android.camera.ui.IndicatorControlBar android:id="@+id/indicator_bar" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -37,16 +37,16 @@ android:layout_height="wrap_content" android:layout_alignParentBottom="true" android:src="@drawable/ic_settings_holo_light" /> - </com.android.camera.ui.IndicatorBar> + </com.android.camera.ui.IndicatorControlBar> <com.android.camera.ui.ZoomControlBar android:id="@+id/zoom_control" android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="gone" /> - <com.android.camera.ui.SecondLevelIndicatorBar + <com.android.camera.ui.SecondLevelIndicatorControlBar android:id="@+id/second_level_indicator_bar" android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="gone" /> -</com.android.camera.ui.IndicatorControlContainer> +</com.android.camera.ui.IndicatorControlBarContainer> |