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

Merge "Add intent filter to open premium sms setting." am: 4de1ae6a45 am: ac0f1fc20c am: 25ff810ef9

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I5ab15b83fbd574e6db202a7cc2eab1be461597a3
This commit is contained in:
Amber Ogata
2020-12-29 18:20:56 +00:00
committed by Automerger Merge Worker
parent c0cbcb9f04 25ff810ef9
commit 89d81de62e
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
AndroidManifest.xml
View File

@@ -2741,6 +2741,19 @@
android:value="com.android.settings.notification.app.AppBubbleNotificationSettings" /> android:value="com.android.settings.notification.app.AppBubbleNotificationSettings" />
</activity> </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 <activity
android:name="Settings$SoundSettingsActivity" android:name="Settings$SoundSettingsActivity"
android:label="@string/sound_settings" android:label="@string/sound_settings"

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

@@ -144,6 +144,7 @@ public class Settings extends SettingsActivity {
public static class NotificationAccessSettingsActivity extends SettingsActivity { /* empty */ } public static class NotificationAccessSettingsActivity extends SettingsActivity { /* empty */ }
public static class NotificationAccessDetailsActivity extends SettingsActivity { /* empty */ } public static class NotificationAccessDetailsActivity extends SettingsActivity { /* empty */ }
public static class VrListenersSettingsActivity 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 PictureInPictureSettingsActivity extends SettingsActivity { /* empty */ }
public static class AppPictureInPictureSettingsActivity extends SettingsActivity { /* empty */ } public static class AppPictureInPictureSettingsActivity extends SettingsActivity { /* empty */ }
public static class ZenAccessSettingsActivity extends SettingsActivity { /* empty */ } public static class ZenAccessSettingsActivity extends SettingsActivity { /* empty */ }

2
src/com/android/settings/core/gateway/SettingsGateway.java
View File

@@ -53,6 +53,7 @@ import com.android.settings.applications.specialaccess.interactacrossprofiles.In
import com.android.settings.applications.specialaccess.notificationaccess.NotificationAccessDetails; import com.android.settings.applications.specialaccess.notificationaccess.NotificationAccessDetails;
import com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureDetails; import com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureDetails;
import com.android.settings.applications.specialaccess.pictureinpicture.PictureInPictureSettings; 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.vrlistener.VrListenerSettings;
import com.android.settings.applications.specialaccess.zenaccess.ZenAccessDetails; import com.android.settings.applications.specialaccess.zenaccess.ZenAccessDetails;
import com.android.settings.backup.PrivacySettings; import com.android.settings.backup.PrivacySettings;
@@ -270,6 +271,7 @@ public class SettingsGateway {
VrListenerSettings.class.getName(), VrListenerSettings.class.getName(),
PictureInPictureSettings.class.getName(), PictureInPictureSettings.class.getName(),
PictureInPictureDetails.class.getName(), PictureInPictureDetails.class.getName(),
PremiumSmsAccess.class.getName(),
ManagedProfileSettings.class.getName(), ManagedProfileSettings.class.getName(),
ChooseAccountFragment.class.getName(), ChooseAccountFragment.class.getName(),
IccLockSettings.class.getName(), IccLockSettings.class.getName(),