diff options
| author | Doris Liu <tianliu@google.com> | 2013-03-06 03:46:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-03-06 03:46:53 +0000 |
| commit | 457bab952ea6b8babf2d37c817f06aed3829ba61 (patch) | |
| tree | 477d71e024d9f1332a591b0cc477c72074e11594 /res/layout-land | |
| parent | 63b33e8c7ebeeec2b520fb419d89ada712ad6604 (diff) | |
| parent | 8d2d0f5f0f7fffce9dbcc70da6924af545eba26d (diff) | |
| download | android_packages_apps_Gallery2-457bab952ea6b8babf2d37c817f06aed3829ba61.tar.gz android_packages_apps_Gallery2-457bab952ea6b8babf2d37c817f06aed3829ba61.tar.bz2 android_packages_apps_Gallery2-457bab952ea6b8babf2d37c817f06aed3829ba61.zip | |
Merge "Keep camera controls on the same physical side" into gb-ub-photos-bryce
Diffstat (limited to 'res/layout-land')
| -rw-r--r-- | res/layout-land/camera_controls.xml | 44 |
1 files changed, 16 insertions, 28 deletions
diff --git a/res/layout-land/camera_controls.xml b/res/layout-land/camera_controls.xml index a909c5132..f0f3ecca2 100644 --- a/res/layout-land/camera_controls.xml +++ b/res/layout-land/camera_controls.xml @@ -13,21 +13,16 @@ See the License for the specific language governing permissions and limitations under the License. --> -<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" +<com.android.camera.ui.RotatableLayout + xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/camera_controls" - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <com.android.camera.ui.RotatableLayout - style="@style/CameraControls" - android:id="@+id/menu_button" - android:layout_gravity="center" > + style="@style/CameraControls" + android:layout_gravity="center" > <View android:id="@+id/blocker" android:layout_height="match_parent" android:layout_width="@dimen/switcher_size" - android:background="@drawable/switcher_bg" android:clickable="true" android:layout_gravity="right" /> @@ -44,30 +39,23 @@ android:contentDescription="@string/accessibility_menu_button" android:layout_gravity="right|top" android:layout_marginRight="2dip" /> - </com.android.camera.ui.RotatableLayout> - <com.android.camera.ui.RotatableLayout - style="@style/CameraControls" - android:id="@+id/switcher_control" - android:layout_gravity="right|center_horizontal" > <com.android.camera.ui.CameraSwitcher android:id="@+id/camera_switcher" style="@style/SwitcherButton" android:layout_gravity="right|bottom" android:layout_marginRight="2dip" android:contentDescription="@string/accessibility_mode_picker" /> - </com.android.camera.ui.RotatableLayout> - - <com.android.camera.ShutterButton - android:id="@+id/shutter_button" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="right|center_vertical" - android:layout_marginRight="@dimen/shutter_offset" - android:clickable="true" - android:contentDescription="@string/accessibility_shutter_button" - android:focusable="true" - android:scaleType="center" - android:src="@drawable/btn_new_shutter" /> -</FrameLayout>
\ No newline at end of file + <com.android.camera.ShutterButton + android:id="@+id/shutter_button" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="right|center_vertical" + android:layout_marginRight="@dimen/shutter_offset" + android:clickable="true" + android:contentDescription="@string/accessibility_shutter_button" + android:focusable="true" + android:scaleType="center" + android:src="@drawable/btn_new_shutter" /> +</com.android.camera.ui.RotatableLayout> |