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

Commit 6f770566 authored by Jason Monk's avatar Jason Monk
Browse files

Fix up QS edit UI 

Turns out QS Edit mode didn't like the changes to dual target tiles.
Clean this up a bit.

Test: visual
Change-Id: I158fe8dba6729de102cfc592314ec483a969417d
parent 089efe43

packages/SystemUI/res/layout/qs_tile_label.xml

+17 −1
Original line number Diff line number Diff line
@@ -17,7 +17,8 @@ 
<RelativeLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="48dp"

    android:layout_height="wrap_content"

    android:minHeight="48dp"

    android:paddingTop="8dp">

    <LinearLayout

        android:id="@+id/label_group"
@@ -55,6 +56,21 @@ 
            android:visibility="gone" />

    </LinearLayout>



    <TextView

        android:id="@+id/app_label"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignStart="@id/label_group"

        android:layout_alignEnd="@id/label_group"

        android:layout_below="@id/label_group"

        android:clickable="false"

        android:maxLines="1"

        android:padding="0dp"

        android:visibility="gone"

        android:gravity="center"

        android:textAppearance="@style/TextAppearance.QS.TileLabel"

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



    <View

        android:id="@+id/underline"

        android:layout_width="30dp"

packages/SystemUI/src/com/android/systemui/qs/customize/CustomizeTileView.java

+1 −7
Original line number Diff line number Diff line
@@ -35,19 +35,13 @@ public class CustomizeTileView extends QSTileView { 
    protected void createLabel() {

        super.createLabel();

        mLabelMinLines = mLabel.getMinLines();

        View view = LayoutInflater.from(mContext).inflate(R.layout.qs_tile_label, null);

        mAppLabel = (TextView) view.findViewById(R.id.tile_label);

        mAppLabel = findViewById(R.id.app_label);

        mAppLabel.setAlpha(.6f);

        mAppLabel.setSingleLine(true);

        addView(view);

    }



    public void setShowAppLabel(boolean showAppLabel) {

        mAppLabel.setVisibility(showAppLabel ? View.VISIBLE : View.GONE);

        mLabel.setSingleLine(showAppLabel);

        if (!showAppLabel) {

            mLabel.setMinLines(mLabelMinLines);

        }

    }



    public void setAppLabel(CharSequence label) {

packages/SystemUI/src/com/android/systemui/qs/customize/TileQueryHelper.java

+1 −0
Original line number Diff line number Diff line
@@ -165,6 +165,7 @@ public class TileQueryHelper { 
        }

        TileInfo info = new TileInfo();

        info.state = state;

        info.state.dualTarget = false; // No dual targets in edit.

        info.state.expandedAccessibilityClassName =

                Button.class.getName();

        info.spec = spec;