Wentao Wang f11e1666bf Merge "Separate the demo user factory reset option with admin user factory reset option." into udc-qpr-dev am: 38f12abb75 am: 0d3ae3ed32 ...

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24677431

Change-Id: Ie89643b620ee82e4f30ab98ca466f54bd68b8067
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

2023-09-13 13:53:24 +00:00

..

AdditionalSystemUpdatePreferenceController.java

Establish permanently unavailable settings

2018-05-09 08:36:59 -07:00

FactoryResetDemoUserPreferenceController.java

Separate the demo user factory reset option with admin user factory reset option.

2023-09-13 11:47:11 +00:00

FactoryResetPreferenceController.java

Separate the demo user factory reset option with admin user factory reset option.

2023-09-13 11:47:11 +00:00

ResetDashboardFragment.java

Separate the demo user factory reset option with admin user factory reset option.

2023-09-13 11:47:11 +00:00

ResetPreferenceController.java

Separate the demo user factory reset option with admin user factory reset option.

2023-09-13 11:47:11 +00:00

SystemDashboardFragment.java

Clean up AwareFeatureProvider from Settings

2023-06-25 16:52:34 +08:00

SystemUpdatePreferenceController.java

Use Build.VERSION.RELEASE_OR_PREVIEW_DISPLAY for user visible versions

2022-02-28 18:03:23 -08:00