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

Commit 8ec32dd0 authored by Louis Chang's avatar Louis Chang
Browse files

Do not filter out the size configs if no configuration buckets 

Otherwise, the activity may not be relaunched in the right
configuration.

Bug: 235449822
Bug: 235774601
Test: start Settings
Test: atest SizeConfigurationBucketsTest
Change-Id: I3c1d63114b570e1f740408a4381888b0697c2c94
parent e0d6f903

core/java/android/window/SizeConfigurationBuckets.java

+4 −13
Original line number Diff line number Diff line
@@ -104,24 +104,15 @@ public final class SizeConfigurationBuckets implements Parcelable { 
    /**

     * Get the changes between two configurations but don't count changes in sizes if they don't

     * cross boundaries that are important to the app.

     *

     * This is a static helper to deal with null `buckets`. When no buckets have been specified,

     * this actually filters out all 3 size-configs. This is legacy behavior.

     */

    public static int filterDiff(int diff, @NonNull Configuration oldConfig,

            @NonNull Configuration newConfig, @Nullable SizeConfigurationBuckets buckets) {

        final boolean nonSizeLayoutFieldsUnchanged =

                areNonSizeLayoutFieldsUnchanged(oldConfig.screenLayout, newConfig.screenLayout);

        if (buckets == null) {

            // Only unflip CONFIG_SCREEN_LAYOUT if non-size-related  attributes of screen layout do

            // not change.

            if (nonSizeLayoutFieldsUnchanged) {

                return diff & ~(CONFIG_SCREEN_SIZE | CONFIG_SMALLEST_SCREEN_SIZE

                        | CONFIG_SCREEN_LAYOUT);

            } else {

                return diff & ~(CONFIG_SCREEN_SIZE | CONFIG_SMALLEST_SCREEN_SIZE);

            }

            return diff;

        }



        final boolean nonSizeLayoutFieldsUnchanged =

                areNonSizeLayoutFieldsUnchanged(oldConfig.screenLayout, newConfig.screenLayout);

        if ((diff & CONFIG_SCREEN_SIZE) != 0) {

            final boolean crosses = buckets.crossesHorizontalSizeThreshold(oldConfig.screenWidthDp,

                    newConfig.screenWidthDp)