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

Commit ac0f1fc2 authored by Amber Ogata's avatar Amber Ogata Committed by Automerger Merge Worker
Browse files

Merge "Add intent filter to open premium sms setting." am: 4de1ae6a 

Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1532203

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I424f31e085814e4afd0b92d3295d25301febf5ca
parents defe0a6b 4de1ae6a

AndroidManifest.xml

+13 −0
Original line number Diff line number Diff line
@@ -2573,6 +2573,19 @@ 
                       android:value="com.android.settings.notification.app.AppBubbleNotificationSettings" />

        </activity>



        <activity

            android:name="Settings$PremiumSmsAccessActivity"

            android:label="@string/premium_sms_access"

            android:exported="true">

            <intent-filter>

                <action android:name="android.settings.PREMIUM_SMS_SETTINGS" />

                <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.specialaccess.premiumsms.PremiumSmsAccess" />

        </activity>



        <activity

            android:name="Settings$SoundSettingsActivity"

            android:label="@string/sound_settings"

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -138,6 +138,7 @@ public class Settings extends SettingsActivity { 
    public static class NotificationAccessSettingsActivity extends SettingsActivity { /* empty */ }

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

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

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

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

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

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

src/com/android/settings/core/gateway/SettingsGateway.java

+2 −0
Original line number Diff line number Diff line
@@ -52,6 +52,7 @@ import com.android.settings.applications.specialaccess.interactacrossprofiles.In 
import com.android.settings.applications.specialaccess.notificationaccess.NotificationAccessDetails;

import com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureDetails;

import com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureSettings;

import com.android.settings.applications.specialaccess.premiumsms.PremiumSmsAccess;

import com.android.settings.applications.specialaccess.vrlistener.VrListenerSettings;

import com.android.settings.applications.specialaccess.zenaccess.ZenAccessDetails;

import com.android.settings.backup.PrivacySettings;
@@ -271,6 +272,7 @@ public class SettingsGateway { 
            VrListenerSettings.class.getName(),

            PictureInPictureSettings.class.getName(),

            PictureInPictureDetails.class.getName(),

            PremiumSmsAccess.class.getName(),

            ManagedProfileSettings.class.getName(),

            ChooseAccountFragment.class.getName(),

            IccLockSettings.class.getName(),