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

am 8fe10b4b: Merge "Volume: Move "Muted by" string from sysui to frameworks." into lmp-mr1-dev

Browse Source 
* commit '8fe10b4b04447d997179604ead942fd4bbd5eef2':
  Volume: Move "Muted by" string from sysui to frameworks.
This commit is contained in:
John Spurlock
2014-11-14 21:44:52 +00:00
committed by Android Git Automerger
parent adb5defbd9 8fe10b4b04
commit 8f84f62d1f
4 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values/strings.xml
View File

@@ -5118,4 +5118,7 @@
<!-- Zen mode condition - line one: until next alarm. [CHAR LIMIT=NONE] -->
<string name="zen_mode_next_alarm_line_one">Until next alarm</string>
<!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] -->
<string name="muted_by">Muted by <xliff:g id="third_party">%1$s</xliff:g></string>
</resources>

1
core/res/res/values/symbols.xml
View File

@@ -1994,6 +1994,7 @@
<java-symbol type="string" name="zen_mode_next_alarm_summary" />
<java-symbol type="string" name="zen_mode_next_alarm_line_one" />
<java-symbol type="integer" name="config_next_alarm_condition_lookahead_threshold_hrs" />
<java-symbol type="string" name="muted_by" />
<java-symbol type="string" name="item_is_selected" />
<java-symbol type="string" name="day_of_week_label_typeface" />

3
packages/SystemUI/res/values/strings.xml
View File

@@ -894,9 +894,6 @@
<!-- continue action for notification educating the user about enabling notifications on the lockscreen. [CHAR LIMIT=20] -->
<string name="hidden_notifications_setup">Set up</string>
<!-- Indication that the current volume and other effects (vibration) are being suppressed by a third party, such as a notification listener. [CHAR LIMIT=30] -->
<string name="muted_by">Muted by <xliff:g id="third_party">%1$s</xliff:g></string>
<!-- Accessibility string for current zen mode and selected exit condition. A template that simply concatenates existing mode string and the current condition description. [CHAR LIMIT=20] -->
<string name="zen_mode_and_condition"><xliff:g id="zen_mode" example="Priority interruptions only">%1$s</xliff:g>. <xliff:g id="exit_condition" example="For one hour">%2$s</xliff:g></string>

2
packages/SystemUI/src/com/android/systemui/volume/VolumePanel.java
View File

@@ -744,7 +744,7 @@ public class VolumePanel extends Handler implements DemoMode {
} else {
sc.seekbarView.setVisibility(View.GONE);
sc.suppressorView.setVisibility(View.VISIBLE);
sc.suppressorView.setText(mContext.getString(com.android.systemui.R.string.muted_by,
sc.suppressorView.setText(mContext.getString(R.string.muted_by,
getSuppressorCaption(suppressor)));
sc.icon.setImageResource(sc.iconSuppressedRes);
}