summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
Diffstat (limited to 'res/values')
-rw-r--r--res/values/attrs.xml11
-rw-r--r--res/values/cm_arrays.xml18
-rw-r--r--res/values/cm_strings.xml21
-rw-r--r--res/values/colors.xml8
-rw-r--r--res/values/config.xml2
-rw-r--r--res/values/dimens.xml7
6 files changed, 63 insertions, 4 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index a2d3a83e0..a2266f7ef 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -157,4 +157,15 @@
</declare-styleable>
<declare-styleable name="CustomClingText">
</declare-styleable>
+
+ <declare-styleable name="SlidingUpPanelLayout">
+ <attr name="panelHeight" format="dimension" />
+ <attr name="shadowHeight" format="dimension" />
+ <attr name="paralaxOffset" format="dimension" />
+ <attr name="fadeColor" format="color" />
+ <attr name="flingVelocity" format="integer" />
+ <attr name="dragView" format="reference" />
+ <attr name="overlay" format="boolean"/>
+ </declare-styleable>
+
</resources>
diff --git a/res/values/cm_arrays.xml b/res/values/cm_arrays.xml
index 502b7a65c..2320f1805 100644
--- a/res/values/cm_arrays.xml
+++ b/res/values/cm_arrays.xml
@@ -58,4 +58,20 @@
<item>carousel</item>
<item>overview</item>
</string-array>
-</resources>
+ <string-array name="transition_effect_drawables" translatable="false">
+ <item>@drawable/transition_none</item>
+ <item>@drawable/transition_zoomin</item>
+ <item>@drawable/transition_zoomout</item>
+ <item>@drawable/transition_rotateup</item>
+ <item>@drawable/transition_rotatedown</item>
+ <item>@drawable/transition_cubein</item>
+ <item>@drawable/transition_cubeout</item>
+ <item>@drawable/transition_stack</item>
+ <item>@drawable/transition_accordion</item>
+ <item>@drawable/transition_flip</item>
+ <item>@drawable/transition_cylinderin</item>
+ <item>@drawable/transition_cylinderout</item>
+ <item>@drawable/transition_carousel</item>
+ <item>@drawable/transition_overview</item>
+ </string-array>
+</resources> \ No newline at end of file
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index d4effcc40..267d65a18 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -99,4 +99,25 @@
<!-- Hidden apps -->
<string name="hidden_apps_title">Hidden apps</string>
+
+ <!-- Settings -->
+ <string name="launcher_settings">LAUNCHER SETTINGS</string>
+ <string name="home_screen_settings">HOME SCREEN SETTINGS</string>
+ <string name="drawer_settings">DRAWER SETTINGS</string>
+ <!-- Text for page scroll -->
+ <string name="page_scroll_effect_text">Scroll effect</string>
+ <!-- Text for drawer scroll -->
+ <string name="drawer_scroll_effect_text">Scroll effect</string>
+ <!-- Text for drawer sorting -->
+ <string name="drawer_sorting_text">Sorting mode</string>
+ <!-- Text for home screen search -->
+ <string name="home_screen_search_text">Search bar</string>
+ <!-- Text for larger icons -->
+ <string name="larger_icons_text">Larger icons</string>
+ <!-- Text for hiding icon labels -->
+ <string name="hide_icon_labels">Hide icon labels</string>
+ <!-- Settings states -->
+ <string name="setting_state_on">ON</string>
+ <string name="setting_state_off">OFF</string>
+ <string name="themes_button_text">Themes</string>
</resources>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index dc35a3f68..b55fb1704 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -35,6 +35,12 @@
<color name="wallpaper_picker_translucent_gray">#66000000</color>
<color name="folder_items_text_color">#FF333333</color>
<color name="outline_color">#FFFFFFFF</color>
-
+
<color name="first_run_cling_circle_background_color">#64b1ea</color>
+
+ <color name="settings_header_text">#FF6cd2ea</color>
+ <color name="settings_bg_color">#FF485459</color>
+ <color name="settings_bg_header_color">#FFb2b0ab</color>
+ <color name="settings_bg_selected_color">#26000000</color>
+ <color name="settings_transition_selected_color">#50000000</color>
</resources>
diff --git a/res/values/config.xml b/res/values/config.xml
index b7880fe1f..9ad34b52b 100644
--- a/res/values/config.xml
+++ b/res/values/config.xml
@@ -20,7 +20,7 @@
<!-- Out of 100, the percent to shrink the workspace during spring loaded mode. -->
<integer name="config_workspaceSpringLoadShrinkPercentage">80</integer>
<!-- Out of 100, the percent to shrink the workspace during overview mode. -->
- <integer name="config_workspaceOverviewShrinkPercentage">58</integer>
+ <integer name="config_workspaceOverviewShrinkPercentage">90</integer>
<!-- Fade/zoom in/out duration & scale in the AllApps transition.
Note: This should be less than the workspaceShrinkTime as they happen together. -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 3b692a1d1..421222673 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -44,7 +44,9 @@
<dimen name="overview_panel_top_padding">20dp</dimen>
<dimen name="overview_panel_bottom_padding">50dp</dimen>
<dimen name="overview_panel_button_spacing">30dp</dimen>
- <dimen name="overview_mode_page_offset">130dp</dimen>
+ <dimen name="overview_mode_page_offset">60dp</dimen>
+ <dimen name="sliding_panel_padding">175dp</dimen>
+ <dimen name="overview_scaling_padding">50dp</dimen>
<!-- QSB -->
<dimen name="toolbar_button_vertical_padding">4dip</dimen>
@@ -98,4 +100,7 @@
<!-- The amount that the preview contents are inset from the preview background -->
<dimen name="folder_preview_padding">4dp</dimen>
<dimen name="folder_name_padding">10dp</dimen>
+
+ <!-- Settings Pane dimen -->
+ <dimen name="settings_pane_handle">48dp</dimen>
</resources>