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

Commit 0bee362a authored by Nick Chameyev's avatar Nick Chameyev Committed by Automerger Merge Worker
Browse files

Merge "Rename shouldUseDefaultDeviceStateChangeTransition attribute" into... 

Merge "Rename shouldUseDefaultDeviceStateChangeTransition attribute" into sc-v2-dev am: 3d984a77 am: 020ae864

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

Change-Id: Iebfd5f462ca13ab09b49cd8b1626978ccc1605ef
parents f12c4fac 020ae864

core/api/current.txt

+2 −2
Original line number Diff line number Diff line
@@ -1303,7 +1303,7 @@ package android { 
    field public static final int shortcutLongLabel = 16844074; // 0x101052a

    field public static final int shortcutShortLabel = 16844073; // 0x1010529

    field public static final int shouldDisableView = 16843246; // 0x10101ee

    field public static final int shouldUseDefaultDeviceStateChangeTransition;

    field public static final int shouldUseDefaultDisplayStateChangeTransition;

    field public static final int showAsAction = 16843481; // 0x10102d9

    field public static final int showDefault = 16843258; // 0x10101fa

    field public static final int showDividers = 16843561; // 0x1010329
@@ -6943,7 +6943,7 @@ package android.app { 
    method public android.graphics.drawable.Drawable loadIcon(android.content.pm.PackageManager);

    method public CharSequence loadLabel(android.content.pm.PackageManager);

    method public android.graphics.drawable.Drawable loadThumbnail(android.content.pm.PackageManager);

    method public boolean shouldUseDefaultDeviceStateChangeTransition();

    method public boolean shouldUseDefaultDisplayStateChangeTransition();

    method public boolean supportsMultipleDisplays();

    method public void writeToParcel(android.os.Parcel, int);

    field @NonNull public static final android.os.Parcelable.Creator<android.app.WallpaperInfo> CREATOR;

core/java/android/app/WallpaperInfo.java

+11 −11
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ public final class WallpaperInfo implements Parcelable { 
    final int mContextDescriptionResource;

    final boolean mShowMetadataInPreview;

    final boolean mSupportsAmbientMode;

    final boolean mShouldUseDefaultDeviceStateChangeTransition;

    final boolean mShouldUseDefaultDisplayStateChangeTransition;

    final String mSettingsSliceUri;

    final boolean mSupportMultipleDisplays;
@@ -146,9 +146,9 @@ public final class WallpaperInfo implements Parcelable { 
            mSupportsAmbientMode = sa.getBoolean(

                    com.android.internal.R.styleable.Wallpaper_supportsAmbientMode,

                    false);

            mShouldUseDefaultDeviceStateChangeTransition = sa.getBoolean(

            mShouldUseDefaultDisplayStateChangeTransition = sa.getBoolean(

                    com.android.internal.R.styleable

                            .Wallpaper_shouldUseDefaultDeviceStateChangeTransition, true);

                            .Wallpaper_shouldUseDefaultDisplayStateChangeTransition, true);

            mSettingsSliceUri = sa.getString(

                    com.android.internal.R.styleable.Wallpaper_settingsSliceUri);

            mSupportMultipleDisplays = sa.getBoolean(
@@ -175,7 +175,7 @@ public final class WallpaperInfo implements Parcelable { 
        mSupportsAmbientMode = source.readInt() != 0;

        mSettingsSliceUri = source.readString();

        mSupportMultipleDisplays = source.readInt() != 0;

        mShouldUseDefaultDeviceStateChangeTransition = source.readInt() != 0;

        mShouldUseDefaultDisplayStateChangeTransition = source.readInt() != 0;

        mService = ResolveInfo.CREATOR.createFromParcel(source);

    }
@@ -400,24 +400,24 @@ public final class WallpaperInfo implements Parcelable { 


    /**

     * Returns whether this wallpaper should receive default zooming updates when the device

     * changes its state (e.g. when folding or unfolding a foldable device).

     * changes its display state (e.g. when folding or unfolding a foldable device).

     * If set to false the wallpaper will not receive zoom events when changing the device state,

     * so it can implement its own transition instead.

     * <p>

     * This corresponds to the value {@link

     * android.R.styleable#Wallpaper_shouldUseDefaultDeviceStateChangeTransition} in the

     * android.R.styleable#Wallpaper_shouldUseDefaultDisplayStateChangeTransition} in the

     * XML description of the wallpaper.

     * <p>

     * The default value is {@code true}.

     *

     * @see android.R.styleable#Wallpaper_shouldUseDefaultDeviceStateChangeTransition

     * @see android.R.styleable#Wallpaper_shouldUseDefaultDisplayStateChangeTransition

     * @return {@code true} if wallpaper should receive default device state change

     * transition updates

     *

     * @attr ref android.R.styleable#Wallpaper_shouldUseDefaultDeviceStateChangeTransition

     * @attr ref android.R.styleable#Wallpaper_shouldUseDefaultDisplayStateChangeTransition

     */

    public boolean shouldUseDefaultDeviceStateChangeTransition() {

        return mShouldUseDefaultDeviceStateChangeTransition;

    public boolean shouldUseDefaultDisplayStateChangeTransition() {

        return mShouldUseDefaultDisplayStateChangeTransition;

    }



    public void dump(Printer pw, String prefix) {
@@ -450,7 +450,7 @@ public final class WallpaperInfo implements Parcelable { 
        dest.writeInt(mSupportsAmbientMode ? 1 : 0);

        dest.writeString(mSettingsSliceUri);

        dest.writeInt(mSupportMultipleDisplays ? 1 : 0);

        dest.writeInt(mShouldUseDefaultDeviceStateChangeTransition ? 1 : 0);

        dest.writeInt(mShouldUseDefaultDisplayStateChangeTransition ? 1 : 0);

        mService.writeToParcel(dest, flags);

    }

core/res/res/values/attrs.xml

+4 −4
Original line number Diff line number Diff line
@@ -8372,8 +8372,8 @@ 
        <attr name="supportsAmbientMode" format="boolean" />















        <!-- Indicates that this wallpaper service should receive zoom transition updates when













             changing the device state (e.g. when folding or unfolding a foldable device).













             When this value is set to true













             changing the display state of the device (e.g. when folding or unfolding













             a foldable device). When this value is set to true















             {@link android.service.wallpaper.WallpaperService.Engine} could receive zoom updates















             before or after changing the device state. Wallpapers receive zoom updates using















             {@link android.service.wallpaper.WallpaperService.Engine#onZoomChanged(float)} and









@@ -8381,8 +8381,8 @@













             {@link android.service.wallpaper.WallpaperService.Engine} is created and not destroyed.















             Default value is true.















             Corresponds to













             {@link android.app.WallpaperInfo#shouldUseDefaultDeviceStateChangeTransition()} -->













        <attr name="shouldUseDefaultDeviceStateChangeTransition" format="boolean" />













             {@link android.app.WallpaperInfo#shouldUseDefaultDisplayStateChangeTransition()} -->













        <attr name="shouldUseDefaultDisplayStateChangeTransition" format="boolean" />





























        <!-- Uri that specifies a settings Slice for this wallpaper. -->















        <attr name="settingsSliceUri" format="string"/>

































core/res/res/values/public.xml



+1
−1




























Original line number
Diff line number
Diff line








@@ -3222,7 +3222,7 @@













  <eat-comment />































  <staging-public-group type="attr" first-id="0x01ff0000">













    <public name="shouldUseDefaultDeviceStateChangeTransition" />













    <public name="shouldUseDefaultDisplayStateChangeTransition" />















  </staging-public-group>































  <staging-public-group type="id" first-id="0x01fe0000">

































packages/SystemUI/src/com/android/systemui/util/WallpaperController.kt



+3
−3




























Original line number
Diff line number
Diff line








@@ -40,8 +40,8 @@ class WallpaperController @Inject constructor(private val wallpaperManager: Wall













        this.wallpaperInfo = wallpaperInfo















    }





























    private val shouldUseDefaultDeviceStateChangeTransition: Boolean













        get() = wallpaperInfo?.shouldUseDefaultDeviceStateChangeTransition()













    private val shouldUseDefaultDisplayStateChangeTransition: Boolean













        get() = wallpaperInfo?.shouldUseDefaultDisplayStateChangeTransition()















            ?: true































    fun setNotificationShadeZoom(zoomOut: Float) {









@@ -50,7 +50,7 @@ class WallpaperController @Inject constructor(private val wallpaperManager: Wall













    }































    fun setUnfoldTransitionZoom(zoomOut: Float) {













        if (shouldUseDefaultDeviceStateChangeTransition) {













        if (shouldUseDefaultDisplayStateChangeTransition) {















            unfoldTransitionZoomOut = zoomOut















            updateZoom()















        }