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

Commit 1ae60649 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "resolve merge conflicts of 352eac67 to master"

parents b4c51cf0 416addc9

packages/SystemUI/res/layout/battery_detail.xml

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

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:paddingStart="72dp"

        android:paddingStart="16dp"

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

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

packages/SystemUI/res/layout/qs_detail_header.xml

+1 −12
Original line number Diff line number Diff line
@@ -25,20 +25,9 @@ 
    android:background="@drawable/btn_borderless_rect"

    android:gravity="center">



    <ImageView

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

        android:layout_width="@dimen/qs_detail_image_width"

        android:layout_height="@dimen/qs_detail_image_height"

        android:layout_marginEnd="@dimen/qs_detail_back_margin_end"

        android:padding="@dimen/qs_detail_image_padding"

        android:clickable="true"

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

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

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



    <TextView

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

        android:paddingLeft="@dimen/qs_detail_header_text_padding"

        android:paddingStart="@dimen/qs_detail_header_text_padding"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

packages/SystemUI/res/values/dimens.xml

+1 −1
Original line number Diff line number Diff line
@@ -212,7 +212,7 @@ 
    <dimen name="qs_detail_empty_text_size">14sp</dimen>

    <dimen name="qs_detail_margin_top">28dp</dimen>

    <dimen name="qs_detail_back_margin_end">16dp</dimen>

    <dimen name="qs_detail_header_text_padding">0dp</dimen>

    <dimen name="qs_detail_header_text_padding">16dp</dimen>

    <dimen name="qs_data_usage_text_size">14sp</dimen>

    <dimen name="qs_data_usage_usage_text_size">36sp</dimen>

    <dimen name="qs_battery_padding">2dp</dimen>

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

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

    private boolean mClosingDetail;

    private boolean mFullyExpanded;

    protected View mQsDetailHeaderBack;

    private BaseStatusBarHeader mHeader;

    private boolean mTriggeredExpand;

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



        mQsDetailHeader = findViewById(R.id.qs_detail_header);

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

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

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

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

            }

        };

        mQsDetailHeaderBack.setOnClickListener(doneListener);

        mDetailDoneButton.setOnClickListener(doneListener);

    }

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

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

        mHeaderSwitch.setVisibility(View.VISIBLE);

        mHeaderSwitch.setOnClickListener(this);

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

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

                R.string.quick_settings_dnd_label);

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