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

Commit 538a0102 authored by Dongzhuo Zhang's avatar Dongzhuo Zhang
Browse files

Add ContactsStorageSettingsActivity to handle the 

android.provider.action.SET_DEFAULT_ACCOUNT intent

Test:Manually tested to trigger the contacts storage settings page using intent to start activity.
Bug: 368641291
Flag: com.android.settings.flags.enable_contacts_default_account_in_settings

Change-Id: I83db4c5751c6fec523298a82b82468180906075c
parent 4e1d24c5

AndroidManifest.xml

+13 −0
Original line number Diff line number Diff line
@@ -5293,6 +5293,19 @@ 
                android:value="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamConfirmDialog" />

        </activity>



        <activity

            android:name="Settings$ContactsStorageSettingsActivity"

            android:label="@string/contacts_storage_settings_title"

            android:exported="true"

            android:featureFlag="com.android.settings.flags.enable_contacts_default_account_in_settings">

            <intent-filter>

                <action android:name="android.provider.action.SET_DEFAULT_ACCOUNT" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

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

                       android:value="com.android.settings.applications.contacts.ContactsStorageSettings"/>

        </activity>



        <service

            android:name="com.android.settings.connecteddevice.audiosharing.audiostreams.AudioStreamMediaService"

            android:foregroundServiceType="mediaPlayback"

src/com/android/settings/Settings.java

+1 −0
Original line number Diff line number Diff line
@@ -514,4 +514,5 @@ public class Settings extends SettingsActivity { 


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

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

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

}

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

+3 −1
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ import com.android.settings.applications.appinfo.TurnScreenOnDetails; 
import com.android.settings.applications.appinfo.WriteSettingsDetails;

import com.android.settings.applications.appops.BackgroundCheckSummary;

import com.android.settings.applications.assist.ManageAssist;

import com.android.settings.applications.contacts.ContactsStorageSettings;

import com.android.settings.applications.manageapplications.ManageApplications;

import com.android.settings.applications.managedomainurls.ManageDomainUrls;

import com.android.settings.applications.specialaccess.deviceadmin.DeviceAdminSettings;
@@ -401,7 +402,8 @@ public class SettingsGateway { 
            AccessibilityHearingAidsFragment.class.getName(),

            HearingDevicePairingFragment.class.getName(),

            ZenModesListFragment.class.getName(),

            ZenModeFragment.class.getName()

            ZenModeFragment.class.getName(),

            ContactsStorageSettings.class.getName()

    };



    public static final String[] SETTINGS_FOR_RESTRICTED = {