diff --git a/res/color-night-v31/all_apps_button_color_2.xml b/res/color-night-v31/all_apps_button_color_2.xml
new file mode 100644
index 0000000000..30b972ffaa
--- /dev/null
+++ b/res/color-night-v31/all_apps_button_color_2.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
diff --git a/res/color-v31/all_apps_button_bg_color.xml b/res/color-v31/all_apps_button_bg_color.xml
new file mode 100644
index 0000000000..3ad38bc697
--- /dev/null
+++ b/res/color-v31/all_apps_button_bg_color.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
diff --git a/res/color-v31/all_apps_button_color_1.xml b/res/color-v31/all_apps_button_color_1.xml
new file mode 100644
index 0000000000..2d0895e4d8
--- /dev/null
+++ b/res/color-v31/all_apps_button_color_1.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
diff --git a/res/color-v31/all_apps_button_color_2.xml b/res/color-v31/all_apps_button_color_2.xml
new file mode 100644
index 0000000000..7674b432b5
--- /dev/null
+++ b/res/color-v31/all_apps_button_color_2.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
diff --git a/res/color-v31/all_apps_button_color_3.xml b/res/color-v31/all_apps_button_color_3.xml
new file mode 100644
index 0000000000..17cb54f721
--- /dev/null
+++ b/res/color-v31/all_apps_button_color_3.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
diff --git a/res/color-v31/all_apps_button_color_4.xml b/res/color-v31/all_apps_button_color_4.xml
new file mode 100644
index 0000000000..a6150f13f4
--- /dev/null
+++ b/res/color-v31/all_apps_button_color_4.xml
@@ -0,0 +1,20 @@
+
+
+
+
+
diff --git a/res/drawable/ic_all_apps_button.xml b/res/drawable/ic_all_apps_button.xml
index 52b919bd27..5770d3cf19 100644
--- a/res/drawable/ic_all_apps_button.xml
+++ b/res/drawable/ic_all_apps_button.xml
@@ -18,26 +18,27 @@
android:width="80dp"
android:height="80dp"
android:viewportWidth="80"
- android:viewportHeight="80">
+ android:viewportHeight="80"
+ android:theme="@style/AllAppsTheme">
+ android:fillColor="?attr/allAppsButtonBgColor"/>
+ android:fillColor="?attr/allAppsButtonColor1"/>
+ android:fillColor="?attr/allAppsButtonColor2"/>
+ android:fillColor="?attr/allAppsButtonColor3"/>
+ android:fillColor="?attr/allAppsButtonColor2"/>
+ android:fillColor="?attr/allAppsButtonColor4"/>
+ android:fillColor="?attr/allAppsButtonColor2"/>
diff --git a/res/values-night-v31/colors.xml b/res/values-night-v31/colors.xml
index 2c1bc90074..eefe8c5f81 100644
--- a/res/values-night-v31/colors.xml
+++ b/res/values-night-v31/colors.xml
@@ -24,4 +24,9 @@
@android:color/system_neutral2_300
@android:color/system_accent2_700
@android:color/system_neutral1_700
+
+ @android:color/system_neutral1_800
+ @android:color/system_accent1_300
+ @android:color/system_accent1_100
+ @android:color/system_accent2_100
\ No newline at end of file
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
new file mode 100644
index 0000000000..ce272ceade
--- /dev/null
+++ b/res/values-night/colors.xml
@@ -0,0 +1,25 @@
+
+
+
+ #2E3132
+ #33B9DB
+ #EFFBFF
+ #B1EBFF
+ #DEE0FF
+
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 0b04b863b4..99a337e034 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -54,6 +54,12 @@
+
+
+
+
+
+
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 0b1b451302..2bc923952d 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -79,4 +79,10 @@
#ff8df5e3
#ff3d665f
+
+ #F7F9FA
+ #00677E
+ #00677E
+ #5F757E
+ #005A6E
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 818a032f94..864bb58d19 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -203,6 +203,14 @@
- no
+
+
diff --git a/src/com/android/launcher3/views/AllAppsButton.java b/src/com/android/launcher3/views/AllAppsButton.java
index f502d46db7..b1e69c7de4 100644
--- a/src/com/android/launcher3/views/AllAppsButton.java
+++ b/src/com/android/launcher3/views/AllAppsButton.java
@@ -18,6 +18,7 @@ package com.android.launcher3.views;
import android.content.Context;
import android.graphics.Bitmap;
import android.util.AttributeSet;
+import android.view.ContextThemeWrapper;
import com.android.launcher3.BubbleTextView;
import com.android.launcher3.LauncherAppState;
@@ -40,8 +41,9 @@ public class AllAppsButton extends BubbleTextView {
public AllAppsButton(Context context, AttributeSet attrs, int defStyle) {
super(context, attrs, defStyle);
+ Context theme = new ContextThemeWrapper(context, R.style.AllAppsButtonTheme);
Bitmap bitmap = LauncherAppState.getInstance(context).getIconCache().getIconFactory()
- .createScaledBitmapWithShadow(context.getDrawable(R.drawable.ic_all_apps_button));
+ .createScaledBitmapWithShadow(theme.getDrawable(R.drawable.ic_all_apps_button));
setIcon(new FastBitmapDrawable(bitmap));
}
}