Merge "Revert "Move Automatic System Updates from Developer Options to ..."" into sc-qpr1-dev
This commit is contained in:
committed by
Android (Google) Code Review
commit
cc1cc9a5f7
@@ -109,6 +109,11 @@
|
||||
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"
|
||||
android:summary="@string/ota_disable_automatic_update_summary" />
|
||||
|
||||
<Preference android:key="dsu_loader"
|
||||
android:title="@string/dsu_loader_title" />
|
||||
|
||||
|
@@ -65,14 +65,6 @@
|
||||
<intent android:action="android.settings.SYSTEM_UPDATE_SETTINGS"/>
|
||||
</Preference>
|
||||
|
||||
<SwitchPreference
|
||||
android:key="ota_disable_automatic_update"
|
||||
android:title="@string/ota_disable_automatic_update"
|
||||
android:summary="@string/ota_disable_automatic_update_summary"
|
||||
android:icon="@drawable/ic_system_update"
|
||||
android:order="-57"
|
||||
settings:controller="com.android.settings.system.DisableAutomaticUpdatesPreferenceController"/>
|
||||
|
||||
<Preference
|
||||
android:key="reset_dashboard"
|
||||
android:title="@string/reset_dashboard_title"
|
||||
|
Reference in New Issue
Block a user