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

am ef70f8e4: Merge "Volume: Show row headers for cast streams." into mnc-dev

Browse Source 
* commit 'ef70f8e426d3414ea9b66c07b15330631a466ed5':
  Volume: Show row headers for cast streams.
This commit is contained in:
John Spurlock
2015-06-10 17:31:53 +00:00
committed by Android Git Automerger
parent 299cd16bf4 ef70f8e426
commit 479b03862f
3 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/res/layout/volume_dialog_row.xml
View File

@@ -22,15 +22,15 @@
<TextView
android:id="@+id/volume_row_header"
style="?android:attr/textAppearanceButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:ellipsize="end"
android:maxLines="1"
android:textAppearance="@style/TextAppearance.Volume.Header"
android:paddingBottom="0dp"
android:paddingEnd="12dp"
android:paddingStart="13dp"
android:paddingTop="8dp" />
android:paddingStart="12dp"
android:paddingTop="4dp" />
<com.android.keyguard.AlphaOptimizedImageButton
android:id="@+id/volume_row_icon"

5
packages/SystemUI/res/values/styles.xml
View File

@@ -275,6 +275,11 @@
<item name="android:fontFamily">sans-serif</item>
</style>
<style name="TextAppearance.Volume.Header">
<item name="android:textSize">12sp</item>
<item name="android:textColor">@color/volume_slider_inactive</item>
</style>
<style name="TextAppearance.Volume.ZenSummary">
<item name="android:textSize">14sp</item>
<item name="android:fontFamily">sans-serif-medium</item>

41
packages/SystemUI/src/com/android/systemui/volume/VolumeDialog.java
View File

@@ -524,6 +524,7 @@ public class VolumeDialog {
}
}
Util.setVisOrInvis(row.settingsButton, false);
updateVolumeRowHeaderVisibleH(row);
row.header.setAlpha(mExpanded && isActive ? 1 : 0.5f);
updateVolumeRowSliderTintH(row, isActive);
}
@@ -606,25 +607,22 @@ public class VolumeDialog {
}
// update header visible
if (row.cachedShowHeaders != mShowHeaders) {
row.cachedShowHeaders = mShowHeaders;
Util.setVisOrGone(row.header, mShowHeaders);
}
updateVolumeRowHeaderVisibleH(row);
// update header text
final String text;
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);
} else {
text = ss.name;
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);
@@ -663,6 +661,15 @@ public class VolumeDialog {
updateVolumeRowSliderH(row, enableSlider, vlevel);
}
private void updateVolumeRowHeaderVisibleH(VolumeRow row) {
final boolean dynamic = row.ss != null && row.ss.dynamic;
final boolean showHeaders = mShowHeaders || mExpanded && dynamic;
if (row.cachedShowHeaders != showHeaders) {
row.cachedShowHeaders = showHeaders;
Util.setVisOrGone(row.header, showHeaders);
}
}
private void updateVolumeRowSliderTintH(VolumeRow row, boolean isActive) {
final ColorStateList tint = isActive && row.slider.isEnabled() ? mActiveSliderTint
: mInactiveSliderTint;