diff options
Diffstat (limited to 'res/layout')
49 files changed, 522 insertions, 159 deletions
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..096187b95 100644 --- a/res/layout/action_mode.xml +++ b/res/layout/action_mode.xml @@ -14,35 +14,22 @@ limitations under the License. --> -<LinearLayout - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/navigation_bar" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="horizontal"> - - <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" android:layout_height="match_parent"> - <ImageView android:layout_gravity="right" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:src="@drawable/dropdown_ic_arrow_normal_holo_dark" /> - <Button android:id="@+id/selection_menu" - style="?android:attr/actionButtonStyle" - android:divider="?android:attr/listDividerAlertDialog" - android:textAppearance="?android:attr/textAppearanceLargePopupMenu" - android:textColor="?android:attr/actionMenuTextColor" - android:singleLine="true" - android:gravity="left|center_vertical" - android:paddingRight="25dip" - android:layout_width="wrap_content" - android:layout_height="match_parent" /> - </FrameLayout> - <ImageView android:layout_marginLeft="16dip" - android:layout_marginRight="8dip" + <Button android:id="@+id/selection_menu" + style="?android:attr/actionButtonStyle" + android:divider="?android:attr/listDividerAlertDialog" + android:textAppearance="?android:attr/textAppearanceLargePopupMenu" + android:textColor="?android:attr/actionMenuTextColor" + android:singleLine="true" + android:gravity="left|center_vertical" + android:paddingRight="25dip" android:layout_width="wrap_content" - android:layout_height="match_parent" - android:gravity="bottom" - android:src="@drawable/cab_divider_vertical_dark" /> -</LinearLayout> + android:layout_height="match_parent" /> + <ImageView android:layout_width="wrap_content" + android:layout_height="match_parent" + android:src="@drawable/dropdown_ic_arrow" + android:layout_toRightOf="@id/selection_menu"/> + +</RelativeLayout> 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/appwidget_main.xml b/res/layout/appwidget_main.xml index 0accabb50..368d90bc5 100644 --- a/res/layout/appwidget_main.xml +++ b/res/layout/appwidget_main.xml @@ -31,6 +31,7 @@ android:layout_width="@dimen/stack_photo_width" android:layout_height="@dimen/stack_photo_height" android:gravity="center" + android:textColor="@android:color/black" android:text="@string/appwidget_empty_text"/> </FrameLayout> </RelativeLayout> diff --git a/res/layout/audio_effects_dialog.xml b/res/layout/audio_effects_dialog.xml new file mode 100644 index 000000000..49dcafb56 --- /dev/null +++ b/res/layout/audio_effects_dialog.xml @@ -0,0 +1,72 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +Copyright (c) 2013, The Linux Foundation. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + android:gravity="center"> + + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="vertical" + android:gravity="center_horizontal" + android:paddingBottom="10dp"> + + <LinearLayout + android:id="@+id/aEffectsPanel" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:layout_marginTop="12dp" + android:layout_marginBottom="10dp" + android:gravity="center_vertical"> + + <com.android.gallery3d.ui.Knob + android:id="@+id/bBStrengthKnob" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + custom:label="@string/bass_boost_strength" + custom:foreground="@drawable/knob" /> + + <com.android.gallery3d.ui.Knob + android:id="@+id/vIStrengthKnob" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + custom:label="@string/virtualizer_strength" + custom:foreground="@drawable/knob" /> + + </LinearLayout> + </LinearLayout> +</LinearLayout> diff --git a/res/layout/audio_effects_title.xml b/res/layout/audio_effects_title.xml new file mode 100644 index 000000000..fcfb11d1e --- /dev/null +++ b/res/layout/audio_effects_title.xml @@ -0,0 +1,60 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +Copyright (c) 2014, The Linux Foundation. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> + +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:custom="http://schemas.android.com/apk/res/com.android.gallery3d" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal" + android:gravity="left|center_vertical"> + + <TextView + android:text="@string/audio_effects_dialog_title" + android:gravity="left|center_vertical" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="10dp" + android:layout_marginTop="10dp" + android:layout_marginBottom="10dp" + android:textSize="20dp" /> + + <View + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" /> + + <ToggleButton + android:id="@+id/audio_effects_switch" + android:textOn="" + android:textOff="" + android:layout_width="72dp" + android:layout_height="34dp" + android:layout_marginEnd="4dp"/> +</LinearLayout> diff --git a/res/layout/bookmark.xml b/res/layout/bookmark.xml new file mode 100644 index 000000000..ac4ac34a4 --- /dev/null +++ b/res/layout/bookmark.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" > + + <ListView + android:id="@android:id/list" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + <TextView + android:id="@android:id/empty" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_centerInParent="true" + android:gravity="center" + android:paddingBottom="30dip" + android:text="@string/bookmark_empty" + android:textAppearance="?android:attr/textAppearanceLarge" + android:visibility="gone" /> +</FrameLayout> diff --git a/res/layout/bookmark_edit_dialog.xml b/res/layout/bookmark_edit_dialog.xml new file mode 100644 index 000000000..8282d39af --- /dev/null +++ b/res/layout/bookmark_edit_dialog.xml @@ -0,0 +1,43 @@ +<?xml version="1.0" encoding="utf-8"?> +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content" > + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:padding="8dip" > + + <TextView + style="?android:attr/textAppearanceSmallInverse" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/bookmark_title" /> + + <EditText + android:id="@+id/title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="2dip" + android:inputType="text" + android:scrollHorizontally="true" + android:singleLine="true" /> + + <TextView + style="?android:attr/textAppearanceSmallInverse" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/bookmark_location" /> + + <EditText + android:id="@+id/data" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="2dip" + android:inputType="textUri" + android:scrollHorizontally="true" + android:singleLine="true" /> + </LinearLayout> + +</ScrollView> diff --git a/res/layout/bookmark_item.xml b/res/layout/bookmark_item.xml new file mode 100644 index 000000000..3fb2fab89 --- /dev/null +++ b/res/layout/bookmark_item.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/panel" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:padding="6dip" > + + <TextView + android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <TextView + android:id="@+id/data" + android:layout_width="wrap_content" + android:layout_height="match_parent" /> + +</LinearLayout> 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..924d7178d 100644 --- a/res/layout/filtershow_actionbar.xml +++ b/res/layout/filtershow_actionbar.xml @@ -17,11 +17,10 @@ <TextView xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" android:layout_height="match_parent" - android:background="@drawable/filtershow_button_background" android:id="@+id/filtershow_done" android:textAllCaps="true" 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_activity.xml b/res/layout/filtershow_activity.xml index 79c315b7b..e3f4a0eeb 100644 --- a/res/layout/filtershow_activity.xml +++ b/res/layout/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" @@ -33,7 +33,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/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_action_slider.xml b/res/layout/filtershow_control_action_slider.xml index 34eac1e69..ebaf7be18 100644 --- a/res/layout/filtershow_control_action_slider.xml +++ b/res/layout/filtershow_control_action_slider.xml @@ -48,7 +48,7 @@ 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" /> </LinearLayout> 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_style_chooser.xml b/res/layout/filtershow_control_style_chooser.xml index 9588ea208..d0004ffe2 100644 --- a/res/layout/filtershow_control_style_chooser.xml +++ b/res/layout/filtershow_control_style_chooser.xml @@ -18,7 +18,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res/com.example.imagefilterharness" android:layout_width="match_parent" - android:layout_height="32dp" + android:layout_height="wrap_content" android:orientation="horizontal" > <HorizontalScrollView android:id="@+id/scrollList" 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_main_panel.xml b/res/layout/filtershow_main_panel.xml index d3400fae5..f8b26b088 100644 --- a/res/layout/filtershow_main_panel.xml +++ b/res/layout/filtershow_main_panel.xml @@ -95,8 +95,19 @@ 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:padding="2dip" + android:background="@drawable/filtershow_button_background" + android:scaleType="centerInside" + android:visibility="gone" + android:src="@drawable/ic_photoeditor_makeup"/> + </LinearLayout> </com.android.gallery3d.filtershow.CenteredLinearLayout> -</LinearLayout>
\ No newline at end of file +</LinearLayout> diff --git a/res/layout/filtershow_presets_management_row.xml b/res/layout/filtershow_presets_management_row.xml index bd3e47928..d4e05bafe 100644 --- a/res/layout/filtershow_presets_management_row.xml +++ b/res/layout/filtershow_presets_management_row.xml @@ -47,6 +47,6 @@ android:background="@android:color/transparent" android:layout_weight=".1" android:gravity="center" - android:src="@drawable/ic_menu_trash_holo_light" + android:src="@drawable/ic_menu_trash" android:visibility="gone"/> </LinearLayout>
\ No newline at end of file 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/knob.xml b/res/layout/knob.xml new file mode 100644 index 000000000..d504774e7 --- /dev/null +++ b/res/layout/knob.xml @@ -0,0 +1,75 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +Copyright (c) 2013, The Linux Foundation. All rights reserved. + +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following conditions are +met: + * Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + * Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the following + disclaimer in the documentation and/or other materials provided + with the distribution. + * Neither the name of The Linux Foundation nor the names of its + contributors may be used to endorse or promote products derived + from this software without specific prior written permission. + +THIS SOFTWARE IS PROVIDED "AS IS" AND ANY EXPRESS OR IMPLIED +WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NON-INFRINGEMENT +ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS +BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN +IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +--> + +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <ImageView + android:id="@+id/knob_foreground" + android:layout_width="wrap_content" + android:layout_height="wrap_content" /> + <ImageView + android:id="@+id/knob_toggle_on" + android:layout_gravity="center_horizontal|center_vertical" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/knob_toggle_on" + android:visibility="gone" /> + <ImageView + android:id="@+id/knob_toggle_off" + android:layout_gravity="center_horizontal|center_vertical" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/knob_toggle_off" + android:visibility="gone" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_gravity="center_horizontal" + android:orientation="vertical" + android:gravity="center_horizontal"> + + <TextView + android:id="@+id/knob_value" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:visibility="gone" /> + <TextView + android:id="@+id/knob_label" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:gravity="center" + android:ellipsize="marquee" + android:visibility="gone" /> + </LinearLayout> + +</FrameLayout> 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/movie_view.xml b/res/layout/movie_view.xml index 75b8dfd4f..a08679280 100644 --- a/res/layout/movie_view.xml +++ b/res/layout/movie_view.xml @@ -19,7 +19,7 @@ android:background="@android:color/black" android:layout_width="match_parent" android:layout_height="match_parent"> - <VideoView android:id="@+id/surface_view" + <org.codeaurora.gallery3d.video.CodeauroraVideoView android:id="@+id/surface_view" android:visibility="invisible" android:layout_width="match_parent" android:layout_height="match_parent" diff --git a/res/layout/multigrid_content.xml b/res/layout/multigrid_content.xml index b1cb145a2..618af4898 100644 --- a/res/layout/multigrid_content.xml +++ b/res/layout/multigrid_content.xml @@ -36,7 +36,7 @@ </LinearLayout> - <FrameLayout android:id="@+id/gridContainer" + <HorizontalScrollView android:id="@+id/gridContainer" android:layout_width="match_parent" android:layout_height="match_parent"> @@ -52,6 +52,6 @@ android:layout_height="match_parent" android:gravity="center" android:textAppearance="?android:attr/textAppearanceMedium" /> - </FrameLayout> + </HorizontalScrollView> -</FrameLayout>
\ No newline at end of file +</FrameLayout> 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..51f714ede 100644 --- a/res/layout/photopage_bottom_controls.xml +++ b/res/layout/photopage_bottom_controls.xml @@ -1,50 +1,80 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/photopage_bottom_controls" - android:padding="10dp" - android:layout_width="match_parent" + android:id="@+id/photopage_bottom_controls" + android:padding="10dp" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentBottom="true" + android:layout_alignParentRight="true" + android:orientation="horizontal" + android:visibility="gone"> + + <FrameLayout + android:id="@+id/photopage_bottom_control_tiny_planet" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginStart="@dimen/floating_action_button_margin_left" + android:layout_marginBottom="@dimen/floating_action_button_margin_bottom" + android:layout_alignParentLeft="true" + android:layout_alignParentBottom="true" + android:background="@drawable/floating_action_button" + android:elevation="@dimen/floating_action_button_translation_z" + android:clickable="true" + android:visibility="gone"> + <ImageButton + android:layout_width="@dimen/floating_action_button_width" + android:layout_height="@dimen/floating_action_button_height" + android:id="@+id/floating_action_button_tiny_planet" + android:background="@drawable/floating_action_button" + android:tint="@color/floating_action_button_icon_color" + android:src="@drawable/ic_menu_tiny_planet" + android:clickable="false" + android:duplicateParentState="true"/> + </FrameLayout> + + <FrameLayout + android:id="@+id/photopage_bottom_control_panorama" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/floating_action_button_margin_left" + android:layout_marginBottom="@dimen/floating_action_button_margin_bottom" + android:layout_centerHorizontal="true" + android:layout_alignParentBottom="true" + android:background="@drawable/floating_action_button" + android:elevation="@dimen/floating_action_button_translation_z" + android:clickable="true" + android:visibility="gone"> + <ImageButton + android:layout_width="70dp" + android:layout_height="70dp" + android:id="@+id/floating_action_button_panorama" + android:background="@drawable/floating_action_button" + android:tint="@color/floating_action_button_icon_color" + android:src="@drawable/ic_view_photosphere" + android:clickable="false" + android:duplicateParentState="true"/> + </FrameLayout> + + <FrameLayout + android:id="@+id/photopage_bottom_control_edit" + android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginEnd="@dimen/floating_action_button_margin_right" + android:layout_marginBottom="@dimen/floating_action_button_margin_bottom" + android:layout_alignParentEnd="true" android:layout_alignParentBottom="true" - android:layout_alignParentLeft="true" - android:orientation="horizontal" + android:background="@drawable/fab_accent" + android:elevation="@dimen/floating_action_button_translation_z" + android:clickable="true" android:visibility="gone"> <ImageButton - android:id="@+id/photopage_bottom_control_edit" - android:src="@drawable/ic_menu_edit_holo_dark" - android:background="@drawable/photopage_bottom_button_background" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentBottom="true" - android:paddingTop="5dp" - android:paddingBottom="5dp" - android:paddingLeft="15dp" - android:paddingRight="15dp" - android:visibility="gone"/> - <ImageButton - android:id="@+id/photopage_bottom_control_panorama" - android:src="@drawable/ic_view_photosphere" - android:background="@drawable/transparent_button_background" - android:layout_width="70dp" - android:layout_height="70dp" - android:layout_centerHorizontal="true" - android:layout_alignParentBottom="true" - android:paddingTop="5dp" - android:paddingBottom="5dp" - android:paddingLeft="5dp" - android:paddingRight="5dp" - android:visibility="gone"/> - <ImageButton - android:id="@+id/photopage_bottom_control_tiny_planet" - android:src="@drawable/ic_menu_tiny_planet" - android:background="@drawable/photopage_bottom_button_background" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_alignParentBottom="true" - android:paddingTop="5dp" - android:paddingBottom="5dp" - android:paddingLeft="15dp" - android:paddingRight="15dp" - android:visibility="gone"/> -</RelativeLayout> + android:layout_width="@dimen/floating_action_button_width" + android:layout_height="@dimen/floating_action_button_height" + android:id="@+id/floating_action_button_edit" + android:background="@drawable/floating_action_button" + android:tint="@color/floating_action_button_icon_color" + android:src="@drawable/ic_edit" + android:clickable="false" + android:duplicateParentState="true"/> + </FrameLayout> + </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 new file mode 100644 index 000000000..51ad7538e --- /dev/null +++ b/res/layout/setting_list.xml @@ -0,0 +1,26 @@ +<?xml version="1.0" encoding="utf-8"?> + <!-- + /* * Copyright (C) 2008 Esmertec AG. * Copyright (C) 2008 The Android + Open Source Project * * Licensed under the Apache License, Version 2.0 + (the "License"); * you may not use this file except in compliance with + the License. * You may obtain a copy of the License at * * + http://www.apache.org/licenses/LICENSE-2.0 * * Unless required by + applicable law or agreed to in writing, software * distributed under the + License is distributed on an "AS IS" BASIS, * WITHOUT WARRANTIES OR + CONDITIONS OF ANY KIND, either express or implied. * See the License for + the specific language governing permissions and * limitations under the + License. */ + --> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" android:layout_width="match_parent" + 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: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" + android:listPreferredItemHeight="48dp" + android:scrollbarAlwaysDrawVerticalTrack="true" /> +</LinearLayout> + 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/view_gif_image.xml b/res/layout/view_gif_image.xml new file mode 100644 index 000000000..976549a6b --- /dev/null +++ b/res/layout/view_gif_image.xml @@ -0,0 +1,17 @@ +<?xml version="1.0" encoding="utf-8"?> +<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <LinearLayout + android:id="@+id/image_absoluteLayout" + android:layout_height="match_parent" + android:layout_width="match_parent"> + <ImageView android:id="@+id/image_display_area" + android:layout_height="wrap_content" + android:layout_width="wrap_content" + android:clickable="true"> + </ImageView> + </LinearLayout> + +</RelativeLayout> 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" |