diff options
Diffstat (limited to 'res')
26 files changed, 121 insertions, 54 deletions
diff --git a/res/drawable-hdpi/bg_vidcontrol.png b/res/drawable-hdpi/bg_vidcontrol.png Binary files differdeleted file mode 100644 index dfe2da136..000000000 --- a/res/drawable-hdpi/bg_vidcontrol.png +++ /dev/null diff --git a/res/drawable-hdpi/knob.png b/res/drawable-hdpi/knob.png Binary files differindex 1eba937fe..213c20010 100644..100755 --- a/res/drawable-hdpi/knob.png +++ b/res/drawable-hdpi/knob.png diff --git a/res/drawable-hdpi/switch_thumb_activated.9.png b/res/drawable-hdpi/switch_thumb_activated.9.png Binary files differdeleted file mode 100644 index 072aa649c..000000000 --- a/res/drawable-hdpi/switch_thumb_activated.9.png +++ /dev/null diff --git a/res/drawable-hdpi/switch_thumb_activated.png b/res/drawable-hdpi/switch_thumb_activated.png Binary files differnew file mode 100755 index 000000000..5d6c7d8eb --- /dev/null +++ b/res/drawable-hdpi/switch_thumb_activated.png diff --git a/res/drawable-hdpi/switch_thumb_off.9.png b/res/drawable-hdpi/switch_thumb_off.9.png Binary files differdeleted file mode 100644 index 45786a309..000000000 --- a/res/drawable-hdpi/switch_thumb_off.9.png +++ /dev/null diff --git a/res/drawable-hdpi/switch_thumb_off.png b/res/drawable-hdpi/switch_thumb_off.png Binary files differnew file mode 100755 index 000000000..733cef674 --- /dev/null +++ b/res/drawable-hdpi/switch_thumb_off.png diff --git a/res/drawable-hdpi/text_select_handle_left.png b/res/drawable-hdpi/text_select_handle_left.png Binary files differindex d2ed06dd5..abefa9ebd 100644 --- a/res/drawable-hdpi/text_select_handle_left.png +++ b/res/drawable-hdpi/text_select_handle_left.png diff --git a/res/drawable-hdpi/text_select_handle_right.png b/res/drawable-hdpi/text_select_handle_right.png Binary files differindex e4192499b..5679a1739 100644 --- a/res/drawable-hdpi/text_select_handle_right.png +++ b/res/drawable-hdpi/text_select_handle_right.png diff --git a/res/drawable-mdpi/bg_vidcontrol.png b/res/drawable-mdpi/bg_vidcontrol.png Binary files differdeleted file mode 100644 index 5a5ce5571..000000000 --- a/res/drawable-mdpi/bg_vidcontrol.png +++ /dev/null diff --git a/res/drawable-mdpi/text_select_handle_left.png b/res/drawable-mdpi/text_select_handle_left.png Binary files differindex 750cdea50..2ef6f7cfa 100644 --- a/res/drawable-mdpi/text_select_handle_left.png +++ b/res/drawable-mdpi/text_select_handle_left.png diff --git a/res/drawable-mdpi/text_select_handle_right.png b/res/drawable-mdpi/text_select_handle_right.png Binary files differindex fc3d14497..9e426c764 100644 --- a/res/drawable-mdpi/text_select_handle_right.png +++ b/res/drawable-mdpi/text_select_handle_right.png diff --git a/res/drawable-sw600dp/bg_vidcontrol.png b/res/drawable-sw600dp/bg_vidcontrol.png Binary files differdeleted file mode 100644 index dfe2da136..000000000 --- a/res/drawable-sw600dp/bg_vidcontrol.png +++ /dev/null diff --git a/res/drawable-xhdpi/bg_vidcontrol.png b/res/drawable-xhdpi/bg_vidcontrol.png Binary files differdeleted file mode 100644 index 0eb814815..000000000 --- a/res/drawable-xhdpi/bg_vidcontrol.png +++ /dev/null diff --git a/res/drawable-xhdpi/text_select_handle_left.png b/res/drawable-xhdpi/text_select_handle_left.png Binary files differindex 98d10c929..cfa3bb0c8 100644 --- a/res/drawable-xhdpi/text_select_handle_left.png +++ b/res/drawable-xhdpi/text_select_handle_left.png diff --git a/res/drawable-xhdpi/text_select_handle_right.png b/res/drawable-xhdpi/text_select_handle_right.png Binary files differindex b3a0c9f47..90c8869bb 100644 --- a/res/drawable-xhdpi/text_select_handle_right.png +++ b/res/drawable-xhdpi/text_select_handle_right.png diff --git a/res/drawable-xxhdpi/text_select_handle_left.png b/res/drawable-xxhdpi/text_select_handle_left.png Binary files differnew file mode 100644 index 000000000..dbfa59c83 --- /dev/null +++ b/res/drawable-xxhdpi/text_select_handle_left.png diff --git a/res/drawable-xxhdpi/text_select_handle_right.png b/res/drawable-xxhdpi/text_select_handle_right.png Binary files differnew file mode 100644 index 000000000..f16101709 --- /dev/null +++ b/res/drawable-xxhdpi/text_select_handle_right.png diff --git a/res/drawable/bg_vidcontrol.xml b/res/drawable/bg_vidcontrol.xml new file mode 100644 index 000000000..fcfacf183 --- /dev/null +++ b/res/drawable/bg_vidcontrol.xml @@ -0,0 +1,40 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (c) 2016, 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. +--> + +<vector xmlns:android="http://schemas.android.com/apk/res/android" + android:width="24dp" + android:height="24dp" + android:viewportHeight="48.0" + android:viewportWidth="48.0"> + <path + android:fillColor="#FF000000" + android:fillAlpha="0.5" + android:pathData="M24,24m-24,0a24,24 0,1 1,48 0a24,24 0,1 1,-48 0" /> +</vector> diff --git a/res/layout/audio_effects_dialog.xml b/res/layout/audio_effects_dialog.xml index 49dcafb56..b2143d643 100644 --- a/res/layout/audio_effects_dialog.xml +++ b/res/layout/audio_effects_dialog.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -Copyright (c) 2013, The Linux Foundation. All rights reserved. +Copyright (c) 2013, 2016, 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 @@ -40,33 +40,58 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. android:layout_height="wrap_content" android:orientation="vertical" android:gravity="center_horizontal" - android:paddingBottom="10dp"> + android:layout_marginStart="12dp" + android:layout_marginEnd="12dp"> - <LinearLayout + <RelativeLayout 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" + <RelativeLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_weight="1" - custom:label="@string/bass_boost_strength" - custom:foreground="@drawable/knob" /> + android:layout_weight="1"> + <com.android.gallery3d.ui.Knob + android:id="@+id/bBStrengthKnob" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + custom:foreground="@drawable/knob"/> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_below="@id/bBStrengthKnob" + android:layout_marginTop="12dp" + android:textColor="@android:color/black" + android:text="@string/bass_boost_strength"/> + </RelativeLayout> - <com.android.gallery3d.ui.Knob - android:id="@+id/vIStrengthKnob" + <RelativeLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_weight="1" - custom:label="@string/virtualizer_strength" - custom:foreground="@drawable/knob" /> - - </LinearLayout> + android:layout_marginEnd="24dp" + android:layout_alignParentRight="true" + android:layout_weight="1"> + <com.android.gallery3d.ui.Knob + android:id="@+id/vIStrengthKnob" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + custom:foreground="@drawable/knob"/> + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_below="@id/vIStrengthKnob" + android:layout_marginTop="12dp" + android:layout_centerHorizontal="true" + android:textColor="@android:color/black" + android:text="@string/virtualizer_strength"/> + </RelativeLayout> + </RelativeLayout> </LinearLayout> </LinearLayout> diff --git a/res/layout/audio_effects_title.xml b/res/layout/audio_effects_title.xml index fcfb11d1e..2e200d5aa 100644 --- a/res/layout/audio_effects_title.xml +++ b/res/layout/audio_effects_title.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <!-- -Copyright (c) 2014, The Linux Foundation. All rights reserved. +Copyright (c) 2014, 2016, 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 @@ -40,9 +40,10 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. android:gravity="left|center_vertical" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginStart="10dp" + android:layout_marginStart="24dp" android:layout_marginTop="10dp" android:layout_marginBottom="10dp" + android:textColor="@android:color/black" android:textSize="20dp" /> <View @@ -54,7 +55,8 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. android:id="@+id/audio_effects_switch" android:textOn="" android:textOff="" + android:background="@null" + android:gravity="center_vertical|right" android:layout_width="72dp" - android:layout_height="34dp" - android:layout_marginEnd="4dp"/> + android:layout_height="34dp"/> </LinearLayout> diff --git a/res/layout/filtershow_actionbar.xml b/res/layout/filtershow_actionbar.xml index 236128989..ec9ed2914 100644 --- a/res/layout/filtershow_actionbar.xml +++ b/res/layout/filtershow_actionbar.xml @@ -25,9 +25,9 @@ android:drawablePadding="24dp" android:drawableStart="@drawable/done" android:gravity="center_vertical" - android:paddingBottom="14dp" + android:paddingBottom="15dp" android:text="@string/save" android:textColor="#ffffff" - android:textSize="20sp" /> + android:textSize="18sp" /> </LinearLayout>
\ No newline at end of file diff --git a/res/layout/photopage_bottom_controls.xml b/res/layout/photopage_bottom_controls.xml index fc9882280..3f19af150 100644 --- a/res/layout/photopage_bottom_controls.xml +++ b/res/layout/photopage_bottom_controls.xml @@ -1,10 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/photopage_bottom_controls" android:layout_width="match_parent" android:layout_height="56dp" android:layout_alignParentBottom="true" + android:layout_gravity="bottom" android:background="#42000000" + android:gravity="bottom" android:orientation="horizontal" android:visibility="gone" > @@ -12,12 +14,9 @@ android:id="@+id/photopage_bottom_control_edit" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentStart="true" - android:layout_centerVertical="true" + android:layout_gravity="center_vertical" + android:layout_weight="1" android:background="@null" - android:paddingStart="20dp" - android:layout_marginBottom="20dp" android:src="@drawable/edit" android:visibility="gone" /> @@ -25,10 +24,8 @@ android:id="@+id/photopage_bottom_control_share" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_marginBottom="20dp" - android:layout_centerInParent="true" - android:layout_centerVertical="true" + android:layout_gravity="center_vertical" + android:layout_weight="1" android:background="@null" android:src="@drawable/share" android:visibility="gone" /> @@ -37,13 +34,10 @@ android:id="@+id/photopage_bottom_control_delete" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_alignParentEnd="true" - android:layout_centerVertical="true" - android:layout_marginBottom="20dp" + android:layout_gravity="center_vertical" + android:layout_weight="1" android:background="@null" - android:paddingEnd="20dp" android:src="@drawable/delete" android:visibility="gone" /> -</RelativeLayout> +</LinearLayout> diff --git a/res/layout/trim_menu.xml b/res/layout/trim_menu.xml index c46be4c4b..164264546 100644 --- a/res/layout/trim_menu.xml +++ b/res/layout/trim_menu.xml @@ -18,6 +18,11 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:layout_centerVertical="true"> + <ImageView + android:id="@+id/exit_trim" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:src="@drawable/cancel"/> <TextView android:id="@+id/start_trim" android:layout_marginStart="8dp" @@ -25,8 +30,9 @@ android:layout_height="match_parent" android:text="@string/save" android:textAllCaps="true" - android:textSize="14sp" + android:layout_gravity="right" + android:textSize="16sp" + android:textColor="@color/primary_text" android:gravity="left|center_vertical" - android:drawableStart="@drawable/menu_save_photo" android:drawablePadding="8dp" /> </FrameLayout> diff --git a/res/menu/album.xml b/res/menu/album.xml index 00fd3ff17..8151d1fb4 100644 --- a/res/menu/album.xml +++ b/res/menu/album.xml @@ -21,7 +21,7 @@ <item android:id="@+id/action_slideshow" android:icon="@drawable/slideshow" android:title="@string/slideshow" - android:showAsAction="ifRoom" /> + android:showAsAction="never" /> <item android:id="@+id/action_select" android:title="@string/select_item" android:showAsAction="never" /> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 2b72812de..d636a9aac 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -132,11 +132,11 @@ <dimen name="albumset_icon_size">25dp</dimen> <!-- configuration for albumset page in Landscape--> - <dimen name="albumset_slot_gap_land">29dp</dimen> - <dimen name="albumset_padding_top_land">30dp</dimen> - <dimen name="albumset_padding_bottom_land">30dp</dimen> - <dimen name="albumset_padding_left_land">30dp</dimen> - <dimen name="albumset_padding_right_land">30dp</dimen> + <dimen name="albumset_slot_gap_land">4dp</dimen> + <dimen name="albumset_padding_top_land">4dp</dimen> + <dimen name="albumset_padding_bottom_land">4dp</dimen> + <dimen name="albumset_padding_left_land">4dp</dimen> + <dimen name="albumset_padding_right_land">4dp</dimen> <!-- configuration for album page --> <integer name="album_rows_land">2</integer> @@ -151,11 +151,11 @@ <dimen name="album_padding_right">3dp</dimen> <!-- configuration for album page in Landscape--> - <dimen name="album_slot_gap_land">7dp</dimen> - <dimen name="album_padding_top_land">16dp</dimen> - <dimen name="album_padding_bottom_land">7dp</dimen> - <dimen name="album_padding_left_land">16dp</dimen> - <dimen name="album_padding_right_land">16dp</dimen> + <dimen name="album_slot_gap_land">3dp</dimen> + <dimen name="album_padding_top_land">3dp</dimen> + <dimen name="album_padding_bottom_land">3dp</dimen> + <dimen name="album_padding_left_land">3dp</dimen> + <dimen name="album_padding_right_land">3dp</dimen> <!-- configuration for manage page --> <dimen name="cache_pin_size">24dp</dimen> @@ -202,8 +202,8 @@ <dimen name="dialog_text_size">14sp</dimen> <dimen name="timeline_port_slot_gap">3dp</dimen> - <dimen name="timeline_land_slot_gap">7dp</dimen> - <dimen name="timeline_land_margin">16dp</dimen> + <dimen name="timeline_land_slot_gap">3dp</dimen> + <dimen name="timeline_land_margin">3dp</dimen> <dimen name="timeline_port_margin">3dp</dimen> <dimen name="timeline_title_height">48dp</dimen> <dimen name="timeline_title_font_size">14sp</dimen> diff --git a/res/values/strings.xml b/res/values/strings.xml index 7bf28763a..516c5be99 100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -543,7 +543,7 @@ <string name="pano_progress_text">Rendering panorama</string> <!-- The label on the button that will save an edited image --> - <string name="save" msgid="8140440041190264400">Done</string> + <string name="save" msgid="8140440041190264400">Save</string> <!-- A label representing the action of importing media item(s) [CHAR LIMIT=20] --> <string name="ingest_import">@string/Import</string> |
