summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
Diffstat (limited to 'res')
-rw-r--r--res/layout-land/launcher.xml2
-rw-r--r--res/layout-port/launcher.xml2
-rw-r--r--res/layout-sw720dp/launcher.xml2
-rw-r--r--res/layout/overview_panel.xml9
-rw-r--r--res/values-sw720dp/styles.xml6
-rw-r--r--res/values/attrs.xml10
-rw-r--r--res/values/styles.xml25
7 files changed, 44 insertions, 12 deletions
diff --git a/res/layout-land/launcher.xml b/res/layout-land/launcher.xml
index 4e09ef953..2e0357672 100644
--- a/res/layout-land/launcher.xml
+++ b/res/layout-land/launcher.xml
@@ -27,7 +27,7 @@
android:id="@+id/drag_layer"
android:clipChildren="false"
android:clipToPadding="false"
- android:background="@drawable/workspace_bg"
+ android:background="?attr/workspaceStatusBarScrim"
android:importantForAccessibility="no"
android:layout_width="match_parent"
android:layout_height="match_parent">
diff --git a/res/layout-port/launcher.xml b/res/layout-port/launcher.xml
index 0f88698f0..93c90780b 100644
--- a/res/layout-port/launcher.xml
+++ b/res/layout-port/launcher.xml
@@ -29,7 +29,7 @@
android:clipChildren="false"
android:importantForAccessibility="no"
android:clipToPadding="false"
- android:background="@drawable/workspace_bg"
+ android:background="?attr/workspaceStatusBarScrim"
android:layout_width="match_parent"
android:layout_height="match_parent">
diff --git a/res/layout-sw720dp/launcher.xml b/res/layout-sw720dp/launcher.xml
index b9b94b6b0..ca4d846f1 100644
--- a/res/layout-sw720dp/launcher.xml
+++ b/res/layout-sw720dp/launcher.xml
@@ -28,7 +28,7 @@
android:clipChildren="false"
android:clipToPadding="false"
android:importantForAccessibility="no"
- android:background="@drawable/workspace_bg"
+ android:background="?attr/workspaceStatusBarScrim"
android:layout_width="match_parent"
android:layout_height="match_parent">
diff --git a/res/layout/overview_panel.xml b/res/layout/overview_panel.xml
index 78a0f1596..d1ac56c50 100644
--- a/res/layout/overview_panel.xml
+++ b/res/layout/overview_panel.xml
@@ -32,12 +32,13 @@
android:layout_weight="1"
android:drawablePadding="4dp"
android:drawableTop="@drawable/ic_wallpaper"
+ android:drawableTint="?attr/workspaceTextColor"
android:fontFamily="sans-serif-condensed"
android:gravity="center_horizontal"
android:stateListAnimator="@animator/overview_button_anim"
android:text="@string/wallpaper_button_text"
android:textAllCaps="true"
- android:textColor="@android:color/white"
+ android:textColor="?attr/workspaceTextColor"
android:textSize="12sp" />
<TextView
@@ -47,12 +48,13 @@
android:layout_weight="1"
android:drawablePadding="4dp"
android:drawableTop="@drawable/ic_widget"
+ android:drawableTint="?attr/workspaceTextColor"
android:fontFamily="sans-serif-condensed"
android:gravity="center_horizontal"
android:stateListAnimator="@animator/overview_button_anim"
android:text="@string/widget_button_text"
android:textAllCaps="true"
- android:textColor="@android:color/white"
+ android:textColor="?attr/workspaceTextColor"
android:textSize="12sp" />
<TextView
@@ -62,12 +64,13 @@
android:layout_weight="1"
android:drawablePadding="4dp"
android:drawableTop="@drawable/ic_setting"
+ android:drawableTint="?attr/workspaceTextColor"
android:fontFamily="sans-serif-condensed"
android:gravity="center_horizontal"
android:stateListAnimator="@animator/overview_button_anim"
android:text="@string/settings_button_text"
android:textAllCaps="true"
- android:textColor="@android:color/white"
+ android:textColor="?attr/workspaceTextColor"
android:textSize="12sp" />
</LinearLayout> \ No newline at end of file
diff --git a/res/values-sw720dp/styles.xml b/res/values-sw720dp/styles.xml
index 168afec4b..0c060ea0d 100644
--- a/res/values-sw720dp/styles.xml
+++ b/res/values-sw720dp/styles.xml
@@ -31,7 +31,11 @@
<item name="popupColorPrimary">#FFF</item>
<item name="popupColorSecondary">#F5F5F5</item> <!-- Gray 100 -->
<item name="popupColorTertiary">#E0E0E0</item> <!-- Gray 300 -->
- <item name="isPrimaryColorDark">false</item>
+ <item name="isMainColorDark">false</item>
+ <item name="isWorkspaceDarkText">false</item>
+ <item name="workspaceTextColor">?android:textColorPrimary</item>
+ <item name="workspaceAmbientShadowColor">#22000000</item>
+ <item name="workspaceKeyShadowColor">#44000000</item>
</style>
<!-- Workspace -->
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index b85ba3e6f..3f6f506c9 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -23,7 +23,13 @@
<attr name="popupColorPrimary" format="color" />
<attr name="popupColorSecondary" format="color" />
<attr name="popupColorTertiary" format="color" />
- <attr name="isPrimaryColorDark" format="boolean" />
+ <attr name="isMainColorDark" format="boolean" />
+ <attr name="isWorkspaceDarkText" format="boolean" />
+ <attr name="workspaceTextColor" format="color" />
+ <attr name="workspaceShadowColor" format="color" />
+ <attr name="workspaceAmbientShadowColor" format="color"/>
+ <attr name="workspaceKeyShadowColor" format="color" />
+ <attr name="workspaceStatusBarScrim" format="reference" />
<!-- BubbleTextView specific attributes. -->
<declare-styleable name="BubbleTextView">
@@ -39,6 +45,8 @@
<attr name="deferShadowGeneration" format="boolean" />
<attr name="customShadows" format="boolean" />
<attr name="centerVertically" format="boolean" />
+ <attr name="ambientShadowColor" format="color" />
+ <attr name="keyShadowColor" format="color" />
</declare-styleable>
<!-- PagedView specific attributes. These attributes are used to customize
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 5ef044e98..dd5602914 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -30,24 +30,38 @@
<item name="popupColorPrimary">#FFF</item>
<item name="popupColorSecondary">#F5F5F5</item> <!-- Gray 100 -->
<item name="popupColorTertiary">#E0E0E0</item> <!-- Gray 300 -->
- <item name="isPrimaryColorDark">false</item>
+ <item name="isMainColorDark">false</item>
+ <item name="isWorkspaceDarkText">false</item>
+ <item name="workspaceTextColor">?android:textColorPrimary</item>
+ <item name="workspaceShadowColor">#B0000000</item>
+ <item name="workspaceAmbientShadowColor">#22000000</item>
+ <item name="workspaceKeyShadowColor">#44000000</item>
+ <item name="workspaceStatusBarScrim">@drawable/workspace_bg</item>
</style>
<style name="LauncherTheme" parent="@style/BaseLauncherTheme"></style>
+ <style name="LauncherThemeDarkText" parent="@style/LauncherTheme">
+ <item name="workspaceTextColor">#FF212121</item>
+ <item name="workspaceShadowColor">@android:color/transparent</item>
+ <item name="workspaceAmbientShadowColor">@android:color/transparent</item>
+ <item name="workspaceKeyShadowColor">@android:color/transparent</item>
+ <item name="isWorkspaceDarkText">true</item>
+ <item name="workspaceStatusBarScrim">@null</item>
+ </style>
+
<style name="LauncherThemeDark" parent="@style/LauncherTheme">
<item name="android:textColorPrimary">#FFFFFFFF</item>
<item name="android:textColorSecondary">#FFFFFFFF</item>
<item name="android:textColorTertiary">#CCFFFFFF</item>
<item name="android:textColorHint">#A0FFFFFF</item>
-
<item name="android:colorControlHighlight">#A0FFFFFF</item>
<item name="android:colorPrimary">#FF333333</item>
<item name="allAppsScrimColor">#33000000</item>
<item name="popupColorPrimary">?android:attr/colorPrimary</item>
<item name="popupColorSecondary">#424242</item> <!-- Gray 800 -->
<item name="popupColorTertiary">#757575</item> <!-- Gray 600 -->
- <item name="isPrimaryColorDark">true</item>
+ <item name="isMainColorDark">true</item>
</style>
<!--
@@ -55,7 +69,7 @@
Various foreground colors are overridden to be white so that they are properly visible on
various wallpapers
-->
- <style name="HomeScreenElementTheme" parent="@style/LauncherTheme">
+ <style name="HomeScreenElementTheme">
<item name="android:colorEdgeEffect">@android:color/white</item>
<item name="android:textColorPrimary">@android:color/white</item>
<item name="android:textColorSecondary">@android:color/white</item>
@@ -110,6 +124,9 @@
<item name="customShadows">true</item>
<item name="android:shadowRadius">2.0</item>
<item name="android:shadowColor">#B0000000</item>
+ <item name="android:textColor">?attr/workspaceTextColor</item>
+ <item name="keyShadowColor">?attr/workspaceKeyShadowColor</item>
+ <item name="ambientShadowColor">?attr/workspaceAmbientShadowColor</item>
</style>
<!-- Theme for the popup container -->
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-18 02:48:38 +0000