Merge "Add summary text for "Automatic system updates" option." into pi-dev am: 06bf8a21c6

am: 08888b75f8

Change-Id: I8f7d989bad4e605bdfd756afeb873d8fc00031ea
This commit is contained in:
Tao Bao
2018-03-23 19:36:57 +00:00
committed by android-build-merger
2 changed files with 6 additions and 2 deletions

View File

@@ -8740,9 +8740,12 @@
<!-- Title for Camera laser sensor switch [CHAR LIMIT=NONE] -->
<string name="camera_laser_sensor_switch">Camera Laser Sensor</string>
<!-- Name of the setting to disable the automatic update -->
<!-- Title of the setting to disable the automatic update -->
<string name="ota_disable_automatic_update">Automatic system updates</string>
<!-- Summary for the setting to disable the automatic update -->
<string name="ota_disable_automatic_update_summary">Apply updates when device restarts</string>
<!-- Label for category for data usage [CHAR LIMIT=30] -->
<string name="usage">Usage</string>

View File

@@ -104,7 +104,8 @@
<SwitchPreference
android:key="ota_disable_automatic_update"
android:title="@string/ota_disable_automatic_update" />
android:title="@string/ota_disable_automatic_update"
android:summary="@string/ota_disable_automatic_update_summary" />
<Preference
android:key="demo_mode"