Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 03f26d39 authored by Daniel Nishi's avatar Daniel Nishi Committed by Android (Google) Code Review
Browse files

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

parents 95c3c504 287d9118

AndroidManifest.xml

+11 −0
Original line number Diff line number Diff line
@@ -2901,6 +2901,17 @@ 
                android:value="true" />

        </activity>



        <activity android:name="Settings$DeletionHelperActivity"

                  android:label="@string/deletion_helper_title"

                  android:taskAffinity="">

            <intent-filter android:priority="1">

                <action android:name="android.settings.DELETION_HELPER_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.DeletionHelperFragment" />

        </activity>



        <service

            android:name=".SettingsDumpService"

            android:exported="true"

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -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 */ }

src/com/android/settings/SettingsActivity.java

+2 −0
Original line number Diff line number Diff line
@@ -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(),

    };