From 7d73a29e2863782c60c83dbedb042c882e7f060b Mon Sep 17 00:00:00 2001 From: Doris Ling Date: Tue, 21 Jun 2016 18:08:22 -0700 Subject: [PATCH] Make MasterClear a valid entry fragment. Add FactoryResetActivity that maps to MasterClear fragment, and add MasterClear to SettingsActivity's ENTRY_FRAGMENTS so that the factory data reset fragment can be launched from activity alias. Bug: 29405129 Change-Id: I8eca6b857987792da8d8678d33e6ab9d4e10793a --- src/com/android/settings/Settings.java | 1 + src/com/android/settings/SettingsActivity.java | 1 + 2 files changed, 2 insertions(+) diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index 2e8d3993c6f..3036bd18564 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -77,6 +77,7 @@ public class Settings extends SettingsActivity { public static class UsageAccessSettingsActivity extends SettingsActivity { /* empty */ } public static class LocationSettingsActivity extends SettingsActivity { /* empty */ } public static class PrivacySettingsActivity extends SettingsActivity { /* empty */ } + public static class FactoryResetActivity extends SettingsActivity { /* empty */ } public static class RunningServicesActivity extends SettingsActivity { /* empty */ } public static class ManageAccountsSettingsActivity extends SettingsActivity { /* empty */ } public static class PowerUsageSummaryActivity extends SettingsActivity { /* empty */ } diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 223d5367c98..5ebe34d884c 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -352,6 +352,7 @@ public class SettingsActivity extends SettingsDrawerActivity TestingSettings.class.getName(), WifiAPITest.class.getName(), WifiInfo.class.getName(), + MasterClear.class.getName(), };