diff options
| author | Matt Garnes <matt@cyngn.com> | 2015-03-17 13:43:50 -0700 |
|---|---|---|
| committer | Matt Garnes <matt@cyngn.com> | 2015-03-17 13:43:50 -0700 |
| commit | d8284f229dfa8d0e2aef3cac0828362e1e6632e1 (patch) | |
| tree | 57b913502af687d5a27c3ce3a82b964802b5112c /res/values | |
| parent | 4c3b2364453fb21dc3f3f8a70e1bcc64e500d83d (diff) | |
| parent | 06e3e072e0b70b01dd1d4e2d859d70832d16172c (diff) | |
| download | android_packages_apps_Trebuchet-d8284f229dfa8d0e2aef3cac0828362e1e6632e1.tar.gz android_packages_apps_Trebuchet-d8284f229dfa8d0e2aef3cac0828362e1e6632e1.tar.bz2 android_packages_apps_Trebuchet-d8284f229dfa8d0e2aef3cac0828362e1e6632e1.zip | |
Merge branch 'github/staging/cm-12.1' into caf/cm-12.1.
Conflicts:
WallpaperPicker/res/values-nodpi/wallpapers.xml
res/layout/settings_pane.xml
res/values-zh-rCN/cm_strings.xml
res/values/preferences_defaults.xml
src/com/android/launcher3/DynamicGrid.java
Change-Id: I22eb2e38e8802985e0e0a8cb3e68d73189c2c1a4
Diffstat (limited to 'res/values')
| -rw-r--r-- | res/values/attrs.xml | 5 | ||||
| -rw-r--r-- | res/values/cm_strings.xml | 8 | ||||
| -rw-r--r-- | res/values/colors.xml | 4 | ||||
| -rw-r--r-- | res/values/dimens.xml | 6 | ||||
| -rw-r--r-- | res/values/preferences_defaults.xml | 1 |
5 files changed, 24 insertions, 0 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml index 240f31171..b32c5a2bc 100644 --- a/res/values/attrs.xml +++ b/res/values/attrs.xml @@ -154,4 +154,9 @@ <attr name="overlay" format="boolean"/> </declare-styleable> + <declare-styleable name="AutofitTextView"> + <attr name="minTextSize" format="dimension" /> + <attr name="precision" format="float" /> + <attr name="sizeToFit" format="boolean" /> + </declare-styleable> </resources> diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml index df151c064..6f1899a9e 100644 --- a/res/values/cm_strings.xml +++ b/res/values/cm_strings.xml @@ -77,4 +77,12 @@ <!-- Dialog --> <string name="dialog_confirm">Confirm</string> + + <!-- Drawer type --> + <string name="drawer_type">Layout</string> + + <string name="drawer_type_drawer">Vertical</string> + <string name="drawer_type_pager">Paged</string> + + <string name="setting_state_disabled">DISABLED</string> </resources> diff --git a/res/values/colors.xml b/res/values/colors.xml index 948801f5b..3cf7d39a6 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -49,4 +49,8 @@ <color name="dynamic_grid_preview_background">#FFFFFFFF</color> <color name="dynamic_grid_preview_foreground">#FF000000</color> + + <color name="app_drawer_background">#76000000</color> + + <color name="scrubber_background">#CC14191E</color> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index d591535d3..81e40bfb2 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -118,4 +118,10 @@ <dimen name="grid_padding">15dp</dimen> <dimen name="grid_custom_text">50dp</dimen> + + <dimen name="scrubber_bottom_padding">30dp</dimen> + <dimen name="scrubber_height">48dp</dimen> + + <!-- Vertical app drawer padding --> + <dimen name="vertical_app_drawer_icon_padding">5dp</dimen> </resources> diff --git a/res/values/preferences_defaults.xml b/res/values/preferences_defaults.xml index 7dab6aca2..008c42a81 100644 --- a/res/values/preferences_defaults.xml +++ b/res/values/preferences_defaults.xml @@ -16,4 +16,5 @@ <string name="preferences_interface_general_icons_text_font_family_default">sans-serif-condensed</string> <integer name="preferences_interface_general_icons_text_font_style_default">0</integer> <bool name="preferences_interface_general_app_icon_animation">false</bool> + <integer name="preferences_interface_drawer_type_default">1</integer> </resources> |