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
diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java
index 2e8d399..3036bd18 100644
--- a/src/com/android/settings/Settings.java
+++ b/src/com/android/settings/Settings.java
@@ -77,6 +77,7 @@
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 223d536..5ebe34d 100644
--- a/src/com/android/settings/SettingsActivity.java
+++ b/src/com/android/settings/SettingsActivity.java
@@ -352,6 +352,7 @@
TestingSettings.class.getName(),
WifiAPITest.class.getName(),
WifiInfo.class.getName(),
+ MasterClear.class.getName(),
};