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

Commit 8fd95a73 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "QS: Only allow clicking in the expand button" into nyc-dev am: 05ceda5c 

am: 483c65d1

* commit '483c65d1':
  QS: Only allow clicking in the expand button

Change-Id: I7d046196349cc3016af63d850ca0112b0dae040a
parents 7a9091c7 483c65d1

packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml

+4 −3
Original line number Diff line number Diff line
@@ -26,9 +26,6 @@ 
    android:clipChildren="false"

    android:clipToPadding="false"

    android:baselineAligned="false"

    android:background="@drawable/quick_header_bg"

    android:clickable="true"

    android:focusable="true"

    >



    <LinearLayout
@@ -83,6 +80,10 @@ 
            android:id="@+id/expand_indicator"

            android:layout_width="48dp"

            android:layout_height="48dp"

            android:clipToPadding="false"

            android:clickable="true"

            android:focusable="true"

            android:background="?android:attr/selectableItemBackgroundBorderless"

            android:padding="12dp" />



    </LinearLayout>

packages/SystemUI/src/com/android/systemui/qs/QSContainer.java

+8 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ import android.animation.Animator; 
import android.animation.AnimatorListenerAdapter;

import android.content.Context;

import android.graphics.Point;

import android.graphics.Rect;

import android.util.AttributeSet;

import android.util.Log;

import android.view.View;
@@ -43,6 +44,7 @@ public class QSContainer extends FrameLayout { 
    private static final boolean DEBUG = false;



    private final Point mSizePoint = new Point();

    private final Rect mQsBounds = new Rect();



    private int mHeightOverride = -1;

    private QSPanel mQSPanel;
@@ -226,6 +228,12 @@ public class QSContainer extends FrameLayout { 
        mQSDetail.setFullyExpanded(expansion == 1);

        mQSAnimator.setPosition(expansion);

        updateBottom();



        // Set bounds on the QS panel so it doesn't run over the header.

        mQsBounds.top = (int) (mQSPanel.getHeight() * (1 - expansion));

        mQsBounds.right = mQSPanel.getWidth();

        mQsBounds.bottom = mQSPanel.getHeight();

        mQSPanel.setClipBounds(mQsBounds);

    }



    public void animateHeaderSlidingIn(long delay) {

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

+3 −2
Original line number Diff line number Diff line
@@ -225,7 +225,8 @@ public class NotificationPanelView extends PanelView implements 
            public void onInflated(View v) {

                mQsContainer = (QSContainer) v.findViewById(R.id.quick_settings_container);

                mQsContainer.setPanelView(NotificationPanelView.this);

                mQsContainer.getHeader().setOnClickListener(NotificationPanelView.this);

                mQsContainer.getHeader().findViewById(R.id.expand_indicator)

                        .setOnClickListener(NotificationPanelView.this);

            }

        });

        mClockView = (TextView) findViewById(R.id.clock_view);
@@ -1760,7 +1761,7 @@ public class NotificationPanelView extends PanelView implements 


    @Override

    public void onClick(View v) {

        if (v == mQsContainer.getHeader()) {

        if (v.getId() == R.id.expand_indicator) {

            onQsExpansionStarted();

            if (mQsExpanded) {

                flingSettings(0 /* vel */, false /* expand */, null, true /* isClick */);

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

+0 −1
Original line number Diff line number Diff line
@@ -124,7 +124,6 @@ public class QuickStatusBarHeader extends BaseStatusBarHeader implements 


        // RenderThread is doing more harm than good when touching the header (to expand quick

        // settings), so disable it for this view

        ((RippleDrawable) getBackground()).setForceSoftware(true);

        ((RippleDrawable) mSettingsButton.getBackground()).setForceSoftware(true);



        updateResources();