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

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

Merge "Fix QS header touch targets" into oc-dev

parents 0c78e823 7b3d4e4d

packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml

+3 −6
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
    android:clickable="false"

    android:clipChildren="false"

    android:clipToPadding="false"

    android:paddingBottom="48dp"

    android:paddingTop="0dp"

    android:paddingEnd="0dp"

    android:paddingStart="0dp">
@@ -83,10 +82,9 @@ 
    <com.android.systemui.qs.QuickQSPanel

        android:id="@+id/quick_qs_panel"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_height="48dp"

        android:layout_alignParentEnd="true"

        android:layout_marginTop="36dp"

        android:layout_marginBottom="8dp"

        android:layout_marginTop="31dp"

        android:layout_alignParentTop="true"

        android:accessibilityTraversalAfter="@+id/date_time_group"

        android:accessibilityTraversalBefore="@id/expand_indicator"
@@ -95,8 +93,7 @@ 
        android:layout_marginStart="8dp"

        android:layout_marginEnd="8dp"

        android:focusable="true"

        android:importantForAccessibility="yes"

        android:paddingTop="0dp"/>

        android:importantForAccessibility="yes" />



    <com.android.systemui.statusbar.AlphaOptimizedImageView

        android:id="@+id/qs_detail_header_progress"

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

+10 −0
Original line number Diff line number Diff line
@@ -58,6 +58,16 @@ public class QSContainerImpl extends FrameLayout { 
        mBackground = findViewById(R.id.qs_background);

        mGutterHeight = getContext().getResources().getDimensionPixelSize(R.dimen.qs_gutter_height);

        mFullElevation = mQSPanel.getElevation();



        setClickable(true);

        setImportantForAccessibility(IMPORTANT_FOR_ACCESSIBILITY_NO);

    }



    @Override

    public boolean performClick() {

        // Want to receive clicks so missing QQS tiles doesn't cause collapse, but

        // don't want to do anything with them.

        return true;

    }



    @Override

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

+6 −0
Original line number Diff line number Diff line
@@ -60,6 +60,12 @@ public class QuickQSPanel extends QSPanel { 
        mTileLayout = new HeaderTileLayout(context);

        mTileLayout.setListening(mListening);

        addView((View) mTileLayout, 0 /* Between brightness and footer */);

        super.setPadding(0, 0, 0, 0);

    }



    @Override

    public void setPadding(int left, int top, int right, int bottom) {

        // Always have no padding.

    }



    @Override