diff options
| author | Daniel Nishi <dhnishi@google.com> | 2016-09-20 16:40:49 -0700 |
|---|---|---|
| committer | Daniel Nishi <dhnishi@google.com> | 2016-09-22 17:43:42 -0700 |
| commit | 3981889d1d19f18443a3d2bee45d4a4bcffbbb93 (patch) | |
| tree | e55c23841824aa494b50a2d10a47613c8c066560 | |
| parent | 727186bd33bed20d813ec404c195739cf1174b75 (diff) | |
| download | packages_apps_Settings-3981889d1d19f18443a3d2bee45d4a4bcffbbb93.tar.gz packages_apps_Settings-3981889d1d19f18443a3d2bee45d4a4bcffbbb93.tar.bz2 packages_apps_Settings-3981889d1d19f18443a3d2bee45d4a4bcffbbb93.zip | |
Add storage manager settings activity.
Bug: 31621740
Change-Id: I5abc8ef3f12e02488104c0b74f4826d8c4182b2b
| -rw-r--r-- | AndroidManifest.xml | 12 | ||||
| -rw-r--r-- | src/com/android/settings/Settings.java | 1 | ||||
| -rw-r--r-- | src/com/android/settings/SettingsActivity.java | 2 |
3 files changed, 15 insertions, 0 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 78fa3245ba..f18962722c 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -3003,6 +3003,18 @@ android:value="true" /> </activity> + <activity android:name="Settings$AutomaticStorageManagerSettingsActivity" + android:exported="@bool/config_has_storage_manager" + android:label="@string/automatic_storage_manager_settings" + android:taskAffinity=""> + <intent-filter android:priority="1"> + <action android:name="android.settings.STORAGE_MANAGER_SETTINGS" /> + <category android:name="android.intent.category.DEFAULT" /> + </intent-filter> + <meta-data android:name="com.android.settings.FRAGMENT_CLASS" + android:value="com.android.settings.deletionhelper.AutomaticStorageManagerSettings" /> + </activity> + <service android:name=".SettingsDumpService" android:exported="true" diff --git a/src/com/android/settings/Settings.java b/src/com/android/settings/Settings.java index 01b0632300..559b9cefec 100644 --- a/src/com/android/settings/Settings.java +++ b/src/com/android/settings/Settings.java @@ -120,6 +120,7 @@ public class Settings extends SettingsActivity { public static class AppNotificationSettingsActivity extends SettingsActivity { /* empty */ } public static class OtherSoundSettingsActivity extends SettingsActivity { /* empty */ } public static class ManageDomainUrlsActivity extends SettingsActivity { /* empty */ } + public static class AutomaticStorageManagerSettingsActivity extends SettingsActivity { /* empty */ } public static class TopLevelSettings extends SettingsActivity { /* empty */ } public static class ApnSettingsActivity extends SettingsActivity { /* empty */ } diff --git a/src/com/android/settings/SettingsActivity.java b/src/com/android/settings/SettingsActivity.java index 07ba41494b..d0f51f6152 100644 --- a/src/com/android/settings/SettingsActivity.java +++ b/src/com/android/settings/SettingsActivity.java @@ -75,6 +75,7 @@ import com.android.settings.bluetooth.BluetoothSettings; import com.android.settings.dashboard.DashboardContainerFragment; import com.android.settings.dashboard.SearchResultsSummary; import com.android.settings.datausage.DataUsageSummary; +import com.android.settings.deletionhelper.AutomaticStorageManagerSettings; import com.android.settings.deviceinfo.ImeiInformation; import com.android.settings.deviceinfo.PrivateVolumeForget; import com.android.settings.deviceinfo.PrivateVolumeSettings; @@ -355,6 +356,7 @@ public class SettingsActivity extends SettingsDrawerActivity MasterClear.class.getName(), NightDisplaySettings.class.getName(), ManageDomainUrls.class.getName(), + AutomaticStorageManagerSettings.class.getName() }; |