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

Commit 3d49099a authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge "Hide QS header when in details" into nyc-dev 

am: 1b2e403f

* commit '1b2e403f':
  Hide QS header when in details

Change-Id: Id36ac19b4355f9f4835c748d770b9c4edc3ca159
parents 9446dc4f 1b2e403f

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

+1 −1
Original line number Diff line number Diff line
@@ -70,8 +70,8 @@ public class QSContainer extends FrameLayout { 
        super.onFinishInflate();

        mQSPanel = (QSPanel) findViewById(R.id.quick_settings_panel);

        mQSDetail = (QSDetail) findViewById(R.id.qs_detail);

        mQSDetail.setQsPanel(mQSPanel);

        mHeader = (BaseStatusBarHeader) findViewById(R.id.header);

        mQSDetail.setQsPanel(mQSPanel, mHeader);

        mQSAnimator = new QSAnimator(this, (QuickQSPanel) mHeader.findViewById(R.id.quick_qs_panel),

                mQSPanel);

        mQSCustomizer = (QSCustomizer) findViewById(R.id.qs_customize);

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

+6 −1
Original line number Diff line number Diff line
@@ -35,6 +35,7 @@ import com.android.internal.logging.MetricsLogger; 
import com.android.systemui.FontSizeUtils;

import com.android.systemui.R;

import com.android.systemui.qs.QSTile.DetailAdapter;

import com.android.systemui.statusbar.phone.BaseStatusBarHeader;

import com.android.systemui.statusbar.phone.QSTileHost;



public class QSDetail extends LinearLayout {
@@ -62,6 +63,7 @@ public class QSDetail extends LinearLayout { 
    private boolean mClosingDetail;

    private boolean mFullyExpanded;

    private View mQsDetailHeaderBack;

    private BaseStatusBarHeader mHeader;



    public QSDetail(Context context, @Nullable AttributeSet attrs) {

        super(context, attrs);
@@ -107,8 +109,9 @@ public class QSDetail extends LinearLayout { 
        mDetailDoneButton.setOnClickListener(doneListener);

    }



    public void setQsPanel(QSPanel panel) {

    public void setQsPanel(QSPanel panel, BaseStatusBarHeader header) {

        mQsPanel = panel;

        mHeader = header;

        mQsPanel.setCallback(mQsPanelCallback);

    }
@@ -195,6 +198,7 @@ public class QSDetail extends LinearLayout { 
            mClosingDetail = true;

            mDetailAdapter = null;

            listener = mTeardownDetailWhenDone;

            mHeader.setVisibility(View.VISIBLE);

            mQsPanel.setGridContentVisibility(true);

            mQsPanelCallback.onScanStateChanged(false);

        }
@@ -273,6 +277,7 @@ public class QSDetail extends LinearLayout { 
            // Only hide content if still in detail state.

            if (mDetailAdapter != null) {

                mQsPanel.setGridContentVisibility(false);

                mHeader.setVisibility(View.INVISIBLE);

            }

        }

    };