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

Commit 7d36b6f5 authored by Steve Kondik's avatar Steve Kondik
Browse files

Revert "Allow font scaling preference persist. Fixes issue 3530." 

Still breaks things. Text in popup windows is mangled.

This reverts commit 77d0dba1.
parent bad22064

core/java/android/content/res/Configuration.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -311,7 +311,7 @@ public final class Configuration implements Parcelable, Comparable<Configuration 
     * Set this object to the system defaults.

     * Set this object to the system defaults.

     */

     */

    public void setToDefaults() {

    public void setToDefaults() {

        fontScale = 0;

        fontScale = 1;

        mcc = mnc = 0;

        mcc = mnc = 0;

        locale = null;

        locale = null;

        userSetLocale = false;

        userSetLocale = false;

core/java/android/provider/Settings.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -1011,7 +1011,7 @@ public final class Settings { 
        public static void getConfiguration(ContentResolver cr, Configuration outConfig) {

        public static void getConfiguration(ContentResolver cr, Configuration outConfig) {

            outConfig.fontScale = Settings.System.getFloat(

            outConfig.fontScale = Settings.System.getFloat(

                cr, FONT_SCALE, outConfig.fontScale);

                cr, FONT_SCALE, outConfig.fontScale);

            if (!(outConfig.fontScale > 0)) {

            if (outConfig.fontScale < 0) {

                outConfig.fontScale = 1;

                outConfig.fontScale = 1;

            }

            }

        }

        }