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

Merge "Added title and button for Data Saver\'s 1st-time dialog." into nyc-dev

Browse Source 
am: 19fa93f

* commit '19fa93f64329e52ee69d06feffc979723210edd4':
  Added title and button for Data Saver's 1st-time dialog.

Change-Id: I18c0c3c623ec60e72e394c3d3a764e76991207a9
This commit is contained in:
Felipe Leme
2016-04-22 23:34:13 +00:00
committed by android-build-merger
parent 2ab3256693 19fa93f643
commit ea13253b26
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4096,6 +4096,10 @@
<!-- [CHAR_LIMIT=NONE] Data saver: Feature description -->
<string name="data_saver_description">To help reduce data usage, Data Saver prevents some apps from sending or receiving data in the background. An app you’re currently using can access data, but may do so less frequently. This may mean, for example, that images don’t display until you tap them.</string>
<!-- [CHAR_LIMIT=30] Data saver: Title on first-time dialogFeature description -->
<string name="data_saver_enable_title">Turn on Data Saver?</string>
<!-- [CHAR_LIMIT=16] Data saver: Button to turn it on on first-time dialog -->
<string name="data_saver_enable_button">Turn on</string>
<!-- Zen mode condition - summary: time duration in minutes. [CHAR LIMIT=NONE] -->
<plurals name="zen_mode_duration_minutes_summary">

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

@@ -2102,6 +2102,8 @@
<java-symbol type="dimen" name="timepicker_text_size_inner" />
<java-symbol type="string" name="battery_saver_description" />
<java-symbol type="string" name="data_saver_description" />
<java-symbol type="string" name="data_saver_enable_title" />
<java-symbol type="string" name="data_saver_enable_button" />
<java-symbol type="string" name="zen_mode_forever" />
<java-symbol type="string" name="zen_mode_forever_dnd" />
<java-symbol type="string" name="zen_mode_rule_name_combination" />