diff options
51 files changed, 226 insertions, 226 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_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..71aa22ac5 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" @@ -138,7 +138,7 @@ android:background="@drawable/filtershow_button_background" android:src="@drawable/ic_menu_trash_holo_light" android:paddingBottom="8dp" - android:layout_marginRight="48dp" /> + android:layout_marginEnd="48dp" /> </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" /> diff --git a/res/layout-port/camera_controls.xml b/res/layout-port/camera_controls.xml index 5f89830c5..e3ad8c152 100644 --- a/res/layout-port/camera_controls.xml +++ b/res/layout-port/camera_controls.xml @@ -31,7 +31,7 @@ android:layout_height="64dip" android:layout_gravity="bottom|right" android:layout_marginBottom="6dip" - android:layout_marginRight="-5dip" /> + android:layout_marginEnd="-5dip" /> <com.android.camera.ui.PieMenuButton android:id="@+id/menu" diff --git a/res/layout-port/keyguard_widget.xml b/res/layout-port/keyguard_widget.xml index 28b59c44d..40a601f57 100644 --- a/res/layout-port/keyguard_widget.xml +++ b/res/layout-port/keyguard_widget.xml @@ -32,15 +32,15 @@ <include layout="@layout/menu_indicators_keyguard" android:layout_width="64dip" android:layout_height="64dip" - android:layout_toRightOf="@id/shutter" + android:layout_toEndOf="@id/shutter" android:layout_alignParentBottom="true" android:layout_marginBottom="6dip" - android:layout_marginRight="-5dip" /> + android:layout_marginEnd="-5dip" /> <ImageView android:id="@+id/camera_switcher" style="@style/SwitcherButton" - android:layout_toLeftOf="@id/shutter" + android:layout_toStartOf="@id/shutter" android:layout_alignParentBottom="true" android:layout_marginBottom="2dip" android:scaleType="center" @@ -50,7 +50,7 @@ <ImageView android:id="@+id/camera_switcher_ind" style="@style/SwitcherButton" - android:layout_toLeftOf="@id/shutter" + android:layout_toStartOf="@id/shutter" android:layout_alignParentBottom="true" android:layout_marginBottom="2dip" android:scaleType="center" diff --git a/res/layout-port/review_module_control.xml b/res/layout-port/review_module_control.xml index 3c4280ed2..c7b04f79a 100644 --- a/res/layout-port/review_module_control.xml +++ b/res/layout-port/review_module_control.xml @@ -23,7 +23,7 @@ android:contentDescription="@string/accessibility_review_ok" android:visibility="gone" android:scaleType="center" - android:layout_gravity="right|bottom" + android:layout_gravity="end|bottom" android:background="@drawable/bg_pressed" android:src="@drawable/ic_menu_done_holo_light" /> @@ -42,7 +42,7 @@ android:contentDescription="@string/accessibility_review_cancel" android:visibility="gone" android:scaleType="center" - android:layout_gravity="left|bottom" + android:layout_gravity="start|bottom" android:background="@drawable/bg_pressed" android:src="@drawable/ic_menu_cancel_holo_light" /> </com.android.camera.ui.RotatableLayout> diff --git a/res/layout-port/switcher_popup.xml b/res/layout-port/switcher_popup.xml index 8fe09a361..609f869db 100644 --- a/res/layout-port/switcher_popup.xml +++ b/res/layout-port/switcher_popup.xml @@ -19,10 +19,10 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="bottom|left" - android:layout_marginLeft="8dip" + android:layout_marginStart="8dip" android:layout_marginBottom="8dip" - android:paddingLeft="16dip" - android:paddingRight="16dip" + android:paddingStart="16dip" + android:paddingEnd="16dip" android:paddingTop="8dip" android:paddingBottom="8dip" android:background="#80000000" /> diff --git a/res/layout/action_bar_text.xml b/res/layout/action_bar_text.xml index a33264702..10839eaa0 100644 --- a/res/layout/action_bar_text.xml +++ b/res/layout/action_bar_text.xml @@ -21,8 +21,8 @@ android:layout_height="wrap_content" android:textAppearance="?android:attr/textAppearanceMedium" android:gravity="center_vertical" - android:paddingLeft="18dp" - android:paddingRight="18dp" + android:paddingStart="18dp" + android:paddingEnd="18dp" android:singleLine="true" android:minHeight="?attr/listPreferredItemHeightSmall" /> diff --git a/res/layout/action_bar_two_line_text.xml b/res/layout/action_bar_two_line_text.xml index 92a4af926..6233d8eb0 100644 --- a/res/layout/action_bar_two_line_text.xml +++ b/res/layout/action_bar_two_line_text.xml @@ -19,7 +19,7 @@ android:orientation="vertical" android:gravity="center_vertical" android:duplicateParentState="false" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:layout_width="wrap_content" > <TextView android:id="@android:id/text1" @@ -35,7 +35,7 @@ android:singleLine="true" android:ellipsize="end" android:includeFontPadding="false" - android:layout_marginRight="4dp" + android:layout_marginEnd="4dp" android:layout_below="@android:id/text1" android:layout_width="wrap_content" android:layout_height="wrap_content" /> diff --git a/res/layout/action_mode.xml b/res/layout/action_mode.xml index 6c516e618..f107c26ee 100644 --- a/res/layout/action_mode.xml +++ b/res/layout/action_mode.xml @@ -24,7 +24,7 @@ <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="match_parent"> - <ImageView android:layout_gravity="right" + <ImageView android:layout_gravity="end" android:layout_width="wrap_content" android:layout_height="match_parent" android:src="@drawable/dropdown_ic_arrow_normal_holo_dark" /> @@ -35,12 +35,12 @@ android:textColor="?android:attr/actionMenuTextColor" android:singleLine="true" android:gravity="left|center_vertical" - android:paddingRight="25dip" + android:paddingEnd="25dip" android:layout_width="wrap_content" android:layout_height="match_parent" /> </FrameLayout> - <ImageView android:layout_marginLeft="16dip" - android:layout_marginRight="8dip" + <ImageView android:layout_marginStart="16dip" + android:layout_marginEnd="8dip" android:layout_width="wrap_content" android:layout_height="match_parent" android:gravity="bottom" diff --git a/res/layout/album_header.xml b/res/layout/album_header.xml index 76c9a457f..caae962b3 100644 --- a/res/layout/album_header.xml +++ b/res/layout/album_header.xml @@ -27,8 +27,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" - android:paddingLeft="15dip" + android:layout_alignParentStart="true" + android:paddingStart="15dip" android:paddingBottom="10dip" android:paddingTop="20dip" android:background="@drawable/white_text_bg_gradient" diff --git a/res/layout/camera_filmstrip.xml b/res/layout/camera_filmstrip.xml index d94a9d2a8..6fbc62114 100644 --- a/res/layout/camera_filmstrip.xml +++ b/res/layout/camera_filmstrip.xml @@ -32,8 +32,8 @@ android:background="@drawable/transparent_button_background" android:clickable="true" android:paddingBottom="5dp" - android:paddingLeft="5dp" - android:paddingRight="5dp" + android:paddingStart="5dp" + android:paddingEnd="5dp" android:paddingTop="5dp" android:visibility="gone" android:src="@drawable/ic_view_photosphere" /> @@ -44,8 +44,8 @@ android:layout_height="wrap_content" android:layout_gravity="bottom|center_horizontal" android:paddingBottom="52dp" - android:paddingLeft="5dp" - android:paddingRight="5dp" + android:paddingStart="5dp" + android:paddingEnd="5dp" android:paddingTop="5dp" android:visibility="gone" android:orientation="vertical"> @@ -61,10 +61,10 @@ android:shadowRadius="2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:paddingBottom="8dp" android:visibility="visible" - android:layout_gravity="right"/> + android:layout_gravity="end"/> <ProgressBar android:id="@+id/pano_stitching_progress_bar" diff --git a/res/layout/choose_widget_type.xml b/res/layout/choose_widget_type.xml index 5f1739ad3..d8af048b9 100644 --- a/res/layout/choose_widget_type.xml +++ b/res/layout/choose_widget_type.xml @@ -16,8 +16,8 @@ <RadioGroup xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/widget_type" - android:paddingLeft="32dp" - android:paddingRight="32dp" + android:paddingStart="32dp" + android:paddingEnd="32dp" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> @@ -42,8 +42,8 @@ <View android:layout_width="match_parent" android:layout_height="1dp" android:layout_weight="0" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:background="?android:attr/dividerHorizontal" /> <Button style="?android:attr/buttonBarButtonStyle" android:id="@+id/cancel" diff --git a/res/layout/count_down_to_capture.xml b/res/layout/count_down_to_capture.xml index 68276ad40..5cf1e3f94 100644 --- a/res/layout/count_down_to_capture.xml +++ b/res/layout/count_down_to_capture.xml @@ -27,7 +27,7 @@ <TextView android:id="@+id/count_down_title" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingLeft="10dp" + android:paddingStart="10dp" android:paddingTop="20dp" android:textSize="20sp" android:textColor="@android:color/white" diff --git a/res/layout/countdown_setting_popup.xml b/res/layout/countdown_setting_popup.xml index 22acd9251..1a314ad56 100644 --- a/res/layout/countdown_setting_popup.xml +++ b/res/layout/countdown_setting_popup.xml @@ -55,8 +55,8 @@ android:layout_width="160dp" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:layout_marginLeft="16dip" - android:layout_marginRight="16dip" + android:layout_marginStart="16dip" + android:layout_marginEnd="16dip" android:focusable="false" /> </LinearLayout> diff --git a/res/layout/dialog_picker.xml b/res/layout/dialog_picker.xml index ccc512154..fc5f2877a 100644 --- a/res/layout/dialog_picker.xml +++ b/res/layout/dialog_picker.xml @@ -26,8 +26,8 @@ </FrameLayout> <ImageView android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="16dp" - android:layout_marginRight="16dp" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" android:background="@drawable/list_divider_holo_dark" /> <Button style="?android:attr/buttonBarButtonStyle" android:id="@+id/cancel" diff --git a/res/layout/editor_grad_button.xml b/res/layout/editor_grad_button.xml index 4d1b10b6b..032eb686a 100644 --- a/res/layout/editor_grad_button.xml +++ b/res/layout/editor_grad_button.xml @@ -20,7 +20,7 @@ android:layout_height="wrap_content" android:layout_weight="1" android:layout_alignParentTop="true" - android:layout_marginLeft="26dp" + android:layout_marginStart="26dp" android:layout_marginTop="21dp" android:orientation="horizontal" > diff --git a/res/layout/filtershow_actionbar.xml b/res/layout/filtershow_actionbar.xml index 5f0aa3ff6..2b77dfcd1 100644 --- a/res/layout/filtershow_actionbar.xml +++ b/res/layout/filtershow_actionbar.xml @@ -23,5 +23,5 @@ android:text="@string/save" android:gravity="center_vertical" android:textSize="14sp" - android:drawableLeft="@drawable/menu_save_photo" + android:drawableStart="@drawable/menu_save_photo" android:drawablePadding="8dip" />
\ No newline at end of file diff --git a/res/layout/filtershow_color_picker.xml b/res/layout/filtershow_color_picker.xml index e56bc0d49..7b05765fc 100644 --- a/res/layout/filtershow_color_picker.xml +++ b/res/layout/filtershow_color_picker.xml @@ -30,8 +30,8 @@ android:id="@+id/btnSelect" android:layout_width="match_parent" android:layout_height="32dp" - android:layout_marginLeft="20dp" - android:layout_marginRight="20dp" + android:layout_marginStart="20dp" + android:layout_marginEnd="20dp" android:layout_marginTop="20dp" android:layout_marginBottom="0dp" /> @@ -40,7 +40,7 @@ android:layout_width="match_parent" android:layout_height="256dp" android:layout_marginTop="0dp" - android:layout_marginRight="1dp"/> + android:layout_marginEnd="1dp"/> <com.android.gallery3d.filtershow.colorpicker.ColorHueView android:id="@+id/ColorHueView" diff --git a/res/layout/filtershow_control_color_chooser.xml b/res/layout/filtershow_control_color_chooser.xml index 5bfe46031..145041cf0 100644 --- a/res/layout/filtershow_control_color_chooser.xml +++ b/res/layout/filtershow_control_color_chooser.xml @@ -33,7 +33,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" @@ -41,7 +41,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" @@ -49,7 +49,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" @@ -57,7 +57,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" @@ -65,7 +65,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/filtershow_control_title_slider.xml b/res/layout/filtershow_control_title_slider.xml index 584e015fa..23a59785c 100644 --- a/res/layout/filtershow_control_title_slider.xml +++ b/res/layout/filtershow_control_title_slider.xml @@ -23,13 +23,13 @@ <TextView android:id="@+id/controlName" - android:layout_gravity="left" - android:layout_marginLeft="8dip" /> + android:layout_gravity="start" + android:layout_marginStart="8dip" /> <TextView android:id="@+id/controlValue" - android:layout_gravity="right" - android:layout_marginRight="8dip" + android:layout_gravity="end" + android:layout_marginEnd="8dip" android:textStyle="bold" /> <SeekBar diff --git a/res/layout/filtershow_cp_custom_title.xml b/res/layout/filtershow_cp_custom_title.xml index cef8b6c05..5d7ed924b 100644 --- a/res/layout/filtershow_cp_custom_title.xml +++ b/res/layout/filtershow_cp_custom_title.xml @@ -21,6 +21,6 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" - android:layout_marginLeft="20dp" - android:layout_marginRight="20dp" > + android:layout_marginStart="20dp" + android:layout_marginEnd="20dp" > </TextView>
\ No newline at end of file diff --git a/res/layout/filtershow_export_dialog.xml b/res/layout/filtershow_export_dialog.xml index 4e13f39da..8dc5fc386 100644 --- a/res/layout/filtershow_export_dialog.xml +++ b/res/layout/filtershow_export_dialog.xml @@ -40,7 +40,7 @@ <TextView android:text="@string/size" - android:layout_marginLeft="8dp" + android:layout_marginStart="8dp" android:layout_gravity="start|center_vertical"/> <EditText @@ -61,7 +61,7 @@ <TextView android:id="@+id/estimadedSize" - android:layout_marginRight="8dp" + android:layout_marginEnd="8dp" android:layout_gravity="end|center_vertical"/> <LinearLayout diff --git a/res/layout/filtershow_info_panel.xml b/res/layout/filtershow_info_panel.xml index 43878b6ac..1ca64bd6d 100644 --- a/res/layout/filtershow_info_panel.xml +++ b/res/layout/filtershow_info_panel.xml @@ -74,7 +74,7 @@ android:layout_width="0dp" android:layout_height="196dp" android:scaleType="centerCrop" - android:layout_marginRight="16dp" + android:layout_marginEnd="16dp" android:background="@null" /> diff --git a/res/layout/filtershow_splashscreen.xml b/res/layout/filtershow_splashscreen.xml index 06958cab2..8d7fe3eb3 100644 --- a/res/layout/filtershow_splashscreen.xml +++ b/res/layout/filtershow_splashscreen.xml @@ -23,7 +23,7 @@ android:padding="10dip"> <ProgressBar android:id="@+id/progress_bar" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_width="wrap_content" android:layout_height="wrap_content" android:gravity="center_vertical" diff --git a/res/layout/ingest_date_tile.xml b/res/layout/ingest_date_tile.xml index 8cd63e9a0..b04221361 100644 --- a/res/layout/ingest_date_tile.xml +++ b/res/layout/ingest_date_tile.xml @@ -61,4 +61,4 @@ android:fontFamily="sans-serif" android:textColor="@color/ingest_date_tile_text" /> </GridLayout> -</com.android.gallery3d.ingest.ui.DateTileView>
\ No newline at end of file +</com.android.gallery3d.ingest.ui.DateTileView> diff --git a/res/layout/ingest_fullsize.xml b/res/layout/ingest_fullsize.xml index d57c4ae50..91a3fcf20 100644 --- a/res/layout/ingest_fullsize.xml +++ b/res/layout/ingest_fullsize.xml @@ -41,4 +41,4 @@ android:layout_alignParentRight="true" android:text="@string/ingest_import" /> -</com.android.gallery3d.ingest.ui.MtpFullscreenView>
\ No newline at end of file +</com.android.gallery3d.ingest.ui.MtpFullscreenView> diff --git a/res/layout/main.xml b/res/layout/main.xml index 08e595959..e26e0fc6b 100644 --- a/res/layout/main.xml +++ b/res/layout/main.xml @@ -13,8 +13,8 @@ <FrameLayout android:id="@+id/footer" android:visibility="gone" android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" + android:layout_alignParentStart="true" + android:layout_alignParentEnd="true" android:layout_width="match_parent" android:layout_height="wrap_content"/> </RelativeLayout> diff --git a/res/layout/manage_offline_bar.xml b/res/layout/manage_offline_bar.xml index 5c716133d..6996180f0 100644 --- a/res/layout/manage_offline_bar.xml +++ b/res/layout/manage_offline_bar.xml @@ -39,23 +39,23 @@ </RelativeLayout> <RelativeLayout android:layout_width="fill_parent" android:layout_height="@dimen/manage_cache_bottom_height" - android:paddingLeft="16dp" - android:paddingRight="16dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" android:background="#1f1f1f"> <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/make_available_offline" android:textSize="14sp" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:layout_centerVertical="true" android:gravity="center_vertical" - android:drawableLeft="@drawable/ic_menu_make_offline" + android:drawableStart="@drawable/ic_menu_make_offline" android:drawablePadding="3dp"/> <Button android:id="@+id/done" android:layout_width="74dp" android:layout_height="match_parent" android:text="@string/done" android:textSize="14sp" - android:layout_alignParentRight="true"/> + android:layout_alignParentEnd="true"/> </RelativeLayout> </LinearLayout> diff --git a/res/layout/menu_indicators_keyguard.xml b/res/layout/menu_indicators_keyguard.xml index 7a8795d23..b8f36cf78 100644 --- a/res/layout/menu_indicators_keyguard.xml +++ b/res/layout/menu_indicators_keyguard.xml @@ -21,7 +21,7 @@ <ImageView android:id="@+id/menu_scenemode_indicator" style="@style/MenuIndicator" - android:layout_gravity="left|top" + android:layout_gravity="start|top" android:src="@drawable/ic_indicator_sce_off" /> <ImageView @@ -33,13 +33,13 @@ <ImageView android:id="@+id/menu_flash_indicator" style="@style/MenuIndicator" - android:layout_gravity="right|top" + android:layout_gravity="end|top" android:src="@drawable/ic_indicator_flash_auto" /> <ImageView android:id="@+id/menu_exposure_indicator" style="@style/MenuIndicator" - android:layout_gravity="left|bottom" + android:layout_gravity="start|bottom" android:src="@drawable/ic_indicator_ev_0" /> <ImageView @@ -51,7 +51,7 @@ <ImageView android:id="@+id/menu_wb_indicator" style="@style/MenuIndicator" - android:layout_gravity="right|bottom" + android:layout_gravity="end|bottom" android:src="@drawable/ic_indicator_wb_off" /> </FrameLayout>
\ No newline at end of file diff --git a/res/layout/photo_frame.xml b/res/layout/photo_frame.xml index deadaebc1..63faf539d 100755 --- a/res/layout/photo_frame.xml +++ b/res/layout/photo_frame.xml @@ -19,8 +19,8 @@ android:layout_height="match_parent" android:paddingTop="4dp" android:paddingBottom="23dp" - android:paddingLeft="12dp" - android:paddingRight="12dp"> + android:paddingStart="12dp" + android:paddingEnd="12dp"> <ImageView android:id="@+id/photo" android:layout_gravity="center" android:layout_width="wrap_content" diff --git a/res/layout/photopage_bottom_controls.xml b/res/layout/photopage_bottom_controls.xml index f3226e68c..20b3c11cd 100644 --- a/res/layout/photopage_bottom_controls.xml +++ b/res/layout/photopage_bottom_controls.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:orientation="horizontal" android:visibility="gone"> <ImageButton @@ -14,12 +14,12 @@ android:background="@drawable/photopage_bottom_button_background" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:layout_alignParentBottom="true" android:paddingTop="5dp" android:paddingBottom="5dp" - android:paddingLeft="15dp" - android:paddingRight="15dp" + android:paddingStart="15dp" + android:paddingEnd="15dp" android:visibility="gone"/> <ImageButton android:id="@+id/photopage_bottom_control_panorama" @@ -31,8 +31,8 @@ android:layout_alignParentBottom="true" android:paddingTop="5dp" android:paddingBottom="5dp" - android:paddingLeft="5dp" - android:paddingRight="5dp" + android:paddingStart="5dp" + android:paddingEnd="5dp" android:visibility="gone"/> <ImageButton android:id="@+id/photopage_bottom_control_tiny_planet" @@ -40,11 +40,11 @@ android:background="@drawable/photopage_bottom_button_background" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_alignParentBottom="true" android:paddingTop="5dp" android:paddingBottom="5dp" - android:paddingLeft="15dp" - android:paddingRight="15dp" + android:paddingStart="15dp" + android:paddingEnd="15dp" android:visibility="gone"/> </RelativeLayout> diff --git a/res/layout/photopage_progress_bar.xml b/res/layout/photopage_progress_bar.xml index 778feb365..57b78320b 100644 --- a/res/layout/photopage_progress_bar.xml +++ b/res/layout/photopage_progress_bar.xml @@ -4,7 +4,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:padding="25dp" android:visibility="invisible"> <View @@ -19,7 +19,7 @@ android:background="#ff33b5e5" android:layout_width="10dp" android:layout_height="8dp" - android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" android:layout_alignParentBottom="true" android:visibility="visible"/> <TextView @@ -33,7 +33,7 @@ android:shadowRadius="2" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" android:layout_above="@id/photopage_progress_background" android:paddingBottom="8dp" android:visibility="visible"/> diff --git a/res/layout/popup_list_item.xml b/res/layout/popup_list_item.xml index 5a87af7cc..837da0a5d 100644 --- a/res/layout/popup_list_item.xml +++ b/res/layout/popup_list_item.xml @@ -21,8 +21,8 @@ android:textAppearance="?android:attr/textAppearanceLargePopupMenu" android:singleLine="true" android:gravity="center_vertical" - android:paddingLeft="16dp" - android:paddingRight="16dp" + android:paddingStart="16dp" + android:paddingEnd="16dp" android:minHeight="?android:attr/listPreferredItemHeight" android:minWidth="196dp" /> diff --git a/res/layout/rotate_dialog.xml b/res/layout/rotate_dialog.xml index c62ce915b..c1cf866b7 100644 --- a/res/layout/rotate_dialog.xml +++ b/res/layout/rotate_dialog.xml @@ -44,8 +44,8 @@ <TextView android:id="@+id/rotate_dialog_title" style="@style/TextAppearance.DialogWindowTitle" android:gravity="center_vertical" - android:layout_marginLeft="16dip" - android:layout_marginRight="16dip" + android:layout_marginStart="16dip" + android:layout_marginEnd="16dip" android:layout_width="match_parent" android:layout_height="wrap_content" android:minHeight="64dp"/> diff --git a/res/layout/setting_list.xml b/res/layout/setting_list.xml index 8dd8cd067..51ad7538e 100644 --- a/res/layout/setting_list.xml +++ b/res/layout/setting_list.xml @@ -16,7 +16,7 @@ android:layout_height="match_parent"> <ListView android:id="@android:id/list" android:layout_width="match_parent" android:layout_height="0px" android:layout_weight="1" - android:paddingLeft="16dip" android:paddingRight="16dip" + android:paddingStart="16dip" android:paddingEnd="16dip" android:paddingTop="0dp" android:paddingBottom="0dp" android:clipToPadding="false" android:scrollbarStyle="outsideOverlay" android:drawSelectorOnTop="false" android:cacheColorHint="@android:color/transparent" diff --git a/res/layout/time_interval_picker.xml b/res/layout/time_interval_picker.xml index d2a946273..daab1c8b8 100644 --- a/res/layout/time_interval_picker.xml +++ b/res/layout/time_interval_picker.xml @@ -40,8 +40,8 @@ android:orientation="horizontal" android:layout_width="match_parent" android:layout_height="wrap_content" - android:paddingLeft="16dip" - android:paddingRight="16dip" > + android:paddingStart="16dip" + android:paddingEnd="16dip" > <!-- time interval duration --> <NumberPicker @@ -57,7 +57,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_weight="2" - android:layout_marginLeft="20dip" + android:layout_marginStart="20dip" android:focusable="false" /> </LinearLayout> diff --git a/res/layout/time_interval_popup.xml b/res/layout/time_interval_popup.xml index 9cf224a7a..2eadf9005 100644 --- a/res/layout/time_interval_popup.xml +++ b/res/layout/time_interval_popup.xml @@ -38,8 +38,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_weight="0" - android:layout_marginRight="8dp" - android:layout_gravity="right|center_vertical" /> + android:layout_marginEnd="8dp" + android:layout_gravity="end|center_vertical" /> </LinearLayout> <View style="@style/PopupTitleSeparator" /> @@ -54,8 +54,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:paddingTop="16dip" - android:paddingLeft="16dip" - android:paddingRight="16dip" + android:paddingStart="16dip" + android:paddingEnd="16dip" android:paddingBottom="16dip" android:textAppearance="?android:attr/textAppearanceMedium" android:text="@string/set_time_interval_help"/> diff --git a/res/layout/trim_menu.xml b/res/layout/trim_menu.xml index e2333921a..c46be4c4b 100644 --- a/res/layout/trim_menu.xml +++ b/res/layout/trim_menu.xml @@ -20,13 +20,13 @@ android:layout_centerVertical="true"> <TextView android:id="@+id/start_trim" - android:layout_marginLeft="8dp" + android:layout_marginStart="8dp" android:layout_width="wrap_content" android:layout_height="match_parent" android:text="@string/save" android:textAllCaps="true" android:textSize="14sp" android:gravity="left|center_vertical" - android:drawableLeft="@drawable/menu_save_photo" + android:drawableStart="@drawable/menu_save_photo" android:drawablePadding="8dp" /> </FrameLayout> diff --git a/res/layout/undo_bar.xml b/res/layout/undo_bar.xml index 33ec91d85..bd4274d16 100644 --- a/res/layout/undo_bar.xml +++ b/res/layout/undo_bar.xml @@ -27,5 +27,5 @@ <TextView android:id="@+id/undo_button" style="@style/UndoButton" android:text="@string/undo" - android:drawableLeft="@drawable/ic_menu_revert_holo_dark"/> + android:drawableStart="@drawable/ic_menu_revert_holo_dark"/> </LinearLayout> diff --git a/res/layout/viewfinder_labels_video.xml b/res/layout/viewfinder_labels_video.xml index cfe3b0211..1ed7f3947 100644 --- a/res/layout/viewfinder_labels_video.xml +++ b/res/layout/viewfinder_labels_video.xml @@ -21,7 +21,7 @@ <TextView android:id="@+id/recording_time" style="@style/OnViewfinderLabel" android:gravity="center" - android:drawableLeft="@drawable/ic_recording_indicator" + android:drawableStart="@drawable/ic_recording_indicator" android:drawablePadding="5dp" android:visibility="gone" /> <TextView android:id="@+id/time_lapse_label" diff --git a/res/values-land/styles.xml b/res/values-land/styles.xml index 6ca7e9175..dac58a24a 100644 --- a/res/values-land/styles.xml +++ b/res/values-land/styles.xml @@ -35,7 +35,7 @@ <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> <item name="android:layout_centerVertical">true</item> - <item name="android:layout_marginRight">@dimen/setting_popup_right_margin</item> + <item name="android:layout_marginEnd">@dimen/setting_popup_right_margin</item> <item name="android:visibility">gone</item> </style> <style name="PopupTitleText"> @@ -45,14 +45,14 @@ <item name="android:layout_height">wrap_content</item> <item name="android:singleLine">true</item> <item name="android:textColor">@color/popup_title_color</item> - <item name="android:layout_marginLeft">10dp</item> - <item name="android:paddingLeft">16dp</item> + <item name="android:layout_marginStart">10dp</item> + <item name="android:paddingStart">16dp</item> </style> <style name="ViewfinderLabelLayout"> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">match_parent</item> - <item name="android:layout_marginLeft">13dp</item> - <item name="android:layout_marginRight">@dimen/indicator_bar_width</item> + <item name="android:layout_marginStart">13dp</item> + <item name="android:layout_marginEnd">@dimen/indicator_bar_width</item> <item name="android:layout_marginBottom">13dp</item> <item name="android:layout_marginTop">13dp</item> </style> @@ -67,8 +67,8 @@ <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> <item name="android:layout_centerVertical">true</item> - <item name="android:layout_alignParentRight">true</item> - <item name="android:layout_marginRight">@dimen/setting_popup_right_margin</item> + <item name="android:layout_alignParentEnd">true</item> + <item name="android:layout_marginEnd">@dimen/setting_popup_right_margin</item> <item name="android:visibility">gone</item> </style> diff --git a/res/values-port/styles.xml b/res/values-port/styles.xml index 46871c626..319b0a663 100644 --- a/res/values-port/styles.xml +++ b/res/values-port/styles.xml @@ -37,15 +37,15 @@ <item name="android:layout_height">wrap_content</item> <item name="android:singleLine">true</item> <item name="android:textColor">@color/popup_title_color</item> - <item name="android:layout_marginLeft">10dp</item> + <item name="android:layout_marginStart">10dp</item> </style> <style name="ViewfinderLabelLayout"> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">match_parent</item> <item name="android:layout_marginTop">13dp</item> <item name="android:layout_marginBottom">@dimen/indicator_bar_width</item> - <item name="android:layout_marginLeft">13dp</item> - <item name="android:layout_marginRight">13dp</item> + <item name="android:layout_marginStart">13dp</item> + <item name="android:layout_marginEnd">13dp</item> </style> <style name="PanoViewHorizontalBar"> <item name="android:background">#000000</item> diff --git a/res/values/iconbutton_styles.xml b/res/values/iconbutton_styles.xml index e33460af2..5e34063c1 100644 --- a/res/values/iconbutton_styles.xml +++ b/res/values/iconbutton_styles.xml @@ -38,8 +38,8 @@ <item name="android:textSize">13dp</item> <item name="android:scaleType">centerInside</item> <item name="android:gravity">center</item> - <item name="android:paddingLeft">3dp</item> - <item name="android:paddingRight">3dp</item> + <item name="android:paddingStart">3dp</item> + <item name="android:paddingEnd">3dp</item> <item name="android:paddingTop">6dp</item> <item name="android:paddingBottom">6dp</item> <item name="android:ellipsize">marquee</item> diff --git a/res/values/styles.xml b/res/values/styles.xml index 33dcbecb6..14e8e299b 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -128,8 +128,8 @@ <item name="android:orientation">horizontal</item> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">@dimen/setting_row_height</item> - <item name="android:paddingLeft">@dimen/setting_item_list_margin</item> - <item name="android:paddingRight">@dimen/setting_item_list_margin</item> + <item name="android:paddingStart">@dimen/setting_item_list_margin</item> + <item name="android:paddingEnd">@dimen/setting_item_list_margin</item> <item name="android:background">@drawable/setting_picker</item> </style> <style name="OnViewfinderLabel"> @@ -138,8 +138,8 @@ <item name="android:layout_height">wrap_content</item> <item name="android:singleLine">true</item> <item name="android:layout_margin">10dp</item> - <item name="android:paddingLeft">15dp</item> - <item name="android:paddingRight">15dp</item> + <item name="android:paddingStart">15dp</item> + <item name="android:paddingEnd">15dp</item> <item name="android:paddingTop">3dp</item> <item name="android:paddingBottom">3dp</item> <item name="android:textColor">@android:color/white</item> @@ -150,8 +150,8 @@ <item name="android:textAppearance">@android:style/TextAppearance.Medium</item> </style> <style name="EffectSettingGrid"> - <item name="android:layout_marginLeft">@dimen/setting_item_list_margin</item> - <item name="android:layout_marginRight">@dimen/setting_item_list_margin</item> + <item name="android:layout_marginStart">@dimen/setting_item_list_margin</item> + <item name="android:layout_marginEnd">@dimen/setting_item_list_margin</item> <item name="android:paddingBottom">3dp</item> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">wrap_content</item> @@ -166,8 +166,8 @@ <item name="android:layout_height">wrap_content</item> <item name="android:paddingTop">9dp</item> <item name="android:paddingBottom">9dp</item> - <item name="android:paddingLeft">2dp</item> - <item name="android:paddingRight">2dp</item> + <item name="android:paddingStart">2dp</item> + <item name="android:paddingEnd">2dp</item> <item name="android:background">@drawable/setting_picker</item> </style> <style name="EffectSettingItemTitle"> @@ -188,12 +188,12 @@ <item name="android:layout_width">match_parent</item> <item name="android:layout_height">wrap_content</item> <item name="android:minHeight">@dimen/effect_setting_type_text_min_height</item> - <item name="android:paddingLeft">@dimen/effect_setting_type_text_left_padding</item> + <item name="android:paddingStart">@dimen/effect_setting_type_text_left_padding</item> </style> <style name="EffectTypeSeparator"> <item name="android:layout_width">match_parent</item> - <item name="android:layout_marginLeft">8dp</item> - <item name="android:layout_marginRight">8dp</item> + <item name="android:layout_marginStart">8dp</item> + <item name="android:layout_marginEnd">8dp</item> <item name="android:layout_marginBottom">14dp</item> <item name="android:layout_height">2dp</item> <item name="android:background">#2c2c2c</item> @@ -215,8 +215,8 @@ <item name="android:textColor">@color/primary_text</item> <item name="android:minHeight">48dip</item> <item name="android:minWidth">64dip</item> - <item name="android:paddingLeft">4dip</item> - <item name="android:paddingRight">4dip</item> + <item name="android:paddingStart">4dip</item> + <item name="android:paddingEnd">4dip</item> </style> <style name="ReviewControlText_xlarge"> @@ -224,8 +224,8 @@ <item name="android:layout_width">wrap_content</item> <item name="android:background">@drawable/bg_pressed_exit_fading</item> <item name="android:gravity">center</item> - <item name="android:paddingLeft">2dp</item> - <item name="android:paddingRight">10dp</item> + <item name="android:paddingStart">2dp</item> + <item name="android:paddingEnd">10dp</item> <item name="android:paddingTop">10dp</item> <item name="android:paddingBottom">10dp</item> <item name="android:textSize">18sp</item> @@ -240,7 +240,7 @@ <item name="android:layout_height">wrap_content</item> <item name="android:singleLine">true</item> <item name="android:textColor">@color/popup_title_color</item> - <item name="android:layout_marginLeft">10dp</item> + <item name="android:layout_marginStart">10dp</item> </style> <style name="PanoCustomDialogText_xlarge"> <item name="android:textAppearance">@android:style/TextAppearance.Large</item> @@ -266,9 +266,9 @@ <item name="android:layout_height">match_parent</item> </style> <style name="UndoBar"> - <item name="android:layout_marginLeft">4dp</item> - <item name="android:layout_marginRight">4dp</item> - <item name="android:paddingLeft">16dp</item> + <item name="android:layout_marginStart">4dp</item> + <item name="android:layout_marginEnd">4dp</item> + <item name="android:paddingStart">16dp</item> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">48dp</item> <item name="android:layout_gravity">bottom</item> @@ -284,12 +284,12 @@ <item name="android:layout_height">match_parent</item> <item name="android:layout_marginTop">10dp</item> <item name="android:layout_marginBottom">10dp</item> - <item name="android:paddingRight">12dp</item> + <item name="android:paddingEnd">12dp</item> </style> <style name="UndoButton"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">match_parent</item> - <item name="android:paddingRight">16dp</item> + <item name="android:paddingEnd">16dp</item> <item name="android:textSize">12sp</item> <item name="android:gravity">center_vertical</item> <item name="android:textStyle">bold</item> |