PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I75d810e4,I50111f0c into udc-qpr-dev am: 290d241b1b

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23738691

Change-Id: I7c32cba3253b5f5811269ebe5a37099bbb8eb66c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Candice Lo
2023-06-21 01:20:02 +00:00
committed by Automerger Merge Worker
parent 41e2eb2261 290d241b1b
commit 380deaaa3b
2 changed files with 24 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/com/android/settings/accessibility/AccessibilityQuickSettingsPrimarySwitchPreferenceController.java
View File

@@ -130,10 +130,17 @@ public abstract class AccessibilityQuickSettingsPrimarySwitchPreferenceControlle
return; return;
} }
mTooltipWindow = new AccessibilityQuickSettingsTooltipWindow(mContext); // TODO (287728819): Move tooltip showing to SystemUI
mTooltipWindow.setup(getTileTooltipContent(), // Since the lifecycle of controller is independent of that of the preference, doing
R.drawable.accessibility_auto_added_qs_tooltip_illustration); // null check on switch is a temporary solution for the case that switch view
mTooltipWindow.showAtTopCenter(mPreference.getSwitch()); // is not ready when we would like to show the tooltip. If the switch is not ready,
// we give up showing the tooltip and also do not reshow it in the future.
if (mPreference.getSwitch() != null) {
mTooltipWindow = new AccessibilityQuickSettingsTooltipWindow(mContext);
mTooltipWindow.setup(getTileTooltipContent(),
R.drawable.accessibility_auto_added_qs_tooltip_illustration);
mTooltipWindow.showAtTopCenter(mPreference.getSwitch());
}
AccessibilityQuickSettingUtils.optInValueToSharedPreferences(mContext, tileComponentName); AccessibilityQuickSettingUtils.optInValueToSharedPreferences(mContext, tileComponentName);
mNeedsQSTooltipReshow = false; mNeedsQSTooltipReshow = false;
} }

18
src/com/android/settings/accessibility/PreviewSizeSeekBarController.java
View File

@@ -213,11 +213,19 @@ abstract class PreviewSizeSeekBarController extends BasePreferenceController imp
return; return;
} }
mTooltipWindow = new AccessibilityQuickSettingsTooltipWindow(mContext); // TODO (287728819): Move tooltip showing to SystemUI
mTooltipWindow.setup(getTileTooltipContent(), // Since the lifecycle of controller is independent of that of the preference, doing
R.drawable.accessibility_auto_added_qs_tooltip_illustration); // null check on seekbar is a temporary solution for the case that seekbar view
mTooltipWindow.showAtTopCenter(mSeekBarPreference.getSeekbar()); // is not ready when we would like to show the tooltip. If the seekbar is not ready,
AccessibilityQuickSettingUtils.optInValueToSharedPreferences(mContext, tileComponentName); // we give up showing the tooltip and also do not reshow it in the future.
if (mSeekBarPreference.getSeekbar() != null) {
mTooltipWindow = new AccessibilityQuickSettingsTooltipWindow(mContext);
mTooltipWindow.setup(getTileTooltipContent(),
R.drawable.accessibility_auto_added_qs_tooltip_illustration);
mTooltipWindow.showAtTopCenter(mSeekBarPreference.getSeekbar());
}
AccessibilityQuickSettingUtils.optInValueToSharedPreferences(mContext,
tileComponentName);
mNeedsQSTooltipReshow = false; mNeedsQSTooltipReshow = false;
} }