summaryrefslogtreecommitdiffstats
path: root/res/values
diff options
context:
space:
mode:
Diffstat (limited to 'res/values')
-rw-r--r--res/values/attrs.xml5
-rw-r--r--res/values/dimens.xml10
-rw-r--r--res/values/styles.xml4
3 files changed, 18 insertions, 1 deletions
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 7929e65d1..7b52dae5d 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -30,6 +30,7 @@
<attr name="workspaceAmbientShadowColor" format="color"/>
<attr name="workspaceKeyShadowColor" format="color" />
<attr name="workspaceStatusBarScrim" format="reference" />
+ <attr name="widgetsTheme" format="reference" />
<!-- BubbleTextView specific attributes. -->
<declare-styleable name="BubbleTextView">
@@ -137,4 +138,8 @@
<attr name="android:elevation" />
<attr name="darkTintColor" format="color"/>
</declare-styleable>
+
+ <declare-styleable name="RecyclerViewFastScroller">
+ <attr name="canThumbDetach" format="boolean" />
+ </declare-styleable>
</resources>
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 71f9edc91..a4dff7190 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -65,7 +65,15 @@
<dimen name="fastscroll_popup_text_size">32dp</dimen>
<dimen name="fastscroll_popup_margin">19dp</dimen>
-<!-- All Apps -->
+ <!--
+ Fast scroller draws the content horizontally centered. The end of the track should be
+ aligned at the end of the container.
+ fastscroll_end_margin = - (fastscroll_width - fastscroll_track_min_width) / 2
+ -->
+ <dimen name="fastscroll_width">58dp</dimen>
+ <dimen name="fastscroll_end_margin">-26dp</dimen>
+
+ <!-- All Apps -->
<dimen name="all_apps_button_scale_down">0dp</dimen>
<dimen name="all_apps_search_bar_field_height">48dp</dimen>
<dimen name="all_apps_search_bar_height">60dp</dimen>
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 8943a4552..d11b00208 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -40,6 +40,7 @@
<item name="workspaceAmbientShadowColor">#33000000</item>
<item name="workspaceKeyShadowColor">#44000000</item>
<item name="workspaceStatusBarScrim">@drawable/workspace_bg</item>
+ <item name="widgetsTheme">@style/WidgetContainerTheme</item>
</style>
<style name="LauncherTheme" parent="@style/BaseLauncherThemeWithCustomAttrs"></style>
@@ -64,6 +65,7 @@
<item name="popupColorPrimary">?android:attr/colorPrimary</item>
<item name="popupColorSecondary">#424242</item> <!-- Gray 800 -->
<item name="popupColorTertiary">#757575</item> <!-- Gray 600 -->
+ <item name="widgetsTheme">@style/WidgetContainerTheme.Dark</item>
<item name="isMainColorDark">true</item>
</style>
@@ -85,6 +87,8 @@
<item name="android:textColorSecondary">?android:attr/textColorSecondaryInverse</item>
</style>
+ <style name="WidgetContainerTheme.Dark" />
+
<style name="FastScrollerPopup" >
<item name="android:layout_width">wrap_content</item>
<item name="android:minWidth">@dimen/fastscroll_popup_width</item>