diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/drawable-night/a11ymenu_intro.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/drawable-night/a11ymenu_intro.xml new file mode 100644 index 0000000000000..b2a0b320cc0fa --- /dev/null +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/drawable-night/a11ymenu_intro.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/drawable-sw600dp-night/a11ymenu_intro.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/drawable-sw600dp-night/a11ymenu_intro.xml index 7a4fbb207188e..cb2e9745132bc 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/drawable-sw600dp-night/a11ymenu_intro.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/drawable-sw600dp-night/a11ymenu_intro.xml @@ -3,274 +3,104 @@ android:height="300dp" android:viewportWidth="412" android:viewportHeight="300"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + android:strokeColor="#5f6368"/> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + android:strokeColor="#5f6368"/> + android:pathData="M78.55,70.3h0c8.84,0 16,7.16 16,16h0c0,8.84 -7.16,16 -16,16h0c-8.84,0 -16,-7.16 -16,-16h0c0,-8.84 7.16,-16 16,-16Z" + android:fillColor="#2197f3"/> + android:pathData="M78.55,174.3h0c8.83,0 16,7.16 16,16h0c0,8.83 -7.16,16 -16,16h0c-8.83,0 -16,-7.16 -16,-16h0c0,-8.83 7.16,-16 16,-16Z" + android:fillColor="#fdd663"/> + + + + + + + + + + + + + + + + + + + diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/drawable-sw600dp/a11ymenu_intro.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/drawable-sw600dp/a11ymenu_intro.xml index f0fbc48691b85..aba9581894a62 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/drawable-sw600dp/a11ymenu_intro.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/drawable-sw600dp/a11ymenu_intro.xml @@ -3,139 +3,101 @@ android:height="300dp" android:viewportWidth="412" android:viewportHeight="300"> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + android:strokeColor="#e8eaed"/> + android:strokeWidth="1" + android:pathData="M126.81,222.54L126.81,250.27" + android:fillColor="#00000000" + android:strokeColor="#e8eaed"/> + android:pathData="M78.71,173.91h0c8.83,0 16,7.16 16,16h0c0,8.83 -7.16,16 -16,16h0c-8.83,0 -16,-7.16 -16,-16h0c0,-8.83 7.16,-16 16,-16Z" + android:fillColor="#de9834"/> + + + + + + + + + + + + + + + + + + + diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/drawable/a11ymenu_intro.png b/packages/SystemUI/accessibility/accessibilitymenu/res/drawable/a11ymenu_intro.png deleted file mode 100644 index 6149ee4b2365b..0000000000000 Binary files a/packages/SystemUI/accessibility/accessibilitymenu/res/drawable/a11ymenu_intro.png and /dev/null differ diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/drawable/a11ymenu_intro.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/drawable/a11ymenu_intro.xml new file mode 100644 index 0000000000000..a5a05351eba6f --- /dev/null +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/drawable/a11ymenu_intro.xml @@ -0,0 +1,90 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/drawable/ic_logo_a11y_assistant_24dp.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/drawable/ic_logo_a11y_assistant_24dp.xml new file mode 100644 index 0000000000000..9c3417fde80a8 --- /dev/null +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/drawable/ic_logo_a11y_assistant_24dp.xml @@ -0,0 +1,10 @@ + + + \ No newline at end of file diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/drawable/ic_logo_assistant_32dp.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/drawable/ic_logo_assistant_32dp.xml deleted file mode 100644 index ebeebf81eedcf..0000000000000 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/drawable/ic_logo_assistant_32dp.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values-night/colors.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values-night/colors.xml index a600ec6bbccf1..fbf2b071ea3cf 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values-night/colors.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values-night/colors.xml @@ -9,7 +9,7 @@ #7ae3d4 #f496ac #adcbff - #F1F3F4 + #adcbff #fdd663 #10FFFFFF diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values/colors.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values/colors.xml index c1494f9c8103c..d81d0d511a872 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values/colors.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values/colors.xml @@ -9,7 +9,7 @@ #01A2A0 #F15B8D #26459C - #F1F3F4 + #2196F3 #E59810 #1a73e8 diff --git a/packages/SystemUI/accessibility/accessibilitymenu/res/values/strings.xml b/packages/SystemUI/accessibility/accessibilitymenu/res/values/strings.xml index 30fd0173ff3fc..0747ef089a8d9 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/res/values/strings.xml +++ b/packages/SystemUI/accessibility/accessibilitymenu/res/values/strings.xml @@ -10,7 +10,7 @@ Assistant - Google Assistant + Assistant Accessibility Settings diff --git a/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/model/A11yMenuShortcut.java b/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/model/A11yMenuShortcut.java index b6328f04ac2ef..66a2fae0c4c34 100644 --- a/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/model/A11yMenuShortcut.java +++ b/packages/SystemUI/accessibility/accessibilitymenu/src/com/android/systemui/accessibility/accessibilitymenu/model/A11yMenuShortcut.java @@ -54,7 +54,7 @@ public class A11yMenuShortcut { /** Map stores all shortcut resource IDs that is in matching order of defined shortcut. */ private static final Map sShortcutResource = new HashMap<>() {{ put(ShortcutId.ID_ASSISTANT_VALUE, new int[] { - R.drawable.ic_logo_assistant_32dp, + R.drawable.ic_logo_a11y_assistant_24dp, R.color.assistant_color, R.string.assistant_utterance, R.string.assistant_label,