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

Commit a1c3ad1f authored by Alexandre Roux's avatar Alexandre Roux
Browse files

merge lineage 17.1

parents 03099190 cacc13a4

res/values/cm_strings.xml

+4 −0
Original line number Diff line number Diff line
@@ -193,4 +193,8 @@ 


    <!-- Title for connected TWS device group [CHAR LIMIT=none]-->

    <string name="connected_tws_device_saved_title">Saved Earbuds</string>



    <!-- Heads-up -->

    <string name="heads_up_notifications_enabled_title">Heads-up</string>

    <string name="heads_up_notifications_enabled_summary">Display priority notifications in a small floating window</string>

</resources>

res/xml/configure_notification_settings.xml

+6 −0
Original line number Diff line number Diff line
@@ -122,6 +122,12 @@ 
            lineage:requiresConfig="@*android:bool/config_intrusiveNotificationLed"

            lineage:replacesKey="notification_pulse" />



        <!-- Heads up -->

        <lineageos.preference.GlobalSettingSwitchPreference

            android:key="heads_up_notifications_enabled"

            android:title="@string/heads_up_notifications_enabled_title"

            android:summary="@string/heads_up_notifications_enabled_summary" />



        <!-- Default notification ringtone -->

        <com.android.settings.DefaultRingtonePreference

            android:key="notification_default_ringtone"

src/com/android/settings/accounts/AccountTypePreferenceLoader.java

+1 −8
Original line number Diff line number Diff line
@@ -197,14 +197,7 @@ public class AccountTypePreferenceLoader { 
        ActivityInfo resolvedActivityInfo = resolveInfo.activityInfo;

        ApplicationInfo resolvedAppInfo = resolvedActivityInfo.applicationInfo;

        try {

            if (resolvedActivityInfo.exported) {

                if (resolvedActivityInfo.permission == null) {

                    return true; // exported activity without permission.

                } else if (pm.checkPermission(resolvedActivityInfo.permission,

                    authDesc.packageName) == PackageManager.PERMISSION_GRANTED) {

                    return true;

                }

            }

            // Allows to launch only authenticator owned activities.

            ApplicationInfo authenticatorAppInf = pm.getApplicationInfo(authDesc.packageName, 0);

            return resolvedAppInfo.uid == authenticatorAppInf.uid;

        } catch (NameNotFoundException e) {