8febbd4ae4aae1e8f916661cf7db44f00ad978f5 - platform/packages/apps/Car/Settings

commit	8febbd4ae4aae1e8f916661cf7db44f00ad978f5	[log] [tgz]
author	davidln <davidln@google.com>	Thu Oct 18 17:42:35 2018 -0700
committer	davidln <davidln@google.com>	Thu Oct 18 17:47:10 2018 -0700
tree	253d7671e33b5a8f20fefdfd781180d57576d91a
parent	3743d4d47fd4cbb9ffd16549837e725261cef4c3 [diff]

Extend NoSetupPreferenceController in reset options controllers.

Missed in ag/5269952. Also using the opportunity to rename to a format more consistent with existing "top level" controllers.

Bug: 117336753

Test: build and deploy, RunCarSettingsRoboTests
Change-Id: I65ba05e2265504ab628ee3b4650f149ccb464b98

res/xml/reset_options_fragment.xml[diff]
src/com/android/car/settings/system/MasterClearEntryPreferenceController.java[Renamed from src/com/android/car/settings/system/FactoryResetPreferenceController.java - diff]
src/com/android/car/settings/system/ResetNetworkEntryPreferenceController.java[Renamed from src/com/android/car/settings/system/NetworkResetPreferenceController.java - diff]
tests/robotests/src/com/android/car/settings/system/MasterClearEntryPreferenceControllerTest.java[Renamed from tests/robotests/src/com/android/car/settings/system/FactoryResetPreferenceControllerTest.java - diff]
tests/robotests/src/com/android/car/settings/system/ResetNetworkEntryPreferenceControllerTest.java[Renamed from tests/robotests/src/com/android/car/settings/system/NetworkResetPreferenceControllerTest.java - diff]

5 files changed

tree: 253d7671e33b5a8f20fefdfd781180d57576d91a