diff options
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/attrs.xml | 6 | ||||
| -rwxr-xr-x[-rw-r--r--] | res/values/bool.xml | 7 | ||||
| -rw-r--r-- | res/values/cm_strings.xml | 20 | ||||
| -rw-r--r-- | res/values/codeaurora_strings.xml | 110 | ||||
| -rw-r--r-- | res/values/colors.xml | 9 | ||||
| -rw-r--r-- | res/values/config.xml | 8 | ||||
| -rw-r--r-- | res/values/dimens.xml | 36 | ||||
| -rw-r--r-- | res/values/filtershow_color.xml | 16 | ||||
| -rw-r--r-- | res/values/filtershow_ids.xml | 1 | ||||
| -rw-r--r-- | res/values/filtershow_strings.xml | 2 | ||||
| -rw-r--r-- | res/values/iconbutton_styles.xml | 4 | ||||
| -rwxr-xr-x[-rw-r--r--] | res/values/strings.xml | 12 | ||||
| -rw-r--r-- | res/values/styles.xml | 44 |
13 files changed, 233 insertions, 42 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 5a00a695a..eadd4f20b 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -42,5 +42,9 @@ <attr name="largeIcons" format="reference" /> <attr name="images" format="reference" /> </declare-styleable> - + <declare-styleable name="Knob"> + <attr name="label" format="string" /> + <attr name="background" format="integer" /> + <attr name="foreground" format="integer" /> + </declare-styleable> </resources> diff --git a/res/values/bool.xml b/res/values/bool.xml index 464842ab4..3412d825d 100644..100755 --- a/res/values/bool.xml +++ b/res/values/bool.xml @@ -15,4 +15,9 @@ --> <resources> <bool name="show_action_bar_title">false</bool> -</resources>
\ No newline at end of file + <bool name="playlist">true</bool> + <bool name="loop">true</bool> + <bool name="stereo">true</bool> + <bool name="streaming">true</bool> + <bool name="speaker">true</bool> +</resources> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml new file mode 100644 index 000000000..d6da3b19d --- /dev/null +++ b/res/values/cm_strings.xml @@ -0,0 +1,20 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + Copyright (C) 2012-2014 The CyanogenMod 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. +--> +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Text indicating the time a media item was recorded in details window [CHAR LIMIT=14] --> + <string name="record_time">Record time</string> +</resources>
\ No newline at end of file diff --git a/res/values/codeaurora_strings.xml b/res/values/codeaurora_strings.xml new file mode 100644 index 000000000..9bc0ff4e8 --- /dev/null +++ b/res/values/codeaurora_strings.xml @@ -0,0 +1,110 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- +Copyright (c) 2013-2014, The Linux Foundation. All rights reserved. +Copyright (C) 2014-2015 The CyanogenMod Project + +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. +--> + +<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2"> + <!-- Strings for step option settins --> + <string name="setp_option_name">Step</string> + <string name="step_option_desc">Customize fast forward/rewind step</string> + <string name="setp_option_three_second">3 seconds</string> + <string name="setp_option_six_second">6 seconds</string> + + <string name="loop">"Loop"</string> + <string name="single">"Single"</string> + <string name="stereo">"Stereo"</string> + <string name="speaker_on">Speaker ON</string> + <string name="speaker_off">Speaker OFF</string> + <string name="speaker_need_headset">Plug in headphones to use this feature.</string> + <string name="single_track">"Single track"</string> + <string name="input_url">"Enter URL"</string> + <string name="streaming_settings">"Streaming settings"</string> + <string name="next">"Next"</string> + <string name="previous">"Previous"</string> + + <string name="rtp_rtcp" translatable="false">RTP/RTCP</string> + <string name="buffer_size">Buffer size</string> + <string name="apn">Preferred APN</string> + <string name="rtp_min_port">Min port</string> + <string name="rtp_max_port">Max port</string> + <string name="set_rtp_min_port">Set min port</string> + <string name="set_rtp_max_port">Set max port</string> + <string name="set_buffer_size">Set buffer size</string> + <string name="set_apn">Select preferred APN</string> + <string name="setting">Settings</string> + + <string name="server_timeout_title">"Server timeout"</string> + <string name="server_timeout_message">"Reconnect to the server to play the video?"</string> + <string name="videoview_error_text_cannot_connect_retry">"Connection failed, trying to reconnect to %1$d\u2026"</string> + <string name="media_controller_live">Live</string> + <string name="media_controller_playing">Playing</string> + <string name="media_controller_connecting">Connecting\u2026</string> + + <string name="bookmark_add">"Add bookmark"</string> + <string name="bookmark_display">"Show bookmarks"</string> + <string name="bookmark_empty">"No bookmarks"</string> + <string name="bookmark_exist">"Bookmark already exists"</string> + <string name="bookmark_add_success">"Bookmark added"</string> + <string name="bookmark_list">"Bookmarks"</string> + <string name="bookmark_title">"Title"</string> + <string name="bookmark_location">"Location"</string> + <string name="delete_all">"Delete all"</string> + <string name="default_title">"Default title"</string> + + <!-- A label describing to link website [CHAR LIMIT=30] --> + <string name="more_image">More images</string> + <string name="website_for_more_image" translatable="false"></string> + + <!-- Toast if the muted video is not supported. [CHAR LIMIT=80] --> + <string name="mute_nosupport">Can not mute : video not supported</string> + + <!-- The message is shown in toast when click showOnMap Menu and there is no map app --> + <string name="map_activity_not_found_err">There is no maps app installed to show the location.</string> + + <!-- The label for the bass boost knob of the audio effects dialog. --> + <string name="bass_boost_strength">Bass boost</string> + + <!-- The label for the 3d effect knob of the audio effects dialog. --> + <string name="virtualizer_strength">3D effect</string> + + <!-- The label for the audio effects menu. --> + <string name="audio_effects">Audio effects</string> + + <!-- Toast if user attempts to control audio effects without headphones plugged in. --> + <string name="headset_plug">Plug in headphones for these effects.</string> + + <!-- The title of the audio effects dialog. --> + <string name="audio_effects_dialog_title">Snapdragon Audio+</string> + + <!-- The tips of trimming video --> + <string name="fail_trim">Sorry, this video file can not be trimmed</string> + + <string name="no_permission_for_drm">Sorry, DRM protected files cannot be shared</string> + <string name="drm_license_info">DRM license info</string> +</resources> diff --git a/res/values/colors.xml b/res/values/colors.xml index 4fe918094..9396a99cf 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -15,7 +15,10 @@ --> <resources> <color name="default_background">#000</color> - + <color name="primary">#37474F</color> + <color name="primary_dark">#263238</color> + <color name="accent">#607D8B</color> + <color name="material_blue_grey_950">#ff21272b</color> <!-- configuration for album set page --> <color name="albumset_background">#1A1A1A</color> <color name="albumset_placeholder">#333</color> @@ -70,4 +73,8 @@ <color name="face_detect_fail">#80d05060</color> <color name="gray">#FFAAAAAA</color> + <color name="highlight">#f41e26</color> + <color name="lowlight">#650101</color> + <color name="grey">#e7e7e7</color> + <color name="disabled_knob">#575757</color> </resources> diff --git a/res/values/config.xml b/res/values/config.xml index 33e1e146b..25b8e6a49 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -1,5 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2012 The Android Open Source Project +<!-- Copyright (c) 2014, The Linux Foundation. All rights reserved. + Not a Contribution. + + Copyright (C) 2012 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. @@ -19,4 +22,7 @@ <resources> <!-- Maximum recording length in milliseconds. 0 means unlimited. --> <integer name="max_video_recording_length">0</integer> + <bool name="config_show_more_images">false</bool> + + <bool name="config_scroll_horizontal">false</bool> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index ef742d2b5..308f31c41 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -112,9 +112,13 @@ <!-- configuration for legacy album set page --> <integer name="albumset_rows_land">2</integer> <integer name="albumset_rows_port">3</integer> - <dimen name="albumset_padding_top">7dp</dimen> - <dimen name="albumset_padding_bottom">7dp</dimen> - <dimen name="albumset_slot_gap">7dp</dimen> + <integer name="albumset_cols_land">3</integer> + <integer name="albumset_cols_port">2</integer> + <dimen name="albumset_padding_top">3dp</dimen> + <dimen name="albumset_padding_bottom">3dp</dimen> + <dimen name="albumset_padding_left">3dp</dimen> + <dimen name="albumset_padding_right">3dp</dimen> + <dimen name="albumset_slot_gap">3dp</dimen> <dimen name="albumset_label_background_height">30dp</dimen> <dimen name="albumset_title_offset">10dp</dimen> @@ -126,9 +130,15 @@ <dimen name="albumset_icon_size">25dp</dimen> <!-- configuration for album page --> - <integer name="album_rows_land">2</integer> + <integer name="album_rows_land">3</integer> <integer name="album_rows_port">4</integer> - <dimen name="album_slot_gap">5dp</dimen> + <integer name="album_cols_land">6</integer> + <integer name="album_cols_port">3</integer> + <dimen name="album_padding_top">3dp</dimen> + <dimen name="album_padding_bottom">3dp</dimen> + <dimen name="album_padding_left">3dp</dimen> + <dimen name="album_padding_right">3dp</dimen> + <dimen name="album_slot_gap">3dp</dimen> <!-- configuration for manage page --> <dimen name="cache_pin_size">24dp</dimen> @@ -152,4 +162,20 @@ <dimen name="photoeditor_text_padding">10dp</dimen> <dimen name="photoeditor_original_text_size">18dp</dimen> <dimen name="photoeditor_original_text_margin">4dp</dimen> + + <dimen name="action_bar_elevation">8dp</dimen> + + <!-- FAB --> + <!-- Floating action button --> + <dimen name="floating_action_button_height">56dp</dimen> + <dimen name="floating_action_button_width">56dp</dimen> + <dimen name="floating_action_button_radius">28dp</dimen> + <dimen name="floating_action_button_translation_z">5dp</dimen> + <dimen name="floating_action_button_margin_left">5dp</dimen> + <dimen name="floating_action_button_margin_right">5dp</dimen> + <dimen name="floating_action_button_margin_bottom">16dp</dimen> + <dimen name="elevation_low">1dp</dimen> + <dimen name="elevation_high">4dp</dimen> + <dimen name="add_button_margin">16dp</dimen> + </resources> diff --git a/res/values/filtershow_color.xml b/res/values/filtershow_color.xml index 4fb4495e7..9cdec49e2 100644 --- a/res/values/filtershow_color.xml +++ b/res/values/filtershow_color.xml @@ -20,29 +20,29 @@ <color name="red">#FF0000</color> <color name="blue">#0000FF</color> <color name="text_toolbar">#FFFFFF</color> - <color name="background_screen">#101010</color> - <color name="background_toolbar">#363949</color> - <color name="background_main_toolbar">#232323</color> + <color name="background_screen">#ff21272b</color> + <color name="background_toolbar">#37474F</color> + <color name="background_main_toolbar">#37474F</color> <color name="toolbar_separation_line">#333333</color> <color name="slider_dot_color">#646464</color> <color name="slider_line_color">#888888</color> - <color name="state_panel_separation_line">#232323</color> - <color name="filtershow_background">#333333</color> + <color name="state_panel_separation_line">#263238</color> + <color name="filtershow_background">#ff21272b</color> <color name="filtershow_graphic">#717171</color> - <color name="filtershow_stateview_end_background">#232323</color> + <color name="filtershow_stateview_end_background">#263238</color> <color name="filtershow_stateview_end_text">#a7a7a7</color> <color name="filtershow_stateview_background">#464646</color> <color name="filtershow_stateview_text">#FFFFFF</color> <color name="filtershow_stateview_selected_background">#c8c8c8</color> <color name="filtershow_stateview_selected_text">#000000</color> - <color name="filtershow_categoryview_background">#1a1a1a</color> + <color name="filtershow_categoryview_background">#ff21272b</color> <color name="filtershow_categoryview_text">#a7a7a7</color> <color name="filtershow_category_selection">#ffffffff</color> <color name="gradcontrol_point_center">#ffffffff</color> <color name="gradcontrol_point_edge">#ffffffff</color> <color name="gradcontrol_graypoint_center">#888888</color> <color name="gradcontrol_graypoint_edge">#BBBBBB</color> - <color name="gradcontrol_point_shadow_start">#66000000</color> + <color name="gradcontrol_point_shadow_start">#6621272b</color> <color name="gradcontrol_point_shadow_end">#00000000</color> <color name="gradcontrol_line_color">#FFFFFF</color> <color name="gradcontrol_line_shadow">#000000</color> diff --git a/res/values/filtershow_ids.xml b/res/values/filtershow_ids.xml index 460da61aa..58f16dcd1 100644 --- a/res/values/filtershow_ids.xml +++ b/res/values/filtershow_ids.xml @@ -50,4 +50,5 @@ <item type="id" name="editorParametric" /> <item type="id" name="editorGrad" /> <item type="id" name="editorChanSat" /> + <item type="id" name="editorMakeup" /> </resources> diff --git a/res/values/filtershow_strings.xml b/res/values/filtershow_strings.xml index 98f32ebda..9a6b08f08 100644 --- a/res/values/filtershow_strings.xml +++ b/res/values/filtershow_strings.xml @@ -35,7 +35,7 @@ <!-- Text to label an image as "original" [CHAR LIMIT=20] --> <string name="original">Original</string> <!-- Text for filters that apply a border to a picture [CHAR LIMIT=20] --> - <string name="borders" msgid="4461692156695893616">Borders</string> + <string name="borders" msgid="4461692156695893616">Frame</string> <!-- Text for the custom border filter [CHAR LIMIT=20] --> <string name="custom_border">Custom</string> 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/strings.xml b/res/values/strings.xml index 570014e3e..167ac893c 100644..100755 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -233,6 +233,10 @@ have location information in them [CHAR LIMIT=20]--> <string name="no_location">No location</string> + <!-- When grouping photos by peoples, the label used for photos that don't + have people information in them [CHAR LIMIT=20]--> + <string name="no_faces">No faces</string> + <!-- This toast message is shown when network connection is lost while doing clustering --> <string name="no_connectivity">Some locations couldn\'t be identified due to network problems.</string> @@ -1115,4 +1119,12 @@ CHAR LIMIT = NONE] --> <item quantity="one">%1$d photo</item> <item quantity="other">%1$d photos</item> </plurals> + + <!-- The tips of trimming video --> + <string name="can_not_trim">Only mp4 and 3gp file can be trimmed</string> + <string name="text_makeup_whiten">Whiten</string> + <string name="text_makeup_Soften">Soften</string> + <string name="text_makeup_trimface">Trimface</string> + <string name="text_makeup_bigeye">Bigeye</string> + </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index 33dcbecb6..45a965f6b 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -37,7 +37,7 @@ <item name="android:actionBarStyle">@style/Holo.ActionBar</item> <item name="android:colorBackground">@null</item> <item name="android:colorBackgroundCacheHint">@null</item> - <item name="android:windowBackground">@drawable/filtershow_tiled_background</item> + <item name="android:windowBackground">@color/filtershow_background</item> </style> <style name="Holo.ActionBar" parent="android:Widget.Holo.ActionBar"> <item name="android:displayOptions">useLogo|showHome</item> @@ -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> |