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

Commit 669d4860 authored by Jeremy Meyer's avatar Jeremy Meyer Committed by Android (Google) Code Review
Browse files

Merge "Make Configuration.generateDelta() public"

parents 36709edf f459f57c

core/api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -13301,6 +13301,7 @@ package android.content.res { 
    method public int describeContents();

    method public int diff(android.content.res.Configuration);

    method public boolean equals(android.content.res.Configuration);

    method @NonNull public static android.content.res.Configuration generateDelta(@NonNull android.content.res.Configuration, @NonNull android.content.res.Configuration);

    method public int getLayoutDirection();

    method @NonNull public android.os.LocaleList getLocales();

    method public boolean isLayoutSizeAtLeast(int);

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

+3 −3
Original line number Diff line number Diff line
@@ -2620,10 +2620,10 @@ public final class Configuration implements Parcelable, Comparable<Configuration 
     * {@link #updateFrom(Configuration)} will treat it as a no-op and not update that member.

     *

     * This is fine for device configurations as no member is ever undefined.

     * {@hide}

     */

    @UnsupportedAppUsage

    public static Configuration generateDelta(Configuration base, Configuration change) {

    @NonNull

    public static Configuration generateDelta(

            @NonNull Configuration base, @NonNull Configuration change) {

        final Configuration delta = new Configuration();

        if (base.fontScale != change.fontScale) {

            delta.fontScale = change.fontScale;

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

+13 −0
Original line number Diff line number Diff line
@@ -16,10 +16,15 @@ 


package com.android.settingslib.applications;



import android.annotation.SuppressLint;

import android.content.pm.ActivityInfo;

import android.content.res.Configuration;

import android.content.res.Resources;



/**

 * A class for applying config changes and determing if doing so resulting in any "interesting"

 * changes.

 */

public class InterestingConfigChanges {

    private final Configuration mLastConfiguration = new Configuration();

    private final int mFlags;
@@ -35,6 +40,14 @@ public class InterestingConfigChanges { 
        mFlags = flags;

    }



    /**

     * Applies the given config change and returns whether an "interesting" change happened.

     *

     * @param res The source of the new config to apply

     *

     * @return Whether interesting changes occurred

     */

    @SuppressLint("NewApi")

    public boolean applyNewConfig(Resources res) {

        int configChanges = mLastConfiguration.updateFrom(

                Configuration.generateDelta(mLastConfiguration, res.getConfiguration()));