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

Commit 9fc75e89 authored by Fiona Campbell's avatar Fiona Campbell Committed by Automerger Merge Worker
Browse files

Merge changes I36ea0ffc,I1f3797c5,I01aeeedd into tm-qpr-dev am: a01ccaae am: 477064e5 

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



Change-Id: If73108977792457238cab50ae67ed62e66e89096
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2374dd80 477064e5

core/java/android/view/WindowManager.java

+8 −0
Original line number Original line Diff line number Diff line
@@ -1054,6 +1054,14 @@ public interface WindowManager extends ViewManager { 
        }

        }

    }

    }





    /**

     * Ensure scales are between 0 and 20.

     * @hide

     */

    static float fixScale(float scale) {

        return Math.max(Math.min(scale, 20), 0);

    }



    public static class LayoutParams extends ViewGroup.LayoutParams implements Parcelable {

    public static class LayoutParams extends ViewGroup.LayoutParams implements Parcelable {

        /**

        /**

         * X position for this window.  With the default gravity it is ignored.

         * X position for this window.  With the default gravity it is ignored.

core/java/com/android/internal/view/inline/InlineTooltipUi.java

+2 −2
Original line number Original line Diff line number Diff line
@@ -170,9 +170,9 @@ public final class InlineTooltipUi extends PopupWindow implements AutoCloseable 




            int delayTimeMs = mShowDelayConfigMs;

            int delayTimeMs = mShowDelayConfigMs;

            try {

            try {

                final float scale = Settings.Global.getFloat(

                final float scale = WindowManager.fixScale(Settings.Global.getFloat(

                        anchor.getContext().getContentResolver(),

                        anchor.getContext().getContentResolver(),

                        Settings.Global.ANIMATOR_DURATION_SCALE);

                        Settings.Global.ANIMATOR_DURATION_SCALE));

                delayTimeMs *= scale;

                delayTimeMs *= scale;

            } catch (Settings.SettingNotFoundException e) {

            } catch (Settings.SettingNotFoundException e) {

                // do nothing

                // do nothing

libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentAnimationSpec.java

+9 −7
Original line number Original line Diff line number Diff line
@@ -26,6 +26,7 @@ import android.graphics.Rect; 
import android.os.Handler;

import android.os.Handler;

import android.provider.Settings;

import android.provider.Settings;

import android.view.RemoteAnimationTarget;

import android.view.RemoteAnimationTarget;

import android.view.WindowManager;

import android.view.animation.AlphaAnimation;

import android.view.animation.AlphaAnimation;

import android.view.animation.Animation;

import android.view.animation.Animation;

import android.view.animation.AnimationSet;

import android.view.animation.AnimationSet;
@@ -68,10 +69,7 @@ class TaskFragmentAnimationSpec { 




        // The transition animation should be adjusted based on the developer option.

        // The transition animation should be adjusted based on the developer option.

        final ContentResolver resolver = mContext.getContentResolver();

        final ContentResolver resolver = mContext.getContentResolver();

        mTransitionAnimationScaleSetting = Settings.Global.getFloat(resolver,

        mTransitionAnimationScaleSetting = getTransitionAnimationScaleSetting();

                Settings.Global.TRANSITION_ANIMATION_SCALE,

                mContext.getResources().getFloat(

                        R.dimen.config_appTransitionAnimationDurationScaleDefault));

        resolver.registerContentObserver(

        resolver.registerContentObserver(

                Settings.Global.getUriFor(Settings.Global.TRANSITION_ANIMATION_SCALE), false,

                Settings.Global.getUriFor(Settings.Global.TRANSITION_ANIMATION_SCALE), false,

                new SettingsObserver(handler));

                new SettingsObserver(handler));
@@ -223,6 +221,12 @@ class TaskFragmentAnimationSpec { 
        return animation;

        return animation;

    }

    }





    private float getTransitionAnimationScaleSetting() {

        return WindowManager.fixScale(Settings.Global.getFloat(mContext.getContentResolver(),

                Settings.Global.TRANSITION_ANIMATION_SCALE, mContext.getResources().getFloat(

                                R.dimen.config_appTransitionAnimationDurationScaleDefault)));

    }



    private class SettingsObserver extends ContentObserver {

    private class SettingsObserver extends ContentObserver {

        SettingsObserver(@NonNull Handler handler) {

        SettingsObserver(@NonNull Handler handler) {

            super(handler);

            super(handler);
@@ -230,9 +234,7 @@ class TaskFragmentAnimationSpec { 




        @Override

        @Override

        public void onChange(boolean selfChange) {

        public void onChange(boolean selfChange) {

            mTransitionAnimationScaleSetting = Settings.Global.getFloat(

            mTransitionAnimationScaleSetting = getTransitionAnimationScaleSetting();

                    mContext.getContentResolver(), Settings.Global.TRANSITION_ANIMATION_SCALE,

                    mTransitionAnimationScaleSetting);

        }

        }

    }

    }

}
 
}

libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java

+9 −7
Original line number Original line Diff line number Diff line
@@ -23,6 +23,7 @@ import static android.view.WindowManager.TRANSIT_KEYGUARD_GOING_AWAY; 
import static android.view.WindowManager.TRANSIT_OPEN;

import static android.view.WindowManager.TRANSIT_OPEN;

import static android.view.WindowManager.TRANSIT_TO_BACK;

import static android.view.WindowManager.TRANSIT_TO_BACK;

import static android.view.WindowManager.TRANSIT_TO_FRONT;

import static android.view.WindowManager.TRANSIT_TO_FRONT;

import static android.view.WindowManager.fixScale;

import static android.window.TransitionInfo.FLAG_IS_INPUT_METHOD;

import static android.window.TransitionInfo.FLAG_IS_INPUT_METHOD;

import static android.window.TransitionInfo.FLAG_IS_WALLPAPER;

import static android.window.TransitionInfo.FLAG_IS_WALLPAPER;

import static android.window.TransitionInfo.FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT;

import static android.window.TransitionInfo.FLAG_STARTING_WINDOW_TRANSFER_RECIPIENT;
@@ -167,10 +168,7 @@ public class Transitions implements RemoteCallable<Transitions> { 
        ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "addHandler: Remote");

        ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS, "addHandler: Remote");





        ContentResolver resolver = mContext.getContentResolver();

        ContentResolver resolver = mContext.getContentResolver();

        mTransitionAnimationScaleSetting = Settings.Global.getFloat(resolver,

        mTransitionAnimationScaleSetting = getTransitionAnimationScaleSetting();

                Settings.Global.TRANSITION_ANIMATION_SCALE,

                mContext.getResources().getFloat(

                        R.dimen.config_appTransitionAnimationDurationScaleDefault));

        dispatchAnimScaleSetting(mTransitionAnimationScaleSetting);

        dispatchAnimScaleSetting(mTransitionAnimationScaleSetting);





        resolver.registerContentObserver(

        resolver.registerContentObserver(
@@ -185,6 +183,12 @@ public class Transitions implements RemoteCallable<Transitions> { 
        }

        }

    }

    }





    private float getTransitionAnimationScaleSetting() {

        return fixScale(Settings.Global.getFloat(mContext.getContentResolver(),

                Settings.Global.TRANSITION_ANIMATION_SCALE, mContext.getResources().getFloat(

                                R.dimen.config_appTransitionAnimationDurationScaleDefault)));

    }



    public ShellTransitions asRemoteTransitions() {

    public ShellTransitions asRemoteTransitions() {

        return mImpl;

        return mImpl;

    }

    }
@@ -963,9 +967,7 @@ public class Transitions implements RemoteCallable<Transitions> { 
        @Override

        @Override

        public void onChange(boolean selfChange) {

        public void onChange(boolean selfChange) {

            super.onChange(selfChange);

            super.onChange(selfChange);

            mTransitionAnimationScaleSetting = Settings.Global.getFloat(

            mTransitionAnimationScaleSetting = getTransitionAnimationScaleSetting();

                    mContext.getContentResolver(), Settings.Global.TRANSITION_ANIMATION_SCALE,

                    mTransitionAnimationScaleSetting);





            mMainExecutor.execute(() -> dispatchAnimScaleSetting(mTransitionAnimationScaleSetting));

            mMainExecutor.execute(() -> dispatchAnimScaleSetting(mTransitionAnimationScaleSetting));

        }

        }

packages/SystemUI/src/com/android/systemui/statusbar/phone/UnlockedScreenOffAnimationController.kt

+3 −2
Original line number Original line Diff line number Diff line
@@ -10,6 +10,7 @@ import android.os.PowerManager 
import android.provider.Settings

import android.provider.Settings

import android.view.Surface

import android.view.Surface

import android.view.View

import android.view.View

import android.view.WindowManager.fixScale

import com.android.internal.jank.InteractionJankMonitor

import com.android.internal.jank.InteractionJankMonitor

import com.android.internal.jank.InteractionJankMonitor.CUJ_SCREEN_OFF

import com.android.internal.jank.InteractionJankMonitor.CUJ_SCREEN_OFF

import com.android.internal.jank.InteractionJankMonitor.CUJ_SCREEN_OFF_SHOW_AOD

import com.android.internal.jank.InteractionJankMonitor.CUJ_SCREEN_OFF_SHOW_AOD
@@ -138,8 +139,8 @@ class UnlockedScreenOffAnimationController @Inject constructor( 
    }

    }





    fun updateAnimatorDurationScale() {

    fun updateAnimatorDurationScale() {

        animatorDurationScale =

        animatorDurationScale = fixScale(

                globalSettings.getFloat(Settings.Global.ANIMATOR_DURATION_SCALE, 1f)

                globalSettings.getFloat(Settings.Global.ANIMATOR_DURATION_SCALE, 1f))

    }

    }





    override fun shouldDelayKeyguardShow(): Boolean =

    override fun shouldDelayKeyguardShow(): Boolean =