PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Data Saver Mode phrasing tweaks." into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-04-13 23:36:28 +00:00
committed by Android (Google) Code Review
parent 40c2e7adcf 1e890cb8f7
commit 6a41da8e9a
2 changed files with 15 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
res/values/strings.xml
View File

@@ -7194,7 +7194,7 @@
<string name="network_restrictions">Network restrictions</string> <string name="network_restrictions">Network restrictions</string>
<!-- A summary shown on data usage screens to indicate inaccuracy of data tracking [CHAR LIMIT=NONE] --> <!-- A summary shown on data usage screens to indicate inaccuracy of data tracking [CHAR LIMIT=NONE] -->
<string name="operator_warning">Operator data accounting may differ from your device.</string> <string name="operator_warning">Carrier data accounting may differ from device accounting</string>
<!-- Format string describing how much data has been used [CHAR LIMIT=20] --> <!-- Format string describing how much data has been used [CHAR LIMIT=20] -->
<string name="data_used_template"><xliff:g name="amount" example="1 GB">%1$s</xliff:g> used</string> <string name="data_used_template"><xliff:g name="amount" example="1 GB">%1$s</xliff:g> used</string>
@@ -7218,22 +7218,22 @@
the code to do that --> the code to do that -->
<string name="data_usage_other_apps" translatable="false">Other apps included in usage</string> <string name="data_usage_other_apps" translatable="false">Other apps included in usage</string>
<!-- Description of number of apps allowed to ignore data saver [CHAR LIMIT=NONE] --> <!-- Description of number of apps allowed to ignore Data Saver [CHAR LIMIT=NONE] -->
<plurals name="data_saver_unrestricted_summary"> <plurals name="data_saver_unrestricted_summary">
<item quantity="one">1 app allowed to use unrestricted data when Data Saver is on</item> <item quantity="one">1 app allowed to use unrestricted data when Data Saver is on</item>
<item quantity="other"><xliff:g id="count" example="10">%1$d</xliff:g> apps allowed to use unrestricted data when Data Saver is on</item> <item quantity="other"><xliff:g id="count" example="10">%1$d</xliff:g> apps allowed to use unrestricted data when Data Saver is on</item>
</plurals> </plurals>
<!-- Name of Data Saver screens [CHAR LIMIT=30] --> <!-- Name of Data Saver screens [CHAR LIMIT=30] -->
<string name="data_saver_title">Data Saver</string> <string name="data_saver_title">Data saver</string>
<!-- Button that leads to list of apps with unrestricted data access [CHAR LIMIT=60] --> <!-- Button that leads to list of apps with unrestricted data access [CHAR LIMIT=60] -->
<string name="unrestricted_data_saver">Unrestricted data access</string> <string name="unrestricted_data_saver">Unrestricted data access</string>
<!-- Summary for the data saver feature being on [CHAR LIMIT=NONE] --> <!-- Summary for the Data Saver feature being on [CHAR LIMIT=NONE] -->
<string name="data_saver_on">On</string> <string name="data_saver_on">On</string>
<!-- Summary for the data saver feature being off [CHAR LIMIT=NONE] --> <!-- Summary for the Data Saver feature being off [CHAR LIMIT=NONE] -->
<string name="data_saver_off">Off</string> <string name="data_saver_off">Off</string>
<!-- Title for switch to allow app unrestricted data usage [CHAR LIMIT=30] --> <!-- Title for switch to allow app unrestricted data usage [CHAR LIMIT=30] -->

9
res/xml/data_saver.xml
View File

@@ -15,6 +15,7 @@
--> -->
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/data_saver_title"> android:title="@string/data_saver_title">
<Preference <Preference
@@ -22,4 +23,12 @@
android:title="@string/unrestricted_data_saver" android:title="@string/unrestricted_data_saver"
android:fragment="com.android.settings.datausage.UnrestrictedDataAccess" /> android:fragment="com.android.settings.datausage.UnrestrictedDataAccess" />
<!-- Feature description text -->
<com.android.settings.fuelgauge.WallOfTextPreference
android:key="description"
android:summary="@*android:string/data_saver_description"
android:persistent="false"
android:selectable="false"
settings:allowDividerAbove="true" />
</PreferenceScreen> </PreferenceScreen>