am e6e80b19: am ab747c87: am 3d6ca113: am 72a7afb0: Merge "Put fragment in specific activity\'s whitelist" into klp-dev

* commit 'e6e80b195b011c074241cbae4325f713190fa196':
  Put fragment in specific activity's whitelist
This commit is contained in:
Amith Yamasani
2013-12-03 19:45:49 +00:00
committed by Android Git Automerger

View File

@@ -326,7 +326,6 @@ public class Settings extends PreferenceActivity
ManageApplications.class.getName(), ManageApplications.class.getName(),
ProcessStatsUi.class.getName(), ProcessStatsUi.class.getName(),
NotificationStation.class.getName(), NotificationStation.class.getName(),
AppOpsSummary.class.getName(),
LocationSettings.class.getName(), LocationSettings.class.getName(),
SecuritySettings.class.getName(), SecuritySettings.class.getName(),
PrivacySettings.class.getName(), PrivacySettings.class.getName(),
@@ -1084,7 +1083,15 @@ public class Settings extends PreferenceActivity
public static class DeviceInfoSettingsActivity extends Settings { /* empty */ } public static class DeviceInfoSettingsActivity extends Settings { /* empty */ }
public static class ApplicationSettingsActivity extends Settings { /* empty */ } public static class ApplicationSettingsActivity extends Settings { /* empty */ }
public static class ManageApplicationsActivity extends Settings { /* empty */ } public static class ManageApplicationsActivity extends Settings { /* empty */ }
public static class AppOpsSummaryActivity extends Settings { /* empty */ } public static class AppOpsSummaryActivity extends Settings {
@Override
public boolean isValidFragment(String className) {
if (AppOpsSummary.class.getName().equals(className)) {
return true;
}
return super.isValidFragment(className);
}
}
public static class StorageUseActivity extends Settings { /* empty */ } public static class StorageUseActivity extends Settings { /* empty */ }
public static class DevelopmentSettingsActivity extends Settings { /* empty */ } public static class DevelopmentSettingsActivity extends Settings { /* empty */ }
public static class AccessibilitySettingsActivity extends Settings { /* empty */ } public static class AccessibilitySettingsActivity extends Settings { /* empty */ }