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

Commit d2d2fe12 authored by Mill Chen's avatar Mill Chen Committed by Automerger Merge Worker
Browse files

Merge "Add default Sound Picker package name" into udc-dev am: 0370bdfc 

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



Change-Id: Ia91ea5e0d6baa02662428f98a5b731cfa4e17ca1
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 2137e86b 0370bdfc

res/values/config.xml

+5 −0
Original line number Diff line number Diff line
@@ -272,6 +272,11 @@ 
    <!-- Whether Settings intelligence supports presenting Slices. -->

    <bool name="config_settingsintelligence_slice_supported">false</bool>



    <!-- Sound picker package name -->

    <string name="config_sound_picker_package_name" translatable="false">

        com.android.soundpicker

    </string>



    <!-- AOSP Emergency app package name -->

    <string name="config_aosp_emergency_package_name" translatable="false">

        com.android.emergency

src/com/android/settings/RingtonePreference.java

+2 −1
Original line number Diff line number Diff line
@@ -74,7 +74,8 @@ public class RingtonePreference extends Preference { 
                true);

        mShowSilent = a.getBoolean(com.android.internal.R.styleable.RingtonePreference_showSilent,

                true);

        setIntent(new Intent(RingtoneManager.ACTION_RINGTONE_PICKER));

        setIntent(new Intent(RingtoneManager.ACTION_RINGTONE_PICKER)

                .setPackage(context.getString(R.string.config_sound_picker_package_name)));

        setUserId(UserHandle.myUserId());

        a.recycle();

    }