summaryrefslogtreecommitdiffstats
path: root/res/layout-land
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout-land')
-rw-r--r--res/layout-land/camera_controls.xml10
-rw-r--r--res/layout-land/filtershow_activity.xml4
-rw-r--r--res/layout-land/filtershow_color_border_ui.xml42
-rw-r--r--res/layout-land/filtershow_draw_ui.xml30
-rw-r--r--res/layout-land/filtershow_grad_ui.xml30
-rw-r--r--res/layout-land/filtershow_main_panel.xml10
-rw-r--r--res/layout-land/filtershow_saturation_controls.xml28
-rw-r--r--res/layout-land/filtershow_vignette_controls.xml20
-rw-r--r--res/layout-land/keyguard_widget.xml16
-rw-r--r--res/layout-land/review_module_control.xml10
-rw-r--r--res/layout-land/switcher_popup.xml6
11 files changed, 108 insertions, 98 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"
diff --git a/res/layout-land/filtershow_activity.xml b/res/layout-land/filtershow_activity.xml
index f4380126e..c1c7e0e69 100644
--- a/res/layout-land/filtershow_activity.xml
+++ b/res/layout-land/filtershow_activity.xml
@@ -19,7 +19,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/mainView"
- android:background="@drawable/filtershow_tiled_background">
+ android:background="@color/filtershow_background">
<LinearLayout
android:layout_width="match_parent"
@@ -35,7 +35,7 @@
<ProgressBar
android:id="@+id/loading"
- style="@android:style/Widget.Holo.ProgressBar.Large"
+ style="@android:style/Widget.Material.ProgressBar.Large"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
diff --git a/res/layout-land/filtershow_color_border_ui.xml b/res/layout-land/filtershow_color_border_ui.xml
index 9945d9d63..82fe14a7d 100644
--- a/res/layout-land/filtershow_color_border_ui.xml
+++ b/res/layout-land/filtershow_color_border_ui.xml
@@ -46,14 +46,14 @@
<TextView
android:id="@+id/controlName1"
- android:layout_gravity="left"
- android:layout_marginLeft="8dip"
+ android:layout_gravity="start"
+ android:layout_marginStart="8dip"
android:text="@string/color_border_size"/>
<TextView
android:id="@+id/colorBorderSizeValue"
- android:layout_gravity="right"
- android:layout_marginRight="8dip"
+ android:layout_gravity="end"
+ android:layout_marginEnd="8dip"
android:textStyle="bold"/>
<SeekBar
@@ -74,14 +74,14 @@
<TextView
android:id="@+id/controlName2"
- android:layout_gravity="left"
- android:layout_marginLeft="8dip"
+ android:layout_gravity="start"
+ android:layout_marginStart="8dip"
android:text="@string/color_border_corner_size"/>
<TextView
android:id="@+id/colorBorderCornerValue"
- android:layout_gravity="right"
- android:layout_marginRight="8dip"
+ android:layout_gravity="end"
+ android:layout_marginEnd="8dip"
android:textStyle="bold"/>
<SeekBar
@@ -122,7 +122,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/draw_color"
- android:layout_marginLeft="8dip"
+ android:layout_marginStart="8dip"
android:id="@+id/textView"/>
@@ -130,8 +130,8 @@
android:id="@+id/btnSelect"
android:layout_width="match_parent"
android:layout_height="32dp"
- android:layout_marginLeft="18dp"
- android:layout_marginRight="18dp"
+ android:layout_marginStart="18dp"
+ android:layout_marginEnd="18dp"
android:layout_marginTop="0dp"
android:layout_marginBottom="0dp"
/>
@@ -142,7 +142,7 @@
android:layout_height="@dimen/draw_ui_width"
android:layout_gravity="center"
android:layout_marginTop="8dp"
- android:layout_marginRight="1dp"/>
+ android:layout_marginEnd="1dp"/>
<com.android.gallery3d.filtershow.colorpicker.ColorHueView
android:id="@+id/ColorHueView"
@@ -164,8 +164,8 @@
android:orientation="horizontal"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
- android:layout_marginLeft="1dp"
- android:layout_marginRight="1dp">
+ android:layout_marginStart="1dp"
+ android:layout_marginEnd="1dp">
<LinearLayout
android:layout_width="match_parent"
@@ -173,8 +173,8 @@
android:orientation="horizontal"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
- android:layout_marginLeft="1dp"
- android:layout_marginRight="1dp">
+ android:layout_marginStart="1dp"
+ android:layout_marginEnd="1dp">
<LinearLayout
android:id="@+id/listColors"
@@ -189,7 +189,7 @@
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@drawable/filtershow_color_picker_circle"
- android:layout_marginRight="4dp"/>
+ android:layout_marginEnd="4dp"/>
<Button
android:id="@+id/draw_color_button02"
@@ -197,7 +197,7 @@
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@drawable/filtershow_color_picker_circle"
- android:layout_marginRight="4dp"/>
+ android:layout_marginEnd="4dp"/>
<Button
android:id="@+id/draw_color_button03"
@@ -205,7 +205,7 @@
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@drawable/filtershow_color_picker_circle"
- android:layout_marginRight="4dp"/>
+ android:layout_marginEnd="4dp"/>
<Button
android:id="@+id/draw_color_button04"
@@ -213,7 +213,7 @@
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@drawable/filtershow_color_picker_circle"
- android:layout_marginRight="4dp"/>
+ android:layout_marginEnd="4dp"/>
<Button
android:id="@+id/draw_color_button05"
@@ -221,7 +221,7 @@
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@drawable/filtershow_color_picker_circle"
- android:layout_marginRight="4dp"/>
+ android:layout_marginEnd="4dp"/>
</LinearLayout>
<FrameLayout
diff --git a/res/layout-land/filtershow_draw_ui.xml b/res/layout-land/filtershow_draw_ui.xml
index 5e0a32725..642a7bdb6 100644
--- a/res/layout-land/filtershow_draw_ui.xml
+++ b/res/layout-land/filtershow_draw_ui.xml
@@ -55,14 +55,14 @@
<TextView
android:id="@+id/controlName1"
- android:layout_gravity="left"
- android:layout_marginLeft="8dip"
+ android:layout_gravity="start"
+ android:layout_marginStart="8dip"
android:text="@string/draw_size"/>
<TextView
android:id="@+id/drawSizeValue"
- android:layout_gravity="right"
- android:layout_marginRight="8dip"
+ android:layout_gravity="end"
+ android:layout_marginEnd="8dip"
android:textStyle="bold"/>
<SeekBar
@@ -106,7 +106,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/draw_color"
- android:layout_marginLeft="8dip"
+ android:layout_marginStart="8dip"
android:id="@+id/textView"
android:visibility="gone"/>
@@ -114,8 +114,8 @@
android:id="@+id/btnSelect"
android:layout_width="match_parent"
android:layout_height="32dp"
- android:layout_marginLeft="18dp"
- android:layout_marginRight="18dp"
+ android:layout_marginStart="18dp"
+ android:layout_marginEnd="18dp"
android:layout_marginTop="0dp"
android:layout_marginBottom="0dp"
/>
@@ -126,7 +126,7 @@
android:layout_height="@dimen/draw_ui_width"
android:layout_gravity="center"
android:layout_marginTop="8dp"
- android:layout_marginRight="1dp"/>
+ android:layout_marginEnd="1dp"/>
<com.android.gallery3d.filtershow.colorpicker.ColorHueView
android:id="@+id/ColorHueView"
@@ -149,8 +149,8 @@
android:orientation="horizontal"
android:layout_marginBottom="10dp"
android:layout_marginTop="10dp"
- android:layout_marginLeft="1dp"
- android:layout_marginRight="1dp">
+ android:layout_marginStart="1dp"
+ android:layout_marginEnd="1dp">
<LinearLayout
@@ -166,7 +166,7 @@
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@drawable/filtershow_color_picker_circle"
- android:layout_marginRight="4dp"/>
+ android:layout_marginEnd="4dp"/>
<Button
android:id="@+id/draw_color_button02"
@@ -174,7 +174,7 @@
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@drawable/filtershow_color_picker_circle"
- android:layout_marginRight="4dp"/>
+ android:layout_marginEnd="4dp"/>
<Button
android:id="@+id/draw_color_button03"
@@ -182,7 +182,7 @@
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@drawable/filtershow_color_picker_circle"
- android:layout_marginRight="4dp"/>
+ android:layout_marginEnd="4dp"/>
<Button
android:id="@+id/draw_color_button04"
@@ -190,7 +190,7 @@
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@drawable/filtershow_color_picker_circle"
- android:layout_marginRight="4dp"/>
+ android:layout_marginEnd="4dp"/>
<Button
android:id="@+id/draw_color_button05"
@@ -198,7 +198,7 @@
android:layout_weight="1"
android:layout_height="wrap_content"
android:background="@drawable/filtershow_color_picker_circle"
- android:layout_marginRight="4dp"/>
+ android:layout_marginEnd="4dp"/>
</LinearLayout>
diff --git a/res/layout-land/filtershow_grad_ui.xml b/res/layout-land/filtershow_grad_ui.xml
index fd09beebb..8f6a8ae09 100644
--- a/res/layout-land/filtershow_grad_ui.xml
+++ b/res/layout-land/filtershow_grad_ui.xml
@@ -30,14 +30,14 @@
<TextView
android:id="@+id/controlName1"
- android:layout_gravity="left"
- android:layout_marginLeft="8dip"
+ android:layout_gravity="start"
+ android:layout_marginStart="8dip"
android:text="@string/editor_grad_brightness" />
<TextView
android:id="@+id/gradBrightnessValue"
- android:layout_gravity="right"
- android:layout_marginRight="8dip"
+ android:layout_gravity="end"
+ android:layout_marginEnd="8dip"
android:textStyle="bold" />
<SeekBar
@@ -58,14 +58,14 @@
<TextView
android:id="@+id/controlName2"
- android:layout_gravity="left"
- android:layout_marginLeft="8dip"
+ android:layout_gravity="start"
+ android:layout_marginStart="8dip"
android:text="@string/editor_grad_saturation"/>
<TextView
android:id="@+id/gradSaturationValue"
- android:layout_gravity="right"
- android:layout_marginRight="8dip"
+ android:layout_gravity="end"
+ android:layout_marginEnd="8dip"
android:textStyle="bold" />
<SeekBar
@@ -84,14 +84,14 @@
<TextView
android:id="@+id/controlName3"
- android:layout_gravity="left"
- android:layout_marginLeft="8dip"
+ android:layout_gravity="start"
+ android:layout_marginStart="8dip"
android:text="@string/editor_grad_contrast"/>
<TextView
android:id="@+id/gradContrastValue"
- android:layout_gravity="right"
- android:layout_marginRight="8dip"
+ android:layout_gravity="end"
+ android:layout_marginEnd="8dip"
android:textStyle="bold" />
<SeekBar
@@ -120,7 +120,7 @@
android:background="@drawable/filtershow_button_background"
android:src="@drawable/filtershow_addpoint"
android:paddingBottom="8dp"
- android:layout_marginLeft="48dp" />
+ android:layout_marginStart="48dp" />
<View
android:layout_width="wrap_content"
@@ -136,9 +136,9 @@
android:scaleType="centerInside"
android:layout_weight="0"
android:background="@drawable/filtershow_button_background"
- android:src="@drawable/ic_menu_trash_holo_light"
+ android:src="@drawable/ic_menu_trash"
android:paddingBottom="8dp"
- android:layout_marginRight="48dp" />
+ android:layout_marginEnd="48dp" />
</LinearLayout>
diff --git a/res/layout-land/filtershow_main_panel.xml b/res/layout-land/filtershow_main_panel.xml
index 6a36de2d7..e508e767b 100644
--- a/res/layout-land/filtershow_main_panel.xml
+++ b/res/layout-land/filtershow_main_panel.xml
@@ -83,6 +83,16 @@
android:padding="2dip"
android:scaleType="centerInside"
android:src="@drawable/ic_photoeditor_color"/>
+ <ImageButton
+ android:id="@+id/makeupButton"
+ android:layout_width="@dimen/thumbnail_size"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:background="@drawable/filtershow_button_background"
+ android:padding="2dip"
+ android:scaleType="centerInside"
+ android:visibility="gone"
+ android:src="@drawable/ic_photoeditor_makeup"/>
</LinearLayout>
diff --git a/res/layout-land/filtershow_saturation_controls.xml b/res/layout-land/filtershow_saturation_controls.xml
index f452a6487..6003b7389 100644
--- a/res/layout-land/filtershow_saturation_controls.xml
+++ b/res/layout-land/filtershow_saturation_controls.xml
@@ -25,11 +25,11 @@
android:text="@string/editor_chan_sat_red"
android:textStyle="bold"
android:textColor="#ff8080"
- android:layout_marginLeft="8dp"/>
+ android:layout_marginStart="8dp"/>
<TextView
android:layout_gravity="right|center_vertical"
android:id="@+id/redValue"
- android:layout_marginRight="16dp"/>
+ android:layout_marginEnd="16dp"/>
<SeekBar
android:id="@+id/redSeekBar"
android:layout_width="match_parent"
@@ -42,11 +42,11 @@
android:text="@string/editor_chan_sat_yellow"
android:textStyle="bold"
android:textColor="#ffff80"
- android:layout_marginLeft="8dp"/>
+ android:layout_marginStart="8dp"/>
<TextView
android:layout_gravity="right|center_vertical"
android:id="@+id/yellowValue"
- android:layout_marginRight="16dp"/>
+ android:layout_marginEnd="16dp"/>
<SeekBar
android:id="@+id/yellowSeekBar"
android:layout_width="match_parent"
@@ -59,11 +59,11 @@
android:text="@string/editor_chan_sat_green"
android:textStyle="bold"
android:textColor="#80ff80"
- android:layout_marginLeft="8dp"/>
+ android:layout_marginStart="8dp"/>
<TextView
android:layout_gravity="right|center_vertical"
android:id="@+id/greenValue"
- android:layout_marginRight="16dp"/>
+ android:layout_marginEnd="16dp"/>
<SeekBar
android:id="@+id/greenSeekBar"
android:layout_width="match_parent"
@@ -76,11 +76,11 @@
android:text="@string/editor_chan_sat_cyan"
android:textStyle="bold"
android:textColor="#80ffff"
- android:layout_marginLeft="8dp"/>
+ android:layout_marginStart="8dp"/>
<TextView
android:layout_gravity="right|center_vertical"
android:id="@+id/cyanValue"
- android:layout_marginRight="16dp"/>
+ android:layout_marginEnd="16dp"/>
<SeekBar
android:id="@+id/cyanSeekBar"
android:layout_width="match_parent"
@@ -93,11 +93,11 @@
android:text="@string/editor_chan_sat_blue"
android:textStyle="bold"
android:textColor="#8080ff"
- android:layout_marginLeft="8dp"/>
+ android:layout_marginStart="8dp"/>
<TextView
android:layout_gravity="right|center_vertical"
android:id="@+id/blueValue"
- android:layout_marginRight="16dp"/>
+ android:layout_marginEnd="16dp"/>
<SeekBar
android:id="@+id/blueSeekBar"
android:layout_width="match_parent"
@@ -110,11 +110,11 @@
android:text="@string/editor_chan_sat_magenta"
android:textStyle="bold"
android:textColor="#ff80ff"
- android:layout_marginLeft="8dp"/>
+ android:layout_marginStart="8dp"/>
<TextView
android:layout_gravity="right|center_vertical"
android:id="@+id/magentaValue"
- android:layout_marginRight="16dp"/>
+ android:layout_marginEnd="16dp"/>
<SeekBar
android:id="@+id/magentaSeekBar"
android:layout_width="match_parent"
@@ -137,11 +137,11 @@
<TextView
android:layout_gravity="left|center_vertical"
android:text="@string/editor_chan_sat_main"
- android:layout_marginLeft="8dp"/>
+ android:layout_marginStart="8dp"/>
<TextView
android:layout_gravity="right|center_vertical"
android:id="@+id/mainValue"
- android:layout_marginRight="16dp"/>
+ android:layout_marginEnd="16dp"/>
<SeekBar
android:id="@+id/mainSeekbar"
android:layout_width="match_parent"
diff --git a/res/layout-land/filtershow_vignette_controls.xml b/res/layout-land/filtershow_vignette_controls.xml
index 9bfb29f41..7cb27e9e2 100644
--- a/res/layout-land/filtershow_vignette_controls.xml
+++ b/res/layout-land/filtershow_vignette_controls.xml
@@ -24,12 +24,12 @@
android:layout_gravity="left|center_vertical"
android:text="@string/vignette_exposure"
android:textStyle="bold"
- android:layout_marginLeft="8dp"
+ android:layout_marginStart="8dp"
android:visibility="gone"/>
<TextView
android:layout_gravity="right|center_vertical"
android:id="@+id/exposureValue"
- android:layout_marginRight="16dp"
+ android:layout_marginEnd="16dp"
android:visibility="gone"/>
<SeekBar
android:id="@+id/exposureSeekBar"
@@ -43,11 +43,11 @@
android:layout_gravity="left|center_vertical"
android:text="@string/vignette_saturation"
android:textStyle="bold"
- android:layout_marginLeft="8dp"/>
+ android:layout_marginStart="8dp"/>
<TextView
android:layout_gravity="right|center_vertical"
android:id="@+id/saturationValue"
- android:layout_marginRight="16dp"/>
+ android:layout_marginEnd="16dp"/>
<SeekBar
android:id="@+id/saturationSeekBar"
android:layout_width="match_parent"
@@ -59,11 +59,11 @@
android:layout_gravity="left|center_vertical"
android:text="@string/vignette_contrast"
android:textStyle="bold"
- android:layout_marginLeft="8dp"/>
+ android:layout_marginStart="8dp"/>
<TextView
android:layout_gravity="right|center_vertical"
android:id="@+id/contrastValue"
- android:layout_marginRight="16dp"/>
+ android:layout_marginEnd="16dp"/>
<SeekBar
android:id="@+id/contrastSeekBar"
android:layout_width="match_parent"
@@ -75,11 +75,11 @@
android:layout_gravity="left|center_vertical"
android:text="@string/vignette_falloff"
android:textStyle="bold"
- android:layout_marginLeft="8dp"/>
+ android:layout_marginStart="8dp"/>
<TextView
android:layout_gravity="right|center_vertical"
android:id="@+id/falloffValue"
- android:layout_marginRight="16dp"/>
+ android:layout_marginEnd="16dp"/>
<SeekBar
android:id="@+id/falloffSeekBar"
android:layout_width="match_parent"
@@ -103,11 +103,11 @@
<TextView
android:layout_gravity="left|center_vertical"
android:text="@string/vignette_main"
- android:layout_marginLeft="8dp"/>
+ android:layout_marginStart="8dp"/>
<TextView
android:layout_gravity="right|center_vertical"
android:id="@+id/mainVignetteValue"
- android:layout_marginRight="16dp"/>
+ android:layout_marginEnd="16dp"/>
<SeekBar
android:id="@+id/mainVignetteSeekbar"
android:layout_width="match_parent"
diff --git a/res/layout-land/keyguard_widget.xml b/res/layout-land/keyguard_widget.xml
index f0f4362aa..68396230c 100644
--- a/res/layout-land/keyguard_widget.xml
+++ b/res/layout-land/keyguard_widget.xml
@@ -25,8 +25,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
- android:layout_alignParentRight="true"
- android:layout_marginRight="@dimen/shutter_offset"
+ android:layout_alignParentEnd="true"
+ android:layout_marginEnd="@dimen/shutter_offset"
android:contentDescription="@string/accessibility_shutter_button"
android:scaleType="center"
android:src="@drawable/btn_new_shutter" />
@@ -35,8 +35,8 @@
android:layout_width="64dip"
android:layout_height="64dip"
android:layout_above="@id/shutter_button"
- android:layout_alignParentRight="true"
- android:layout_marginRight="6dip"
+ android:layout_alignParentEnd="true"
+ android:layout_marginEnd="6dip"
android:layout_marginTop="-5dip"
layout="@layout/menu_indicators_keyguard" />
@@ -44,8 +44,8 @@
android:id="@+id/camera_switcher"
style="@style/SwitcherButton"
android:layout_below="@id/shutter_button"
- android:layout_alignParentRight="true"
- android:layout_marginRight="2dip"
+ android:layout_alignParentEnd="true"
+ android:layout_marginEnd="2dip"
android:contentDescription="@string/accessibility_mode_picker"
android:scaleType="center"
android:src="@drawable/ic_switch_camera" />
@@ -54,8 +54,8 @@
android:id="@+id/camera_switcher_ind"
style="@style/SwitcherButton"
android:layout_below="@id/shutter_button"
- android:layout_alignParentRight="true"
- android:layout_marginRight="2dip"
+ android:layout_alignParentEnd="true"
+ android:layout_marginEnd="2dip"
android:contentDescription="@string/accessibility_mode_picker"
android:scaleType="center"
android:src="@drawable/ic_switcher_menu_indicator" />
diff --git a/res/layout-land/review_module_control.xml b/res/layout-land/review_module_control.xml
index 9f8b0cd46..6e0ee4a48 100644
--- a/res/layout-land/review_module_control.xml
+++ b/res/layout-land/review_module_control.xml
@@ -16,21 +16,21 @@
<com.android.camera.ui.RotatableLayout
xmlns:android="http://schemas.android.com/apk/res/android"
style="@style/CameraControls"
- android:layout_gravity="right|center_vertical"
- android:layout_marginRight="2dip">
+ android:layout_gravity="end|center_vertical"
+ android:layout_marginEnd="2dip">
<ImageView android:id="@+id/btn_done"
style="@style/ReviewControlIcon"
android:contentDescription="@string/accessibility_review_ok"
android:visibility="gone"
android:scaleType="center"
- android:layout_gravity="top|right"
+ android:layout_gravity="top|end"
android:background="@drawable/bg_pressed"
android:src="@drawable/ic_menu_done_holo_light" />
<ImageView android:id="@+id/btn_retake"
style="@style/ReviewControlIcon"
android:contentDescription="@string/accessibility_review_retake"
- android:layout_gravity="right|center_vertical"
+ android:layout_gravity="end|center_vertical"
android:scaleType="center"
android:focusable="true"
android:visibility="gone"
@@ -42,7 +42,7 @@
android:contentDescription="@string/accessibility_review_cancel"
android:visibility="gone"
android:scaleType="center"
- android:layout_gravity="bottom|right"
+ android:layout_gravity="bottom|end"
android:background="@drawable/bg_pressed"
android:src="@drawable/ic_menu_cancel_holo_light" />
</com.android.camera.ui.RotatableLayout>
diff --git a/res/layout-land/switcher_popup.xml b/res/layout-land/switcher_popup.xml
index fc2d7bc77..ebb4243f6 100644
--- a/res/layout-land/switcher_popup.xml
+++ b/res/layout-land/switcher_popup.xml
@@ -19,10 +19,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="bottom|right"
- android:layout_marginRight="8dip"
+ android:layout_marginEnd="8dip"
android:layout_marginBottom="8dip"
- android:paddingLeft="8dip"
- android:paddingRight="8dip"
+ android:paddingStart="8dip"
+ android:paddingEnd="8dip"
android:paddingTop="16dip"
android:paddingBottom="16dip"
android:background="#80000000" />
generated by cgit v1.2.3 (git 2.25.1) at 2024-04-28 01:06:39 +0000