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

Commit 5fad843b authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Removed the notification scroller top stack" into nyc-dev 

am: 9e37a70c

* commit '9e37a70c':
  Removed the notification scroller top stack
parents 93742161 9e37a70c

packages/SystemUI/res/values/dimens.xml

+0 −6
Original line number Original line Diff line number Diff line
@@ -282,9 +282,6 @@ 
    <!-- The padding between freeform workspace tasks -->

    <!-- The padding between freeform workspace tasks -->

    <dimen name="recents_freeform_workspace_task_padding">8dp</dimen>

    <dimen name="recents_freeform_workspace_task_padding">8dp</dimen>





    <!-- Space reserved for the cards behind the top card in the top stack -->

    <dimen name="top_stack_peek_amount">12dp</dimen>



    <!-- Space reserved for the cards behind the top card in the bottom stack -->

    <!-- Space reserved for the cards behind the top card in the bottom stack -->

    <dimen name="bottom_stack_peek_amount">12dp</dimen>

    <dimen name="bottom_stack_peek_amount">12dp</dimen>
@@ -295,9 +292,6 @@ 
    <!-- The height of the area before the bottom stack in which the notifications slow down -->

    <!-- The height of the area before the bottom stack in which the notifications slow down -->

    <dimen name="bottom_stack_slow_down_length">12dp</dimen>

    <dimen name="bottom_stack_slow_down_length">12dp</dimen>





    <!-- The height of the area before the top stack in which the notifications slow down -->

    <dimen name="top_stack_slow_down_length">12dp</dimen>



    <!-- Z distance between notifications if they are in the stack -->

    <!-- Z distance between notifications if they are in the stack -->

    <dimen name="z_distance_between_notifications">0.5dp</dimen>

    <dimen name="z_distance_between_notifications">0.5dp</dimen>

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -947,6 +947,10 @@ public class ExpandableNotificationRow extends ActivatableNotificationView { 
        }

        }

    }

    }





    public boolean mustStayOnScreen() {

        return mIsHeadsUp;

    }



    private void updateClearability() {

    private void updateClearability() {

        // public versions cannot be dismissed

        // public versions cannot be dismissed

        mVetoButton.setVisibility(isClearable() && !mShowingPublic ? View.VISIBLE : View.GONE);

        mVetoButton.setVisibility(isClearable() && !mShowingPublic ? View.VISIBLE : View.GONE);

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

+4 −0
Original line number Original line Diff line number Diff line
@@ -399,6 +399,10 @@ public abstract class ExpandableView extends FrameLayout { 
        return false;

        return false;

    }

    }





    public boolean mustStayOnScreen() {

        return false;

    }



    /**

    /**

     * A listener notifying when {@link #getActualHeight} changes.

     * A listener notifying when {@link #getActualHeight} changes.

     */

     */

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -79,7 +79,8 @@ public class HeadsUpTouchHelper implements Gefingerpoken { 
                mTouchingHeadsUpView = false;

                mTouchingHeadsUpView = false;

                if (child instanceof ExpandableNotificationRow) {

                if (child instanceof ExpandableNotificationRow) {

                    mPickedChild = (ExpandableNotificationRow) child;

                    mPickedChild = (ExpandableNotificationRow) child;

                    mTouchingHeadsUpView = mPickedChild.isHeadsUp() && mPickedChild.isPinned();

                    mTouchingHeadsUpView = !mStackScroller.isExpanded()

                            && mPickedChild.isHeadsUp() && mPickedChild.isPinned();

                }

                }

                break;

                break;

            case MotionEvent.ACTION_POINTER_UP:

            case MotionEvent.ACTION_POINTER_UP:

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -519,7 +519,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode, 
     */

     */

    protected boolean mStartedGoingToSleep;

    protected boolean mStartedGoingToSleep;





    private static final int VISIBLE_LOCATIONS = StackViewState.LOCATION_FIRST_CARD

    private static final int VISIBLE_LOCATIONS = StackViewState.LOCATION_FIRST_HUN

            | StackViewState.LOCATION_MAIN_AREA;

            | StackViewState.LOCATION_MAIN_AREA;





    private final OnChildLocationsChangedListener mNotificationLocationsChangedListener =

    private final OnChildLocationsChangedListener mNotificationLocationsChangedListener =