Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2017-05-30 23:36:45 +00:00
committed by Android (Google) Code Review
parent 0c78e8238d 7b3d4e4db1
commit 17e512528f
3 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml
View File

@@ -29,7 +29,6 @@
android:clickable="false" android:clickable="false"
android:clipChildren="false" android:clipChildren="false"
android:clipToPadding="false" android:clipToPadding="false"
android:paddingBottom="48dp"
android:paddingTop="0dp" android:paddingTop="0dp"
android:paddingEnd="0dp" android:paddingEnd="0dp"
android:paddingStart="0dp"> android:paddingStart="0dp">
@@ -83,10 +82,9 @@
<com.android.systemui.qs.QuickQSPanel <com.android.systemui.qs.QuickQSPanel
android:id="@+id/quick_qs_panel" android:id="@+id/quick_qs_panel"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="48dp"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_marginTop="36dp" android:layout_marginTop="31dp"
android:layout_marginBottom="8dp"
android:layout_alignParentTop="true" android:layout_alignParentTop="true"
android:accessibilityTraversalAfter="@+id/date_time_group" android:accessibilityTraversalAfter="@+id/date_time_group"
android:accessibilityTraversalBefore="@id/expand_indicator" android:accessibilityTraversalBefore="@id/expand_indicator"
@@ -95,8 +93,7 @@
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:focusable="true" android:focusable="true"
android:importantForAccessibility="yes" android:importantForAccessibility="yes" />
android:paddingTop="0dp"/>
<com.android.systemui.statusbar.AlphaOptimizedImageView <com.android.systemui.statusbar.AlphaOptimizedImageView
android:id="@+id/qs_detail_header_progress" android:id="@+id/qs_detail_header_progress"

10
packages/SystemUI/src/com/android/systemui/qs/QSContainerImpl.java
View File

@@ -58,6 +58,16 @@ public class QSContainerImpl extends FrameLayout {
mBackground = findViewById(R.id.qs_background); mBackground = findViewById(R.id.qs_background);
mGutterHeight = getContext().getResources().getDimensionPixelSize(R.dimen.qs_gutter_height); mGutterHeight = getContext().getResources().getDimensionPixelSize(R.dimen.qs_gutter_height);
mFullElevation = mQSPanel.getElevation(); 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 @Override

6
packages/SystemUI/src/com/android/systemui/qs/QuickQSPanel.java
View File

@@ -60,6 +60,12 @@ public class QuickQSPanel extends QSPanel {
mTileLayout = new HeaderTileLayout(context); mTileLayout = new HeaderTileLayout(context);
mTileLayout.setListening(mListening); mTileLayout.setListening(mListening);
addView((View) mTileLayout, 0 /* Between brightness and footer */); 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 @Override