From cad616bd9aaa610a7cfa45b07140c1c1da550f0f Mon Sep 17 00:00:00 2001 From: menghanli Date: Mon, 21 Feb 2022 11:47:02 +0800 Subject: [PATCH] Show different tooltips for QS features auto-added and non-auto-added There are 2 different kinds of auto-added / non-auto-added illustrations in QS tooltips for framework features. Show animation in the settings page for full flow for non-framework services. Bug: 218968108 Test: manual testing Change-Id: I9c95c9f3e60ce94ce4059e27ef93c1dacce7a5c7 --- ...ty_auto_added_qs_tooltips_illustration.xml | 62 +++++++++++++++++++ ...cessibilityShortcutPreferenceFragment.java | 4 +- .../ToggleFeaturePreferenceFragment.java | 4 +- 3 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 res/drawable/accessibility_auto_added_qs_tooltips_illustration.xml diff --git a/res/drawable/accessibility_auto_added_qs_tooltips_illustration.xml b/res/drawable/accessibility_auto_added_qs_tooltips_illustration.xml new file mode 100644 index 00000000000..2583b6f32bc --- /dev/null +++ b/res/drawable/accessibility_auto_added_qs_tooltips_illustration.xml @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + diff --git a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java index 57987237636..59618d643fd 100644 --- a/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java +++ b/src/com/android/settings/accessibility/AccessibilityShortcutPreferenceFragment.java @@ -509,7 +509,9 @@ public abstract class AccessibilityShortcutPreferenceFragment extends DashboardF ? R.string.accessibility_service_qs_tooltips_content : R.string.accessibility_service_auto_added_qs_tooltips_content; final String title = getString(titleResId, tileName); - final int imageResId = R.drawable.accessibility_qs_tooltips_illustration; + final int imageResId = mNeedsQSTooltipType == QuickSettingsTooltipType.GUIDE_TO_EDIT + ? R.drawable.accessibility_qs_tooltips_illustration + : R.drawable.accessibility_auto_added_qs_tooltips_illustration; mTooltipWindow = new AccessibilityQuickSettingsTooltipWindow(getContext()); mTooltipWindow.setup(title, imageResId); mTooltipWindow.showAtTopCenter(getView()); diff --git a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java index 5992ceb1c1c..9cf2c26967c 100644 --- a/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java +++ b/src/com/android/settings/accessibility/ToggleFeaturePreferenceFragment.java @@ -879,7 +879,9 @@ public abstract class ToggleFeaturePreferenceFragment extends SettingsPreference ? R.string.accessibility_service_qs_tooltips_content : R.string.accessibility_service_auto_added_qs_tooltips_content; final String title = getString(titleResId, tileName); - final int imageResId = R.drawable.accessibility_qs_tooltips_illustration; + final int imageResId = mNeedsQSTooltipType == QuickSettingsTooltipType.GUIDE_TO_EDIT + ? R.drawable.accessibility_qs_tooltips_illustration + : R.drawable.accessibility_auto_added_qs_tooltips_illustration; mTooltipWindow = new AccessibilityQuickSettingsTooltipWindow(getContext()); mTooltipWindow.setup(title, imageResId); mTooltipWindow.showAtTopCenter(getView());