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

Volume dialog mulit-streams have 8dp padding

Browse Source 
Change-Id: I1539580e2d848521638b50c10bd51c18ff415268
Fixes: 79353898
Test: visual inspection with multi-stream and dnd
This commit is contained in:
Beverly
2018-05-08 11:16:02 -04:00
parent 4b7853ec5f
commit 6cb4cafd96
4 changed files with 13 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
packages/SystemUI/res/layout/volume_dialog.xml
View File

@@ -53,7 +53,11 @@
android:layout_gravity="center"
android:soundEffectsEnabled="false" />
<include layout="@layout/volume_dnd_icon"/>
<include layout="@layout/volume_dnd_icon"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginRight="@dimen/volume_dialog_stream_padding"
android:layout_marginTop="6dp"/>
</FrameLayout>
<LinearLayout
@@ -71,7 +75,9 @@
android:layout_height="wrap_content"
android:minWidth="@dimen/volume_dialog_panel_width"
android:gravity="center"
android:orientation="horizontal" >
android:orientation="horizontal"
android:paddingRight="@dimen/volume_dialog_stream_padding"
android:paddingLeft="@dimen/volume_dialog_stream_padding">
<!-- volume rows added and removed here! :-) -->
</LinearLayout>
<FrameLayout

7
packages/SystemUI/res/layout/volume_dnd_icon.xml
View File

@@ -17,14 +17,13 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/dnd_icon"
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_height="wrap_content"
android:layout_marginTop="6dp">
<ImageView
android:layout_width="14dp"
android:layout_height="14dp"
android:layout_marginTop="6dp"
android:layout_marginRight="6dp"
android:layout_gravity="right|top"
android:src="@drawable/ic_dnd"
android:tint="?android:attr/textColorTertiary"/>
</FrameLayout>
</FrameLayout>

2
packages/SystemUI/res/values/dimens.xml
View File

@@ -296,6 +296,8 @@
<dimen name="volume_dialog_panel_transparent_padding">20dp</dimen>
<dimen name="volume_dialog_stream_padding">8dp</dimen>
<!-- the amount the volume panel should be offset at the end from the view next to it (or
the screen edge, in portrait-->
<dimen name="volume_dialog_base_margin">8dp</dimen>

20
packages/SystemUI/src/com/android/systemui/volume/VolumeDialogImpl.java
View File

@@ -695,26 +695,6 @@ public class VolumeDialogImpl implements VolumeDialog {
private void enableVolumeRowViewsH(VolumeRow row, boolean enable) {
boolean showDndIcon = !enable;
row.dndIcon.setVisibility(showDndIcon ? VISIBLE : GONE);
if (showDndIcon && getNumVisibleRows() == 1) {
row.dndIcon.setLayoutParams(new FrameLayout.LayoutParams(
mContext.getResources().getDimensionPixelSize(
R.dimen.volume_dialog_panel_width),
FrameLayout.LayoutParams.WRAP_CONTENT));
} else if (row.view.getVisibility() == VISIBLE) {
row.dndIcon.setLayoutParams(new FrameLayout.LayoutParams(
FrameLayout.LayoutParams.MATCH_PARENT, FrameLayout.LayoutParams.WRAP_CONTENT));
}
}
private int getNumVisibleRows() {
int count = 0;
for (int i = 0; i < mRows.size(); i++) {
if (mRows.get(i).view.getVisibility() == VISIBLE) {
count++;
}
}
return count;
}
/**