From 5f83c85182f11a5d9f30ab4eb408a36b386e45ee Mon Sep 17 00:00:00 2001 From: Julia Reynolds Date: Wed, 15 Jun 2016 12:53:31 -0400 Subject: [PATCH] Show volume row headers by default. Bug: 28269951 Change-Id: I26acfb26064e7f44e4b1897d940228247b45d7b1 --- .../SystemUI/res/layout/volume_dialog.xml | 10 ++-- .../SystemUI/res/layout/volume_dialog_row.xml | 56 +++++++++---------- packages/SystemUI/res/values/dimens.xml | 13 +++++ packages/SystemUI/res/values/strings.xml | 10 ++-- .../android/systemui/volume/VolumeDialog.java | 27 ++++----- .../volume/VolumeDialogComponent.java | 1 - .../android/systemui/volume/VolumePrefs.java | 2 +- 7 files changed, 61 insertions(+), 58 deletions(-) diff --git a/packages/SystemUI/res/layout/volume_dialog.xml b/packages/SystemUI/res/layout/volume_dialog.xml index d3f2a25a64363..68395cd698900 100644 --- a/packages/SystemUI/res/layout/volume_dialog.xml +++ b/packages/SystemUI/res/layout/volume_dialog.xml @@ -20,16 +20,14 @@ android:layout_height="wrap_content" android:layout_marginBottom="@dimen/volume_dialog_margin_bottom" android:background="@drawable/volume_dialog_background" - android:translationZ="4dp" - android:paddingTop="8dp"> + android:translationZ="4dp" > @@ -52,6 +50,8 @@ android:src="@drawable/ic_volume_collapse_animation" tools:ignore="RtlHardcoded" android:layout_alignParentEnd="true" - android:layout_alignParentTop="true"/> + android:layout_alignParentTop="true" + android:layout_marginTop="@dimen/volume_expander_margin_top" + android:layout_marginEnd="@dimen/volume_expander_margin_end"/> diff --git a/packages/SystemUI/res/layout/volume_dialog_row.xml b/packages/SystemUI/res/layout/volume_dialog_row.xml index be05a3ac259ce..a30fc4356a51f 100644 --- a/packages/SystemUI/res/layout/volume_dialog_row.xml +++ b/packages/SystemUI/res/layout/volume_dialog_row.xml @@ -13,14 +13,16 @@ See the License for the specific language governing permissions and limitations under the License. --> - + android:paddingEnd="@dimen/volume_dialog_padding_end" + android:orientation="vertical" + android:paddingBottom="@dimen/volume_row_padding_bottom" > + android:paddingStart="@dimen/volume_row_header_padding_start" /> - + + - + + - \ No newline at end of file + \ No newline at end of file diff --git a/packages/SystemUI/res/values/dimens.xml b/packages/SystemUI/res/values/dimens.xml index eef57171db41c..0365e800f34aa 100644 --- a/packages/SystemUI/res/values/dimens.xml +++ b/packages/SystemUI/res/values/dimens.xml @@ -535,6 +535,19 @@ 4dp + 8dp + 22dp + 40dp + + 9.4dp + 4dp + 16dp + 64dp + 48dp + 12dp + + 2dp + 6dp 4dp diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml index f7a169cb4d5b6..e358cea77ea17 100644 --- a/packages/SystemUI/res/values/strings.xml +++ b/packages/SystemUI/res/values/strings.xml @@ -1093,14 +1093,14 @@ You\'re using your work profile - - Voice calls + + Call System - Notifications + Ring Media - Alarms + Alarm - Bluetooth calls + Bluetooth diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java index 5b558a6cbb5f8..af6fec2f6274a 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java @@ -563,6 +563,14 @@ public class VolumeDialog implements TunerService.Tunable { if (!mExpanded && mExpandButtonAnimationRunning) { prepareForCollapse(); } + final Resources res = mContext.getResources(); + int paddingTop = mExpanded + ? res.getDimensionPixelSize(R.dimen.volume_dialog_expanded_padding_top) + : res.getDimensionPixelSize(R.dimen.volume_dialog_collapsed_padding_top); + mDialogContentView.setPaddingRelative(mDialogContentView.getPaddingStart(), + paddingTop, + mDialogContentView.getPaddingEnd(), + mDialogContentView.getPaddingBottom()); updateRowsH(); if (mExpandButtonAnimationRunning) { final Drawable d = mExpandButton.getDrawable(); @@ -623,7 +631,6 @@ public class VolumeDialog implements TunerService.Tunable { Util.setVisOrGone(row.view, visible); Util.setVisOrGone(row.space, visible && mExpanded); updateVolumeRowHeaderVisibleH(row); - row.header.setAlpha(mExpanded && isActive ? 1 : 0.5f); updateVolumeRowSliderTintH(row, isActive); } } @@ -741,21 +748,7 @@ public class VolumeDialog implements TunerService.Tunable { updateVolumeRowHeaderVisibleH(row); // update header text - String text = ss.name; - if (mShowHeaders) { - if (isRingZenNone) { - text = mContext.getString(R.string.volume_stream_muted_dnd, ss.name); - } else if (isRingVibrate && isRingLimited) { - text = mContext.getString(R.string.volume_stream_vibrate_dnd, ss.name); - } else if (isRingVibrate) { - text = mContext.getString(R.string.volume_stream_vibrate, ss.name); - } else if (ss.muted || mAutomute && ss.level == 0) { - text = mContext.getString(R.string.volume_stream_muted, ss.name); - } else if (isRingLimited) { - text = mContext.getString(R.string.volume_stream_limited_dnd, ss.name); - } - } - Util.setText(row.header, text); + Util.setText(row.header, ss.name); // update icon final boolean iconEnabled = (mAutomute || ss.muteSupported) && !zenMuted; @@ -824,7 +817,7 @@ public class VolumeDialog implements TunerService.Tunable { private void updateVolumeRowHeaderVisibleH(VolumeRow row) { final boolean dynamic = row.ss != null && row.ss.dynamic; - final boolean showHeaders = mShowHeaders || mExpanded && dynamic; + final boolean showHeaders = mExpanded && (mShowHeaders || dynamic); if (row.cachedShowHeaders != showHeaders) { row.cachedShowHeaders = showHeaders; Util.setVisOrGone(row.header, showHeaders); diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java index 3d338098fc2df..44a435e61acc6 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumeDialogComponent.java @@ -122,7 +122,6 @@ public class VolumeDialogComponent implements VolumeComponent, TunerService.Tuna private void applyConfiguration() { mDialog.setStreamImportant(AudioManager.STREAM_ALARM, true); mDialog.setStreamImportant(AudioManager.STREAM_SYSTEM, false); - mDialog.setShowHeaders(false); mDialog.setAutomute(true); mDialog.setSilentMode(false); mController.setVolumePolicy(mVolumePolicy); diff --git a/packages/SystemUI/src/com/android/systemui/volume/VolumePrefs.java b/packages/SystemUI/src/com/android/systemui/volume/VolumePrefs.java index bbb70ed6bf47a..04339eb8e8028 100644 --- a/packages/SystemUI/src/com/android/systemui/volume/VolumePrefs.java +++ b/packages/SystemUI/src/com/android/systemui/volume/VolumePrefs.java @@ -43,7 +43,7 @@ public class VolumePrefs { public static final String PREF_ADJUST_ALARMS = "pref_adjust_alarms"; public static final String PREF_ADJUST_NOTIFICATION = "pref_adjust_notification"; - public static final boolean DEFAULT_SHOW_HEADERS = false; + public static final boolean DEFAULT_SHOW_HEADERS = true; public static final boolean DEFAULT_ENABLE_AUTOMUTE = true; public static final boolean DEFAULT_ENABLE_SILENT_MODE = true;