OSDN Git Service

Move logic for FR in demo mode out of Settings
authorChristine Franks <christyfranks@google.com>
Fri, 23 Jun 2017 21:28:21 +0000 (14:28 -0700)
committerChristine Franks <christyfranks@google.com>
Fri, 21 Jul 2017 19:19:19 +0000 (19:19 +0000)
commitc6890ab6c51185ff39d9cbdf48b04d14518b9a27
treefea411875282694e8646fbb7978be1f11d4fa8fc
parent50ac1cebc3e8541f81c768e2dccfae63fbc8dfae
Move logic for FR in demo mode out of Settings

Bug: 62712426
Test: make \
ROBOTEST_FILTER="(MasterClearTest|FactoryResetPreferenceControllerTest
|UtilsTest)" \
RunSettingsRoboTests -j100
Change-Id: I5e287c3d4a6a7050bda78187c52aec19e90b50bc
src/com/android/settings/MasterClear.java
src/com/android/settings/MasterClearConfirm.java
src/com/android/settings/Utils.java
src/com/android/settings/system/FactoryResetPreferenceController.java
src/com/android/settings/widget/CarrierDemoPasswordDialogFragment.java [deleted file]
tests/robotests/src/com/android/settings/MasterClearTest.java
tests/robotests/src/com/android/settings/UtilsTest.java
tests/robotests/src/com/android/settings/system/FactoryResetPreferenceControllerTest.java
tests/robotests/src/com/android/settings/testutils/shadow/ShadowUtils.java