diff options
| author | Steve Kondik <steve@cyngn.com> | 2015-10-17 23:40:33 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2015-10-17 23:40:33 -0700 |
| commit | bcbf7c98a521b9ee4a7d03e00dcfc469c9b3a398 (patch) | |
| tree | 85d07b2095695fe79235ab16e627f8b22c7bfd8d /res/layout-land/camera_controls.xml | |
| parent | a3fcd50080c0546ebd5f0caf932eef02fabdd7ad (diff) | |
| parent | 8de528917bf03cca93ac2a3dd19b7a5719d1a26e (diff) | |
| download | android_packages_apps_Gallery2-bcbf7c98a521b9ee4a7d03e00dcfc469c9b3a398.tar.gz android_packages_apps_Gallery2-bcbf7c98a521b9ee4a7d03e00dcfc469c9b3a398.tar.bz2 android_packages_apps_Gallery2-bcbf7c98a521b9ee4a7d03e00dcfc469c9b3a398.zip | |
Merge branch 'cm-12.1' of git://github.com/CyanogenMod/android_packages_apps_Gallery2 into cm-13.0
Change-Id: Ib8caa024d2e6feca332e3645038f226fd5a910a2
Diffstat (limited to 'res/layout-land/camera_controls.xml')
| -rw-r--r-- | res/layout-land/camera_controls.xml | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/res/layout-land/camera_controls.xml b/res/layout-land/camera_controls.xml index d1772401e..4baf23ebf 100644 --- a/res/layout-land/camera_controls.xml +++ b/res/layout-land/camera_controls.xml @@ -24,13 +24,13 @@ android:clickable="true" android:layout_height="match_parent" android:layout_width="@dimen/switcher_size" - android:layout_gravity="right" /> + android:layout_gravity="end" /> <include layout="@layout/menu_indicators" android:layout_width="64dip" android:layout_height="64dip" android:layout_marginTop="-5dip" - android:layout_marginRight="6dip" + android:layout_marginEnd="6dip" android:layout_gravity="top|right"/> <com.android.camera.ui.PieMenuButton @@ -38,13 +38,13 @@ style="@style/SwitcherButton" android:contentDescription="@string/accessibility_menu_button" android:layout_gravity="right|top" - android:layout_marginRight="2dip" /> + android:layout_marginEnd="2dip" /> <com.android.camera.ui.CameraSwitcher android:id="@+id/camera_switcher" style="@style/SwitcherButton" android:layout_gravity="right|bottom" - android:layout_marginRight="2dip" + android:layout_marginEnd="2dip" android:contentDescription="@string/accessibility_mode_picker" /> <com.android.camera.ShutterButton @@ -52,7 +52,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="right|center_vertical" - android:layout_marginRight="@dimen/shutter_offset" + android:layout_marginEnd="@dimen/shutter_offset" android:clickable="true" android:contentDescription="@string/accessibility_shutter_button" android:focusable="true" |