Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "fix(magnification settings): reload strings when language changes" into udc-dev

Browse Source
This commit is contained in:
Tyler Freeman
2023-04-26 04:06:33 +00:00
committed by Android (Google) Code Review
parent a90801f5f6 231bcf887b
commit 75d67f49ad
1 changed files with 4 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
packages/SystemUI/src/com/android/systemui/accessibility/WindowMagnificationSettings.java
View File

@@ -463,13 +463,17 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest
if ((configDiff & ActivityInfo.CONFIG_UI_MODE) != 0 if ((configDiff & ActivityInfo.CONFIG_UI_MODE) != 0
|| (configDiff & ActivityInfo.CONFIG_ASSETS_PATHS) != 0 || (configDiff & ActivityInfo.CONFIG_ASSETS_PATHS) != 0
|| (configDiff & ActivityInfo.CONFIG_FONT_SCALE) != 0 || (configDiff & ActivityInfo.CONFIG_FONT_SCALE) != 0
|| (configDiff & ActivityInfo.CONFIG_LOCALE) != 0
|| (configDiff & ActivityInfo.CONFIG_DENSITY) != 0) { || (configDiff & ActivityInfo.CONFIG_DENSITY) != 0) {
// We listen to following config changes to trigger layout inflation: // We listen to following config changes to trigger layout inflation:
// CONFIG_UI_MODE: theme change // CONFIG_UI_MODE: theme change
// CONFIG_ASSETS_PATHS: wallpaper change // CONFIG_ASSETS_PATHS: wallpaper change
// CONFIG_FONT_SCALE: font size change // CONFIG_FONT_SCALE: font size change
// CONFIG_LOCALE: language change
// CONFIG_DENSITY: display size change // CONFIG_DENSITY: display size change
mParams.accessibilityTitle = getAccessibilityWindowTitle(mContext);
boolean showSettingPanelAfterThemeChange = mIsVisible; boolean showSettingPanelAfterThemeChange = mIsVisible;
hideSettingPanel(/* resetPosition= */ false); hideSettingPanel(/* resetPosition= */ false);
inflateView(); inflateView();
@@ -490,11 +494,6 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest
+ mDraggableWindowBounds.top; + mDraggableWindowBounds.top;
return; return;
} }
if ((configDiff & ActivityInfo.CONFIG_LOCALE) != 0) {
updateAccessibilityWindowTitle();
return;
}
} }
private void onWindowInsetChanged() { private void onWindowInsetChanged() {
@@ -515,13 +514,6 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest
} }
} }
private void updateAccessibilityWindowTitle() {
mParams.accessibilityTitle = getAccessibilityWindowTitle(mContext);
if (mIsVisible) {
mWindowManager.updateViewLayout(mSettingView, mParams);
}
}
public void editMagnifierSizeMode(boolean enable) { public void editMagnifierSizeMode(boolean enable) {
setEditMagnifierSizeMode(enable); setEditMagnifierSizeMode(enable);
updateSelectedButton(MagnificationSize.NONE); updateSelectedButton(MagnificationSize.NONE);