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

Commit 86b867fd authored by Casey Burkhardt's avatar Casey Burkhardt
Browse files

Adds Settings.System.FONT_SCALE observer to ActivityManagerService 

Changes to Settings.System.FONT_SCALE were not being handled by any service,
which required a device reboot for any changes to take effect.  Changes to
this field by the Settings app worked as expected only because it is able to
poke ActivityManager with an updated configuration, whereas unbundled
applications cannot.

This also ensures the setting value is backed up and doesn't conflict with
a configured value from accessibility onboarding during restore.

Bug:23033258
Change-Id: I98d4aed2f9f5893d054e6b10c4dfda406de8eba2
parent 0af6fa70

core/java/android/provider/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -3278,6 +3278,7 @@ public final class Settings { 
            WIFI_STATIC_DNS2,

            BLUETOOTH_DISCOVERABILITY,

            BLUETOOTH_DISCOVERABILITY_TIMEOUT,

            FONT_SCALE,

            DIM_SCREEN,

            SCREEN_OFF_TIMEOUT,

            SCREEN_BRIGHTNESS,

packages/SettingsProvider/src/com/android/providers/settings/SettingsHelper.java

+20 −16
Original line number Diff line number Diff line
@@ -235,24 +235,28 @@ public class SettingsHelper { 
        // it means that the user has performed a global gesture to enable accessibility or set

        // these settings in the Accessibility portion of the Setup Wizard, and definitely needs

        // these features working after the restore.

        if (Settings.Secure.ACCESSIBILITY_ENABLED.equals(name)

                || Settings.Secure.ACCESSIBILITY_SCRIPT_INJECTION.equals(name)

                || Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD.equals(name)

                || Settings.Secure.TOUCH_EXPLORATION_ENABLED.equals(name)

                || Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED.equals(name)

                || Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED.equals(name)

                || Settings.Secure.UI_NIGHT_MODE.equals(name)) {

        switch (name) {

            case Settings.Secure.ACCESSIBILITY_ENABLED:

            case Settings.Secure.ACCESSIBILITY_SCRIPT_INJECTION:

            case Settings.Secure.ACCESSIBILITY_SPEAK_PASSWORD:

            case Settings.Secure.TOUCH_EXPLORATION_ENABLED:

            case Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER_ENABLED:

            case Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_ENABLED:

            case Settings.Secure.UI_NIGHT_MODE:

                return Settings.Secure.getInt(mContext.getContentResolver(), name, 0) != 0;

        } else if (Settings.Secure.TOUCH_EXPLORATION_GRANTED_ACCESSIBILITY_SERVICES.equals(name)

                || Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES.equals(name)

                || Settings.Secure.ACCESSIBILITY_DISPLAY_COLOR_MATRIX.equals(name)

                || Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER.equals(name)

                || Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE.equals(name)) {

            case Settings.Secure.TOUCH_EXPLORATION_GRANTED_ACCESSIBILITY_SERVICES:

            case Settings.Secure.ENABLED_ACCESSIBILITY_SERVICES:

            case Settings.Secure.ACCESSIBILITY_DISPLAY_COLOR_MATRIX:

            case Settings.Secure.ACCESSIBILITY_DISPLAY_DALTONIZER:

            case Settings.Secure.ACCESSIBILITY_DISPLAY_MAGNIFICATION_SCALE:

                return !TextUtils.isEmpty(Settings.Secure.getString(

                        mContext.getContentResolver(), name));

        }

            case Settings.System.FONT_SCALE:

                return Settings.System.getFloat(mContext.getContentResolver(), name, 1.0f) != 1.0f;

            default:

                return false;

        }

    }



    private void setAutoRestore(boolean enabled) {

        try {

services/core/java/com/android/server/am/ActivityManagerService.java

+36 −0
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ import android.content.pm.UserInfo; 
import android.content.res.CompatibilityInfo;

import android.content.res.Configuration;

import android.content.res.Resources;

import android.database.ContentObserver;

import android.graphics.Bitmap;

import android.graphics.Point;

import android.graphics.Rect;
@@ -270,6 +271,7 @@ import static android.provider.Settings.Global.DEVELOPMENT_ENABLE_FREEFORM_WINDO 
import static android.provider.Settings.Global.DEVELOPMENT_FORCE_RESIZABLE_ACTIVITIES;

import static android.provider.Settings.Global.DEVELOPMENT_FORCE_RTL;

import static android.provider.Settings.Global.WAIT_FOR_DEBUGGER;

import static android.provider.Settings.System.FONT_SCALE;

import static com.android.internal.util.XmlUtils.readBooleanAttribute;

import static com.android.internal.util.XmlUtils.readIntAttribute;

import static com.android.internal.util.XmlUtils.readLongAttribute;
@@ -1015,6 +1017,25 @@ public final class ActivityManagerService extends ActivityManagerNative 














    CoreSettingsObserver mCoreSettingsObserver;



























    FontScaleSettingObserver mFontScaleSettingObserver;

























    private final class FontScaleSettingObserver extends ContentObserver {













        private final Uri mFontScaleUri = Settings.System.getUriFor(FONT_SCALE);

























        public FontScaleSettingObserver() {













            super(mHandler);













            ContentResolver resolver = mContext.getContentResolver();













            resolver.registerContentObserver(mFontScaleUri, false, this, UserHandle.USER_ALL);













        }

























        @Override













        public void onChange(boolean selfChange, Uri uri) {













            if (mFontScaleUri.equals(uri)) {













                updateFontScaleIfNeeded();













            }













        }













    }



























    /**















     * Thread-local storage used to carry caller permissions over through















     * indirect content-provider access.










@@ -10916,6 +10937,7 @@ public final class ActivityManagerService extends ActivityManagerNative













        }





























        mCoreSettingsObserver = new CoreSettingsObserver(this);













        mFontScaleSettingObserver = new FontScaleSettingObserver();





























        //mUsageStatsService.monitorPackages();















    }










@@ -18288,6 +18310,20 @@ public final class ActivityManagerService extends ActivityManagerNative













        }















    }



























    private void updateFontScaleIfNeeded() {













        final int currentUserId;













        synchronized(this) {













            currentUserId = mUserController.getCurrentUserIdLocked();













        }













        final float scaleFactor = Settings.System.getFloatForUser(mContext.getContentResolver(),













                FONT_SCALE, 1.0f, currentUserId);













        if (mConfiguration.fontScale != scaleFactor) {













            final Configuration configuration = mWindowManager.computeNewConfiguration();













            configuration.fontScale = scaleFactor;













            updatePersistentConfiguration(configuration);













        }













    }



























    private void enforceWriteSettingsPermission(String func) {















        int uid = Binder.getCallingUid();















        if (uid == Process.ROOT_UID) {