Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 231bcf88 authored by Tyler Freeman's avatar Tyler Freeman
Browse files

fix(magnification settings): reload strings when language changes

Fix: 279517922
Test: manual:
1. Open magnifier
2. Open Settings panel.
3. Close panel
4. Go to settings and change languages
5. Open mag settings panel. Language should change

Change-Id: Ida0f623043756067eb0031ed3e153aed05b7238d
parent 0889fb51
Loading
Loading
Loading
Loading
+4 −12
Original line number Diff line number Diff line
@@ -454,13 +454,17 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest
        if ((configDiff & ActivityInfo.CONFIG_UI_MODE) != 0
                || (configDiff & ActivityInfo.CONFIG_ASSETS_PATHS) != 0
                || (configDiff & ActivityInfo.CONFIG_FONT_SCALE) != 0
                || (configDiff & ActivityInfo.CONFIG_LOCALE) != 0
                || (configDiff & ActivityInfo.CONFIG_DENSITY) != 0) {
            // We listen to following config changes to trigger layout inflation:
            // CONFIG_UI_MODE: theme change
            // CONFIG_ASSETS_PATHS: wallpaper change
            // CONFIG_FONT_SCALE: font size change
            // CONFIG_LOCALE: language change
            // CONFIG_DENSITY: display size change

            mParams.accessibilityTitle = getAccessibilityWindowTitle(mContext);

            boolean showSettingPanelAfterThemeChange = mIsVisible;
            hideSettingPanel(/* resetPosition= */ false);
            inflateView();
@@ -481,11 +485,6 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest
                    + mDraggableWindowBounds.top;
            return;
        }

        if ((configDiff & ActivityInfo.CONFIG_LOCALE) != 0) {
            updateAccessibilityWindowTitle();
            return;
        }
    }

    private void onWindowInsetChanged() {
@@ -506,13 +505,6 @@ class WindowMagnificationSettings implements MagnificationGestureDetector.OnGest
        }
    }

    private void updateAccessibilityWindowTitle() {
        mParams.accessibilityTitle = getAccessibilityWindowTitle(mContext);
        if (mIsVisible) {
            mWindowManager.updateViewLayout(mSettingView, mParams);
        }
    }

    public void editMagnifierSizeMode(boolean enable) {
        setEditMagnifierSizeMode(enable);
        updateSelectedButton(MagnificationSize.NONE);