diff options
| author | Chung-yih Wang <cywang@google.com> | 2011-08-16 11:20:50 +0800 |
|---|---|---|
| committer | Chung-yih Wang <cywang@google.com> | 2011-08-17 18:57:15 +0800 |
| commit | 95788ace8ad3630312f2f94544690c448c935f9e (patch) | |
| tree | 6ae41c77591dc26b78d53db2cbd7a44a927d5156 /res/layout | |
| parent | b5f9aaec7e3376e35681befd4a3376e36dd3237a (diff) | |
| download | LegacyCamera-95788ace8ad3630312f2f94544690c448c935f9e.zip LegacyCamera-95788ace8ad3630312f2f94544690c448c935f9e.tar.gz LegacyCamera-95788ace8ad3630312f2f94544690c448c935f9e.tar.bz2 | |
Move CameraPicker into IndicatorControl.
+Move the CameraPicker icon to IndicatorBar for Phone UI.
Change-Id: I2ab75166586adb6a029b4cf1b3f19604526dd818
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/camera_control.xml | 10 | ||||
| -rw-r--r-- | res/layout/indicator_bar.xml | 2 |
2 files changed, 0 insertions, 12 deletions
diff --git a/res/layout/camera_control.xml b/res/layout/camera_control.xml index ea9c3fe..801b173 100644 --- a/res/layout/camera_control.xml +++ b/res/layout/camera_control.xml @@ -23,16 +23,6 @@ <include layout="@layout/review_thumbnail"/> - <com.android.camera.ui.CameraPicker android:id="@+id/camera_picker" - android:clickable="true" - android:layout_centerVertical="true" - android:layout_centerHorizontal="true" - android:layout_below="@+id/share_button" - android:layout_above="@+id/shutter_button" - android:layout_width="36dp" - android:layout_height="36dp" /> - <!-- need fixed size of the view since the source icon(HDPI) will be too large for phones --> - <com.android.camera.ShutterButton android:id="@+id/shutter_button" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/res/layout/indicator_bar.xml b/res/layout/indicator_bar.xml index b3d8c09..e57cf45 100644 --- a/res/layout/indicator_bar.xml +++ b/res/layout/indicator_bar.xml @@ -17,9 +17,7 @@ android:id="@+id/indicator_control" android:layout_width="48dp" android:layout_height="match_parent" - android:layout_marginTop="6dp" android:layout_marginRight="6dp" - android:layout_marginBottom="6dp" android:clickable="true" android:layout_alignParentRight="true"> <com.android.camera.ui.IndicatorBar |