Merge "Revert "Move Automatic System Updates from Developer Options to ..."" into sc-qpr1-dev

This commit is contained in:
TreeHugger Robot
2021-09-24 05:44:36 +00:00
committed by Android (Google) Code Review
7 changed files with 190 additions and 169 deletions

View File

@@ -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" />

View File

@@ -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"