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

Commit 9f7c624a authored by Selim Cinek's avatar Selim Cinek Committed by Android Git Automerger
Browse files

am 634a15af: Merge "Fixed a racecondition which could lead to invisible... 

am 634a15af: Merge "Fixed a racecondition which could lead to invisible backgrounds" into lmp-preview-dev

* commit '634a15aff1d106ae549984e26113f734c016760d':
  Fixed a racecondition which could lead to invisible backgrounds
parents 1a762874 bbd2909d

packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java

+17 −9
Original line number Diff line number Diff line
@@ -158,7 +158,7 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView 
    private final Runnable mTapTimeoutRunnable = new Runnable() {

        @Override

        public void run() {

            makeInactive();

            makeInactive(true /* animate */);

        }

    };
@@ -183,7 +183,7 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView 
                break;

            case MotionEvent.ACTION_MOVE:

                if (!isWithinTouchSlop(event)) {

                    makeInactive();

                    makeInactive(true /* animate */);

                    return false;

                }

                break;
@@ -193,14 +193,17 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView 
                        makeActive();

                        postDelayed(mTapTimeoutRunnable, DOUBLETAP_TIMEOUT_MS);

                    } else {

                        performClick();

                        boolean performed = performClick();

                        if (performed) {

                            removeCallbacks(mTapTimeoutRunnable);

                        }

                    }

                } else {

                    makeInactive();

                    makeInactive(true /* animate */);

                }

                break;

            case MotionEvent.ACTION_CANCEL:

                makeInactive();

                makeInactive(true /* animate */);

                break;

            default:

                break;
@@ -257,10 +260,14 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView 
    /**

     * Cancels the hotspot and makes the notification inactive.

     */

    private void makeInactive() {

    public void makeInactive(boolean animate) {

        if (mActivated) {

            if (mDimmed) {

                if (animate) {

                    startActivateAnimation(true /* reverse */);

                } else {

                    mBackgroundNormal.setVisibility(View.INVISIBLE);

                }

            }

            mActivated = false;

        }
@@ -351,6 +358,7 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView 
            mBackgroundDimmed.setVisibility(View.INVISIBLE);

            mBackgroundNormal.setVisibility(View.VISIBLE);

            mBackgroundNormal.setAlpha(1f);

            removeCallbacks(mTapTimeoutRunnable);

        }

    }
@@ -581,7 +589,7 @@ public abstract class ActivatableNotificationView extends ExpandableOutlineView 
    }



    public interface OnActivatedListener {

        void onActivated(View view);

        void onActivationReset(View view);

        void onActivated(ActivatableNotificationView view);

        void onActivationReset(ActivatableNotificationView view);

    }

}

packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java

+12 −3
Original line number Diff line number Diff line
@@ -103,6 +103,7 @@ import com.android.systemui.keyguard.KeyguardViewMediator; 
import com.android.systemui.qs.CircularClipper;

import com.android.systemui.qs.QSPanel;

import com.android.systemui.qs.QSTile;

import com.android.systemui.statusbar.ActivatableNotificationView;

import com.android.systemui.statusbar.BaseStatusBar;

import com.android.systemui.statusbar.CommandQueue;

import com.android.systemui.statusbar.DragDownHelper;
@@ -2905,7 +2906,6 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
            mNotificationPanel.setKeyguardShowing(false);

            mScrimController.setKeyguardShowing(false);

        }



        updateStackScrollerState();

        updatePublicMode();

        updateNotifications();
@@ -2921,6 +2921,11 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
                ? View.INVISIBLE : View.VISIBLE);

        mStackScroller.setScrollingEnabled(!onKeyguard);

        mStackScroller.setExpandingEnabled(!onKeyguard);

        ActivatableNotificationView activatedChild = mStackScroller.getActivatedChild();

        mStackScroller.setActivatedChild(null);

        if (activatedChild != null) {

            activatedChild.makeInactive(false /* animate */);

        }

    }



    public void userActivity() {
@@ -2977,9 +2982,13 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    }



    @Override

    public void onActivated(View view) {

    public void onActivated(ActivatableNotificationView view) {

        userActivity();

        mKeyguardIndicationController.showTransientIndication(R.string.notification_tap_again);

        ActivatableNotificationView previousView = mStackScroller.getActivatedChild();

        if (previousView != null) {

            previousView.makeInactive(true /* animate */);

        }

        mStackScroller.setActivatedChild(view);

    }
@@ -2992,7 +3001,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
    }



    @Override

    public void onActivationReset(View view) {

    public void onActivationReset(ActivatableNotificationView view) {

        if (view == mStackScroller.getActivatedChild()) {

            mKeyguardIndicationController.hideTransientIndication();

            mStackScroller.setActivatedChild(null);

packages/SystemUI/src/com/android/systemui/statusbar/stack/AmbientState.java

+4 −3
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.systemui.statusbar.stack;



import android.view.View;

import com.android.systemui.statusbar.ActivatableNotificationView;



import java.util.ArrayList;
@@ -27,7 +28,7 @@ public class AmbientState { 
    private ArrayList<View> mDraggedViews = new ArrayList<View>();

    private int mScrollY;

    private boolean mDimmed;

    private View mActivatedChild;

    private ActivatableNotificationView mActivatedChild;

    private float mOverScrollTopAmount;

    private float mOverScrollBottomAmount;

    private int mSpeedBumpIndex = -1;
@@ -64,7 +65,7 @@ public class AmbientState { 
     * In dimmed mode, a child can be activated, which happens on the first tap of the double-tap

     * interaction. This child is then scaled normally and its background is fully opaque.

     */

    public void setActivatedChild(View activatedChild) {

    public void setActivatedChild(ActivatableNotificationView activatedChild) {

        mActivatedChild = activatedChild;

    }
@@ -72,7 +73,7 @@ public class AmbientState { 
        return mDimmed;

    }



    public View getActivatedChild() {

    public ActivatableNotificationView getActivatedChild() {

        return mActivatedChild;

    }

packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java

+3 −2
Original line number Diff line number Diff line
@@ -33,6 +33,7 @@ import android.widget.OverScroller; 
import com.android.systemui.ExpandHelper;

import com.android.systemui.R;

import com.android.systemui.SwipeHelper;

import com.android.systemui.statusbar.ActivatableNotificationView;

import com.android.systemui.statusbar.ExpandableNotificationRow;

import com.android.systemui.statusbar.ExpandableView;

import com.android.systemui.statusbar.SpeedBumpView;
@@ -1760,7 +1761,7 @@ public class NotificationStackScrollLayout extends ViewGroup 
    /**

     * See {@link AmbientState#setActivatedChild}.

     */

    public void setActivatedChild(View activatedChild) {

    public void setActivatedChild(ActivatableNotificationView activatedChild) {

        mAmbientState.setActivatedChild(activatedChild);

        if (mAnimationsEnabled) {

            mActivateNeedsAnimation = true;
@@ -1769,7 +1770,7 @@ public class NotificationStackScrollLayout extends ViewGroup 
        requestChildrenUpdate();

    }



    public View getActivatedChild() {

    public ActivatableNotificationView getActivatedChild() {

        return mAmbientState.getActivatedChild();

    }

packages/SystemUI/src/com/android/systemui/statusbar/tv/TvStatusBar.java

+3 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@ 
package com.android.systemui.statusbar.tv;



import android.os.IBinder;

import android.service.notification.NotificationListenerService;

import android.service.notification.NotificationListenerService.Ranking;

import android.service.notification.StatusBarNotification;

import android.view.View;
@@ -25,6 +24,7 @@ import android.view.ViewGroup.LayoutParams; 
import android.view.WindowManager;



import com.android.internal.statusbar.StatusBarIcon;

import com.android.systemui.statusbar.ActivatableNotificationView;

import com.android.systemui.statusbar.BaseStatusBar;



/*
@@ -164,10 +164,10 @@ public class TvStatusBar extends BaseStatusBar { 
    }



    @Override

    public void onActivated(View view) {

    public void onActivated(ActivatableNotificationView view) {

    }



    @Override

    public void onActivationReset(View view) {

    public void onActivationReset(ActivatableNotificationView view) {

    }

}