PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add an Activity to handle Intents to invoke the Deletion Helper." into nyc-mr1-dev am: 03f26d3997

Browse Source 
am: e592a41727

* commit 'e592a41727fc498d3a18a08720dc55b98723c87d':
  Add an Activity to handle Intents to invoke the Deletion Helper.

Change-Id: Ifc706565a021577c05b924b0f8c2ea4f467fb928
This commit is contained in:
Daniel Nishi
2016-05-14 01:26:10 +00:00
committed by android-build-merger
parent 07e9f774b0 e592a41727
commit 2f1da3901d
3 changed files with 14 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/android/settings/Settings.java
View File

@@ -139,6 +139,7 @@ public class Settings extends SettingsActivity {
public static class ScreenLockSuggestionActivity extends ChooseLockGeneric { /* empty */ }
public static class WallpaperSettingsActivity extends SettingsActivity { /* empty */ }
public static class ManagedProfileSettingsActivity extends SettingsActivity { /* empty */ }
public static class DeletionHelperActivity extends SettingsActivity { /* empty */ }
// Categories.
public static class WirelessSettings extends SettingsActivity { /* empty */ }

2
src/com/android/settings/SettingsActivity.java
View File

@@ -73,6 +73,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.DeletionHelperFragment;
import com.android.settings.deviceinfo.PrivateVolumeForget;
import com.android.settings.deviceinfo.PrivateVolumeSettings;
import com.android.settings.deviceinfo.PublicVolumeSettings;
@@ -332,6 +333,7 @@ public class SettingsActivity extends SettingsDrawerActivity
WallpaperTypeSettings.class.getName(),
VrListenerSettings.class.getName(),
ManagedProfileSettings.class.getName(),
DeletionHelperFragment.class.getName(),
};