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

Commit 352eac67 authored by Jason Monk's avatar Jason Monk Committed by android-build-merger
Browse files

Merge \"QS Detail: Remove up arrow\" into nyc-mr1-dev 

am: cc6e8c46

Change-Id: Ib943c16d72ec46d053d4160ce581e7ccca7491df
parents 3ad94d29 cc6e8c46

packages/SystemUI/res/layout/battery_detail.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -25,7 +25,7 @@ 
        android:id="@+id/charge_and_estimation"

        android:id="@+id/charge_and_estimation"

        android:layout_width="match_parent"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:paddingStart="72dp"

        android:paddingStart="16dp"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:textAppearance="?android:attr/textAppearanceSmall"

        android:textColor="?android:attr/colorAccent" />

        android:textColor="?android:attr/colorAccent" />

packages/SystemUI/res/layout/qs_detail_header.xml

+1 −11
Original line number Original line Diff line number Diff line
@@ -22,19 +22,9 @@ 
    android:background="@drawable/btn_borderless_rect"

    android:background="@drawable/btn_borderless_rect"

    android:gravity="center">

    android:gravity="center">





    <ImageView

        android:id="@*android:id/up"

        android:layout_width="56dp"

        android:layout_height="56dp"

        android:layout_marginEnd="16dp"

        android:padding="16dp"

        android:clickable="true"

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

        android:contentDescription="@*android:string/action_bar_up_description"

        android:src="?android:attr/homeAsUpIndicator" />



    <TextView

    <TextView

        android:id="@android:id/title"

        android:id="@android:id/title"

        android:paddingStart="16dp"

        android:layout_width="0dp"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_weight="1"

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

+0 −3
Original line number Original line Diff line number Diff line
@@ -63,7 +63,6 @@ public class QSDetail extends LinearLayout { 
    private boolean mScanState;

    private boolean mScanState;

    private boolean mClosingDetail;

    private boolean mClosingDetail;

    private boolean mFullyExpanded;

    private boolean mFullyExpanded;

    private View mQsDetailHeaderBack;

    private BaseStatusBarHeader mHeader;

    private BaseStatusBarHeader mHeader;

    private boolean mTriggeredExpand;

    private boolean mTriggeredExpand;

    private int mOpenX;

    private int mOpenX;
@@ -92,7 +91,6 @@ public class QSDetail extends LinearLayout { 
        mDetailDoneButton = (TextView) findViewById(android.R.id.button1);

        mDetailDoneButton = (TextView) findViewById(android.R.id.button1);





        mQsDetailHeader = findViewById(R.id.qs_detail_header);

        mQsDetailHeader = findViewById(R.id.qs_detail_header);

        mQsDetailHeaderBack = mQsDetailHeader.findViewById(com.android.internal.R.id.up);

        mQsDetailHeaderTitle = (TextView) mQsDetailHeader.findViewById(android.R.id.title);

        mQsDetailHeaderTitle = (TextView) mQsDetailHeader.findViewById(android.R.id.title);

        mQsDetailHeaderSwitch = (Switch) mQsDetailHeader.findViewById(android.R.id.toggle);

        mQsDetailHeaderSwitch = (Switch) mQsDetailHeader.findViewById(android.R.id.toggle);

        mQsDetailHeaderProgress = (ImageView) findViewById(R.id.qs_detail_header_progress);

        mQsDetailHeaderProgress = (ImageView) findViewById(R.id.qs_detail_header_progress);
@@ -109,7 +107,6 @@ public class QSDetail extends LinearLayout { 
                mQsPanel.closeDetail();

                mQsPanel.closeDetail();

            }

            }

        };

        };

        mQsDetailHeaderBack.setOnClickListener(doneListener);

        mDetailDoneButton.setOnClickListener(doneListener);

        mDetailDoneButton.setOnClickListener(doneListener);

    }

    }

packages/SystemUI/src/com/android/systemui/tuner/TunerZenModePanel.java

+0 −1
Original line number Original line Diff line number Diff line
@@ -54,7 +54,6 @@ public class TunerZenModePanel extends LinearLayout implements OnClickListener { 
        mHeaderSwitch = findViewById(R.id.tuner_zen_switch);

        mHeaderSwitch = findViewById(R.id.tuner_zen_switch);

        mHeaderSwitch.setVisibility(View.VISIBLE);

        mHeaderSwitch.setVisibility(View.VISIBLE);

        mHeaderSwitch.setOnClickListener(this);

        mHeaderSwitch.setOnClickListener(this);

        mHeaderSwitch.findViewById(com.android.internal.R.id.up).setVisibility(View.GONE);

        ((TextView) mHeaderSwitch.findViewById(android.R.id.title)).setText(

        ((TextView) mHeaderSwitch.findViewById(android.R.id.title)).setText(

                R.string.quick_settings_dnd_label);

                R.string.quick_settings_dnd_label);

        mZenModePanel = (ZenModePanel) findViewById(R.id.zen_mode_panel);

        mZenModePanel = (ZenModePanel) findViewById(R.id.zen_mode_panel);