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

Commit 66977bcb authored by Jacky Wang's avatar Jacky Wang
Browse files

[Catalyst] Support deep link for App Storage screen 

Bug: 415125776
Flag: EXEMPT refactor
Test: manual
Change-Id: If8203291b975fd18128850784cee4b4348344a79
parent b84bb725

AndroidManifest.xml

+0 −2
Original line number Diff line number Diff line
@@ -2055,8 +2055,6 @@ 
                <category android:name="android.intent.category.DEFAULT" />

                <data android:scheme="package" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                   android:value="com.android.settings.applications.AppStorageSettings" />

            <meta-data android:name="com.android.settings.HIGHLIGHT_MENU_KEY"

                   android:value="@string/menu_key_apps"/>

        </activity>

src/com/android/settings/Settings.java

+7 −1
Original line number Diff line number Diff line
@@ -30,6 +30,7 @@ import android.util.Log; 
import androidx.annotation.Nullable;



import com.android.internal.annotations.VisibleForTesting;

import com.android.settings.applications.AppStorageSettings;

import com.android.settings.biometrics.face.FaceSettings;

import com.android.settings.communal.CommunalPreferenceController;

import com.android.settings.deviceinfo.firmwareversion.FirmwareVersionScreen;
@@ -38,6 +39,7 @@ import com.android.settings.network.MobileNetworkIntentConverter; 
import com.android.settings.overlay.FeatureFactory;

import com.android.settings.safetycenter.SafetyCenterManagerWrapper;

import com.android.settings.security.SecuritySettingsFeatureProvider;

import com.android.settings.spa.app.catalyst.AppInfoStorageScreen;

import com.android.settings.system.ShadePanelsPreferenceController;

import com.android.settings.wifi.WifiUtils;
@@ -139,7 +141,11 @@ public class Settings extends SettingsActivity { 
    public static class ModuleLicensesActivity extends SettingsActivity { /* empty */ }

    public static class ApplicationSettingsActivity extends SettingsActivity { /* empty */ }

    public static class ManageApplicationsActivity extends SettingsActivity { /* empty */ }

    public static class AppStorageSettingsActivity extends SettingsActivity { /* empty */ }

    public static class AppStorageSettingsActivity extends CatalystSettingsActivity {

        public AppStorageSettingsActivity() {

            super(AppInfoStorageScreen.KEY, AppStorageSettings.class);

        }

    }

    public static class ManageAssistActivity extends SettingsActivity { /* empty */ }

    public static class HighPowerApplicationsActivity extends SettingsActivity { /* empty */ }

    public static class BackgroundCheckSummaryActivity extends SettingsActivity { /* empty */ }

src/com/android/settings/spa/app/catalyst/AppInfoStorageScreen.kt

+6 −2
Original line number Diff line number Diff line
@@ -22,7 +22,9 @@ import android.content.Intent 
import android.os.Bundle

import android.os.UserHandle

import androidx.core.net.toUri

import androidx.fragment.app.Fragment

import com.android.settings.R

import com.android.settings.applications.AppStorageSettings

import com.android.settings.contract.TAG_DEVICE_STATE_PREFERENCE

import com.android.settings.contract.TAG_DEVICE_STATE_SCREEN

import com.android.settings.core.PreferenceScreenMixin
@@ -57,7 +59,7 @@ open class AppInfoStorageScreen(context: Context, override val arguments: Bundle 
    override val highlightMenuKey: Int

        get() = R.string.menu_key_apps



    override fun getMetricsCategory() = SettingsEnums.PAGE_UNKNOWN // TODO: correct page id

    override fun getMetricsCategory() = SettingsEnums.APPLICATIONS_APP_STORAGE



    override fun tags(context: Context) =

        arrayOf(TAG_DEVICE_STATE_SCREEN, TAG_DEVICE_STATE_PREFERENCE)
@@ -74,10 +76,12 @@ open class AppInfoStorageScreen(context: Context, override val arguments: Bundle 


    override fun hasCompleteHierarchy() = false



    override fun fragmentClass(): Class<out Fragment>? = AppStorageSettings::class.java



    override fun getLaunchIntent(context: Context, metadata: PreferenceMetadata?) =

        Intent("com.android.settings.APP_STORAGE_SETTINGS").apply {

            data = "package:${appInfo.packageName}".toUri()

            highlightPreference(metadata?.key)

            highlightPreference(arguments, metadata?.key)

        }



    override fun getPreferenceHierarchy(context: Context) =