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

Commit 05c1c7a8 authored by android-build-team Robot's avatar android-build-team Robot
Browse files

Merge cherrypicks of [8738218, 8738219, 8738140, 8736270, 8736271, 8736272,... 

Merge cherrypicks of [8738218, 8738219, 8738140, 8736270, 8736271, 8736272, 8732114, 8738495, 8738319, 8736743, 8738320, 8738496] into qt-release

Change-Id: I479905f5a00d08a1db761bbf2c45c729ff241363
parents a6ef24ed 18345182

packages/SystemUI/plugin/src/com/android/systemui/plugins/FalsingManager.java

+3 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ import java.io.PrintWriter; 
 */

@ProvidesInterface(version = FalsingManager.VERSION)

public interface FalsingManager {

    int VERSION = 1;

    int VERSION = 2;



    void onSucccessfulUnlock();
@@ -103,4 +103,6 @@ public interface FalsingManager { 
    void onTouchEvent(MotionEvent ev, int width, int height);



    void dump(PrintWriter pw);



    void cleanup();

}

packages/SystemUI/src/com/android/keyguard/KeyguardClockSwitch.java

+6 −0
Original line number Diff line number Diff line
@@ -540,6 +540,9 @@ public class KeyguardClockSwitch extends RelativeLayout { 
        @Override

        public Animator onAppear(ViewGroup sceneRoot, View view, TransitionValues startValues,

                TransitionValues endValues) {

            if (!sceneRoot.isShown()) {

                return null;

            }

            final float cutoff = mCutoff;

            final int startVisibility = View.INVISIBLE;

            final int endVisibility = (int) endValues.values.get(PROPNAME_VISIBILITY);
@@ -552,6 +555,9 @@ public class KeyguardClockSwitch extends RelativeLayout { 
        @Override

        public Animator onDisappear(ViewGroup sceneRoot, View view, TransitionValues startValues,

                TransitionValues endValues) {

            if (!sceneRoot.isShown()) {

                return null;

            }

            final float cutoff = 1f - mCutoff;

            final int startVisibility = View.VISIBLE;

            final int endVisibility = (int) endValues.values.get(PROPNAME_VISIBILITY);

packages/SystemUI/src/com/android/keyguard/KeyguardSliceView.java

+41 −25
Original line number Diff line number Diff line
@@ -89,6 +89,7 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe 
    private final HashMap<View, PendingIntent> mClickActions;

    private final ActivityStarter mActivityStarter;

    private final ConfigurationController mConfigurationController;

    private final LayoutTransition mLayoutTransition;

    private Uri mKeyguardSliceUri;

    @VisibleForTesting

    TextView mTitle;
@@ -126,16 +127,16 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe 
        mActivityStarter = activityStarter;

        mConfigurationController = configurationController;



        LayoutTransition transition = new LayoutTransition();

        transition.setStagger(LayoutTransition.CHANGE_APPEARING, DEFAULT_ANIM_DURATION / 2);

        transition.setDuration(LayoutTransition.APPEARING, DEFAULT_ANIM_DURATION);

        transition.setDuration(LayoutTransition.DISAPPEARING, DEFAULT_ANIM_DURATION / 2);

        transition.disableTransitionType(LayoutTransition.CHANGE_APPEARING);

        transition.disableTransitionType(LayoutTransition.CHANGE_DISAPPEARING);

        transition.setInterpolator(LayoutTransition.APPEARING, Interpolators.FAST_OUT_SLOW_IN);

        transition.setInterpolator(LayoutTransition.DISAPPEARING, Interpolators.ALPHA_OUT);

        transition.setAnimateParentHierarchy(false);

        setLayoutTransition(transition);

        mLayoutTransition = new LayoutTransition();

        mLayoutTransition.setStagger(LayoutTransition.CHANGE_APPEARING, DEFAULT_ANIM_DURATION / 2);

        mLayoutTransition.setDuration(LayoutTransition.APPEARING, DEFAULT_ANIM_DURATION);

        mLayoutTransition.setDuration(LayoutTransition.DISAPPEARING, DEFAULT_ANIM_DURATION / 2);

        mLayoutTransition.disableTransitionType(LayoutTransition.CHANGE_APPEARING);

        mLayoutTransition.disableTransitionType(LayoutTransition.CHANGE_DISAPPEARING);

        mLayoutTransition.setInterpolator(LayoutTransition.APPEARING,

                Interpolators.FAST_OUT_SLOW_IN);

        mLayoutTransition.setInterpolator(LayoutTransition.DISAPPEARING, Interpolators.ALPHA_OUT);

        mLayoutTransition.setAnimateParentHierarchy(false);

    }



    @Override
@@ -174,6 +175,12 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe 
        mConfigurationController.removeCallback(this);

    }



    @Override

    public void onVisibilityAggregated(boolean isVisible) {

        super.onVisibilityAggregated(isVisible);

        setLayoutTransition(isVisible ? mLayoutTransition : null);

    }



    /**

     * Returns whether the current visible slice has a title/header.

     */
@@ -419,6 +426,7 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe 
         * their desired positions.

         */

        private final Animation.AnimationListener mKeepAwakeListener;

        private LayoutTransition mLayoutTransition;

        private float mDarkAmount;



        public Row(Context context) {
@@ -440,33 +448,41 @@ public class KeyguardSliceView extends LinearLayout implements View.OnClickListe 


        @Override

        protected void onFinishInflate() {

            LayoutTransition transition = new LayoutTransition();

            transition.setDuration(DEFAULT_ANIM_DURATION);

            mLayoutTransition = new LayoutTransition();

            mLayoutTransition.setDuration(DEFAULT_ANIM_DURATION);



            PropertyValuesHolder left = PropertyValuesHolder.ofInt("left", 0, 1);

            PropertyValuesHolder right = PropertyValuesHolder.ofInt("right", 0, 1);

            ObjectAnimator changeAnimator = ObjectAnimator.ofPropertyValuesHolder((Object) null,

                    left, right);

            transition.setAnimator(LayoutTransition.CHANGE_APPEARING, changeAnimator);

            transition.setAnimator(LayoutTransition.CHANGE_DISAPPEARING, changeAnimator);

            transition.setInterpolator(LayoutTransition.CHANGE_APPEARING,

            mLayoutTransition.setAnimator(LayoutTransition.CHANGE_APPEARING, changeAnimator);

            mLayoutTransition.setAnimator(LayoutTransition.CHANGE_DISAPPEARING, changeAnimator);

            mLayoutTransition.setInterpolator(LayoutTransition.CHANGE_APPEARING,

                    Interpolators.ACCELERATE_DECELERATE);

            transition.setInterpolator(LayoutTransition.CHANGE_DISAPPEARING,

            mLayoutTransition.setInterpolator(LayoutTransition.CHANGE_DISAPPEARING,

                    Interpolators.ACCELERATE_DECELERATE);

            transition.setStartDelay(LayoutTransition.CHANGE_APPEARING, DEFAULT_ANIM_DURATION);

            transition.setStartDelay(LayoutTransition.CHANGE_DISAPPEARING, DEFAULT_ANIM_DURATION);

            mLayoutTransition.setStartDelay(LayoutTransition.CHANGE_APPEARING,

                    DEFAULT_ANIM_DURATION);

            mLayoutTransition.setStartDelay(LayoutTransition.CHANGE_DISAPPEARING,

                    DEFAULT_ANIM_DURATION);



            ObjectAnimator appearAnimator = ObjectAnimator.ofFloat(null, "alpha", 0f, 1f);

            transition.setAnimator(LayoutTransition.APPEARING, appearAnimator);

            transition.setInterpolator(LayoutTransition.APPEARING, Interpolators.ALPHA_IN);

            mLayoutTransition.setAnimator(LayoutTransition.APPEARING, appearAnimator);

            mLayoutTransition.setInterpolator(LayoutTransition.APPEARING, Interpolators.ALPHA_IN);



            ObjectAnimator disappearAnimator = ObjectAnimator.ofFloat(null, "alpha", 1f, 0f);

            transition.setInterpolator(LayoutTransition.DISAPPEARING, Interpolators.ALPHA_OUT);

            transition.setDuration(LayoutTransition.DISAPPEARING, DEFAULT_ANIM_DURATION / 4);

            transition.setAnimator(LayoutTransition.DISAPPEARING, disappearAnimator);

            mLayoutTransition.setInterpolator(LayoutTransition.DISAPPEARING,

                    Interpolators.ALPHA_OUT);

            mLayoutTransition.setDuration(LayoutTransition.DISAPPEARING, DEFAULT_ANIM_DURATION / 4);

            mLayoutTransition.setAnimator(LayoutTransition.DISAPPEARING, disappearAnimator);



            transition.setAnimateParentHierarchy(false);

            setLayoutTransition(transition);

            mLayoutTransition.setAnimateParentHierarchy(false);

        }



        @Override

        public void onVisibilityAggregated(boolean isVisible) {

            super.onVisibilityAggregated(isVisible);

            setLayoutTransition(isVisible ? mLayoutTransition : null);

        }



        @Override

packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerImpl.java

+9 −0
Original line number Diff line number Diff line
@@ -168,6 +168,7 @@ public class FalsingManagerImpl implements FalsingManager { 
                    .append("enabled=").append(isEnabled() ? 1 : 0)

                    .append(" mScreenOn=").append(mScreenOn ? 1 : 0)

                    .append(" mState=").append(StatusBarState.toShortString(mState))

                    .append(" mShowingAod=").append(mShowingAod ? 1 : 0)

                    .toString()

            );

        }
@@ -550,6 +551,14 @@ public class FalsingManagerImpl implements FalsingManager { 
        pw.println();

    }



    @Override

    public void cleanup() {

        mSensorManager.unregisterListener(mSensorEventListener);

        mContext.getContentResolver().unregisterContentObserver(mSettingsObserver);

        Dependency.get(StatusBarStateController.class).removeCallback(mStatusBarStateListener);

        KeyguardUpdateMonitor.getInstance(mContext).removeCallback(mKeyguardUpdateCallback);

    }



    public Uri reportRejectedTouch() {

        if (mDataCollector.isEnabled()) {

            return mDataCollector.reportRejectedTouch();

packages/SystemUI/src/com/android/systemui/classifier/FalsingManagerProxy.java

+9 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ public class FalsingManagerProxy implements FalsingManager { 
            public void onPluginConnected(FalsingPlugin plugin, Context context) {

                FalsingManager pluginFalsingManager = plugin.getFalsingManager(context);

                if (pluginFalsingManager != null) {

                    mInternalFalsingManager.cleanup();

                    mInternalFalsingManager = pluginFalsingManager;

                }

            }
@@ -92,6 +93,9 @@ public class FalsingManagerProxy implements FalsingManager { 
    public void setupFalsingManager(Context context) {

        boolean brightlineEnabled = DeviceConfig.getBoolean(

                DeviceConfig.NAMESPACE_SYSTEMUI, BRIGHTLINE_FALSING_MANAGER_ENABLED, true);

        if (mInternalFalsingManager != null) {

            mInternalFalsingManager.cleanup();

        }

        if (!brightlineEnabled) {

            mInternalFalsingManager = new FalsingManagerImpl(context);

        } else {
@@ -290,4 +294,9 @@ public class FalsingManagerProxy implements FalsingManager { 
    public void dump(PrintWriter pw) {

        mInternalFalsingManager.dump(pw);

    }



    @Override

    public void cleanup() {

        mInternalFalsingManager.cleanup();

    }

}