Merge "Add a Developer option of "Disable automatic update"." into nyc-dev

am: 28dfd93b14

* commit '28dfd93b1473dcc47189d1cbcda3cf6e94e6c49d':
  Add a Developer option of "Disable automatic update".
This commit is contained in:
Tao Bao
2016-02-17 20:15:26 +00:00
committed by android-build-merger
3 changed files with 33 additions and 0 deletions

View File

@@ -7005,6 +7005,9 @@
<!-- Toast message letting the user know the color temperature setting is not immediate -->
<string name="color_temperature_toast">To apply color change, turn off screen</string>
<!-- Name of the setting to disable the automatic update -->
<string name="ota_disable_automatic_update">Automatic system updates</string>
<!-- Label for category for data usage [CHAR LIMIT=30] -->
<string name="usage">Usage</string>

View File

@@ -89,6 +89,10 @@
android:title="@string/color_temperature"
android:summary="@string/color_temperature_desc" />
<SwitchPreference
android:key="ota_disable_automatic_update"
android:title="@string/ota_disable_automatic_update" />
<PreferenceCategory android:key="debug_debugging_category"
android:title="@string/debug_debugging_category">