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

Commit 2638ae16 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Fix up some jank from unnecessary reinflation" into oc-dev 

am: f6e20990

Change-Id: I32bbb4c1bbe5a477565ceb0382cc859c53283fdf
parents 619c81b5 f6e20990

packages/SettingsLib/src/com/android/settingslib/applications/InterestingConfigChanges.java

+5 −5
Original line number Original line Diff line number Diff line
@@ -26,13 +26,13 @@ public class InterestingConfigChanges { 
    private int mLastDensity;

    private int mLastDensity;





    public InterestingConfigChanges() {

    public InterestingConfigChanges() {

        this(0);

        this(ActivityInfo.CONFIG_LOCALE

                | ActivityInfo.CONFIG_UI_MODE | ActivityInfo.CONFIG_SCREEN_LAYOUT

                | ActivityInfo.CONFIG_ASSETS_PATHS);

    }

    }





    public InterestingConfigChanges(int extraFlags) {

    public InterestingConfigChanges(int flags) {

        mFlags = extraFlags | ActivityInfo.CONFIG_LOCALE

        mFlags = flags;

                | ActivityInfo.CONFIG_UI_MODE | ActivityInfo.CONFIG_SCREEN_LAYOUT

                | ActivityInfo.CONFIG_ASSETS_PATHS;

    }

    }





    public boolean applyNewConfig(Resources res) {

    public boolean applyNewConfig(Resources res) {

packages/SystemUI/src/com/android/systemui/assist/AssistManager.java

+3 −1
Original line number Original line Diff line number Diff line
@@ -92,7 +92,9 @@ public class AssistManager implements ConfigurationChangedReceiver { 
        mAssistDisclosure = new AssistDisclosure(context, new Handler());

        mAssistDisclosure = new AssistDisclosure(context, new Handler());





        registerVoiceInteractionSessionListener();

        registerVoiceInteractionSessionListener();

        mInterestingConfigChanges = new InterestingConfigChanges(ActivityInfo.CONFIG_ORIENTATION);

        mInterestingConfigChanges = new InterestingConfigChanges(ActivityInfo.CONFIG_ORIENTATION

                | ActivityInfo.CONFIG_LOCALE | ActivityInfo.CONFIG_UI_MODE

                | ActivityInfo.CONFIG_SCREEN_LAYOUT | ActivityInfo.CONFIG_ASSETS_PATHS);

        onConfigurationChanged(context.getResources().getConfiguration());

        onConfigurationChanged(context.getResources().getConfiguration());

    }

    }

packages/SystemUI/src/com/android/systemui/fragments/FragmentHostManager.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -49,7 +49,8 @@ public class FragmentHostManager { 
    private final HashMap<String, ArrayList<FragmentListener>> mListeners = new HashMap<>();

    private final HashMap<String, ArrayList<FragmentListener>> mListeners = new HashMap<>();

    private final View mRootView;

    private final View mRootView;

    private final InterestingConfigChanges mConfigChanges = new InterestingConfigChanges(

    private final InterestingConfigChanges mConfigChanges = new InterestingConfigChanges(

            ActivityInfo.CONFIG_FONT_SCALE);

            ActivityInfo.CONFIG_FONT_SCALE | ActivityInfo.CONFIG_LOCALE

                | ActivityInfo.CONFIG_SCREEN_LAYOUT | ActivityInfo.CONFIG_ASSETS_PATHS);

    private final FragmentService mManager;

    private final FragmentService mManager;

    private final PluginFragmentManager mPlugins = new PluginFragmentManager();

    private final PluginFragmentManager mPlugins = new PluginFragmentManager();

packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java

+2 −1
Original line number Original line Diff line number Diff line
@@ -60,7 +60,8 @@ public class VolumeDialogComponent implements VolumeComponent, TunerService.Tuna 
    private final Context mContext;

    private final Context mContext;

    private final VolumeDialogControllerImpl mController;

    private final VolumeDialogControllerImpl mController;

    private final InterestingConfigChanges mConfigChanges = new InterestingConfigChanges(

    private final InterestingConfigChanges mConfigChanges = new InterestingConfigChanges(

            ActivityInfo.CONFIG_FONT_SCALE);

            ActivityInfo.CONFIG_FONT_SCALE | ActivityInfo.CONFIG_LOCALE

            | ActivityInfo.CONFIG_ASSETS_PATHS);

    private final Extension mExtension;

    private final Extension mExtension;

    private VolumeDialog mDialog;

    private VolumeDialog mDialog;

    private VolumePolicy mVolumePolicy = new VolumePolicy(

    private VolumePolicy mVolumePolicy = new VolumePolicy(