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

Commit dde83e10 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Fix Configuration.diff documentation." am: f822fdf1 am: 1017b748... 

Merge "Fix Configuration.diff documentation." am: f822fdf1 am: 1017b748 am: dd769fed am: 821bb806 am: ba48efd2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1856336

Change-Id: I54f619a0ee909901ee78de8030c6a840aff1324d
parents 39f40165 ba48efd2

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

+3 −29
Original line number Original line Diff line number Diff line
@@ -1736,35 +1736,9 @@ public final class Configuration implements Parcelable, Comparable<Configuration 
     * object and the given one.  Does not change the values of either.  Any

     * object and the given one.  Does not change the values of either.  Any

     * undefined fields in <var>delta</var> are ignored.

     * undefined fields in <var>delta</var> are ignored.

     * @return Returns a bit mask indicating which configuration

     * @return Returns a bit mask indicating which configuration

     * values has changed, containing any combination of

     * values have changed.

     * {@link android.content.pm.ActivityInfo#CONFIG_FONT_SCALE

     */

     * PackageManager.ActivityInfo.CONFIG_FONT_SCALE},

    public @Config int diff(Configuration delta) {

     * {@link android.content.pm.ActivityInfo#CONFIG_MCC

     * PackageManager.ActivityInfo.CONFIG_MCC},

     * {@link android.content.pm.ActivityInfo#CONFIG_MNC

     * PackageManager.ActivityInfo.CONFIG_MNC},

     * {@link android.content.pm.ActivityInfo#CONFIG_LOCALE

     * PackageManager.ActivityInfo.CONFIG_LOCALE},

     * {@link android.content.pm.ActivityInfo#CONFIG_TOUCHSCREEN

     * PackageManager.ActivityInfo.CONFIG_TOUCHSCREEN},

     * {@link android.content.pm.ActivityInfo#CONFIG_KEYBOARD

     * PackageManager.ActivityInfo.CONFIG_KEYBOARD},

     * {@link android.content.pm.ActivityInfo#CONFIG_NAVIGATION

     * PackageManager.ActivityInfo.CONFIG_NAVIGATION},

     * {@link android.content.pm.ActivityInfo#CONFIG_ORIENTATION

     * PackageManager.ActivityInfo.CONFIG_ORIENTATION},

     * {@link android.content.pm.ActivityInfo#CONFIG_SCREEN_LAYOUT

     * PackageManager.ActivityInfo.CONFIG_SCREEN_LAYOUT}, or

     * {@link android.content.pm.ActivityInfo#CONFIG_SCREEN_SIZE

     * PackageManager.ActivityInfo.CONFIG_SCREEN_SIZE}, or

     * {@link android.content.pm.ActivityInfo#CONFIG_SMALLEST_SCREEN_SIZE

     * PackageManager.ActivityInfo.CONFIG_SMALLEST_SCREEN_SIZE}.

     * {@link android.content.pm.ActivityInfo#CONFIG_LAYOUT_DIRECTION

     * PackageManager.ActivityInfo.CONFIG_LAYOUT_DIRECTION}.

     * {@link android.content.pm.ActivityInfo#CONFIG_FONT_WEIGHT_ADJUSTMENT

     *  PackageManager.ActivityInfo.CONFIG_FONT_WEIGHT_ADJUSTMENT.

     */

    public int diff(Configuration delta) {

        return diff(delta, false /* compareUndefined */, false /* publicOnly */);

        return diff(delta, false /* compareUndefined */, false /* publicOnly */);

    }

    }