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

Commit 75fceaf7 authored by Xin Li's avatar Xin Li
Browse files

Merge Android 14 

Bug: 298295554
Merged-In: I9fd5d4d8acccb75fbe1660d69247074b03a8f255
Change-Id: If4d937bf307f2b804ff5b90197b961ee2c770534
parents 9064d728 bb6c38ce

AndroidManifest.xml

+3 −3
Original line number Diff line number Diff line
@@ -46,7 +46,6 @@ 
    <uses-permission android:name="android.permission.USE_CREDENTIALS"/>

    <uses-permission android:name="android.permission.VIBRATE"/>

    <uses-permission android:name="android.permission.READ_SYNC_SETTINGS"/>

    <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>

    <uses-permission android:name="android.permission.SET_DEFAULT_ACCOUNT_FOR_CONTACTS"/>

    <uses-permission android:name="com.android.launcher.permission.INSTALL_SHORTCUT"/>

    <!-- Following used for Contact metadata syncing -->
@@ -56,7 +55,7 @@ 
    <uses-permission android:name="android.permission.RECEIVE_BOOT_COMPLETED"/>

    <!-- Required in P to run Service.startForeground() -->

    <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>

    <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS" />

    <uses-permission android:name="android.permission.HIDE_OVERLAY_WINDOWS" />

    <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />

    <!-- Required in U to run Service.startForeground() under DATA_SYNC type -->

    <uses-permission android:name="android.permission.FOREGROUND_SERVICE_DATA_SYNC"/>
@@ -478,7 +477,8 @@ 
        <!-- Service to import contacts from the SIM card -->

        <service

            android:name=".SimImportService"

            android:exported="false"/>

            android:exported="false"

            android:foregroundServiceType="shortService" />



        <!-- Attaches a photo to a contact. Started from external applications -->

        <activity

res/values-af/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -492,4 +492,5 @@ 
    <string name="contacts_default_notification_channel" msgid="5116916969874075866">"Kennisgewings"</string>

    <string name="yes_button" msgid="1120514817091581293">"Ja"</string>

    <string name="no_button" msgid="8965841385742548947">"Nee"</string>

    <string name="sdn_contacts_directory_search_label" msgid="9146122809408008443">"Diensverskafferdiensnommers"</string>

</resources>

res/values-am/strings.xml

+2 −1
Original line number Diff line number Diff line
@@ -364,7 +364,7 @@ 
    <string name="display_more_groups" msgid="8398232980355188133">"ተጨማሪቡድኖች..."</string>

    <string name="display_warn_remove_ungrouped" msgid="522866344738506017">"\'<xliff:g id="GROUP">%s</xliff:g>\'  ከአሳምር ማስወገድ እንዲሁ ማንኛውም በተነጣጥል ያሉ ዕውቅያዎችን ከአሳምር ያስወግዳል።"</string>

    <string name="savingDisplayGroups" msgid="6779839417901711381">"ማሳያ አማራጮችን በማስቀመጥ ላይ..."</string>

    <string name="listCustomView" msgid="5782275477737032610">"ብጁ እይታ"</string>

    <string name="listCustomView" msgid="5782275477737032610">"ብጁ ዕይታ"</string>

    <string name="dialog_new_contact_account" msgid="5652018124788855057">"እንዲመጡ የተደረጉ እውቂያዎችን አስቀምጥ ወደ፦"</string>

    <string name="import_from_sim" msgid="7825280799813847991">"ሲም ካርድ"</string>

    <string name="import_from_sim_summary_fmt" msgid="4234771828377985321">"ሲም <xliff:g id="SIM_NAME">%1$s</xliff:g>"</string>
@@ -492,4 +492,5 @@ 
    <string name="contacts_default_notification_channel" msgid="5116916969874075866">"ማሳወቂያዎች"</string>

    <string name="yes_button" msgid="1120514817091581293">"አዎ"</string>

    <string name="no_button" msgid="8965841385742548947">"አይ"</string>

    <string name="sdn_contacts_directory_search_label" msgid="9146122809408008443">"የአገልግሎት አቅራቢ አገልግሎት ቁጥሮች"</string>

</resources>

res/values-ar/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -492,4 +492,5 @@ 
    <string name="contacts_default_notification_channel" msgid="5116916969874075866">"الإشعارات"</string>

    <string name="yes_button" msgid="1120514817091581293">"نعم"</string>

    <string name="no_button" msgid="8965841385742548947">"لا"</string>

    <string name="sdn_contacts_directory_search_label" msgid="9146122809408008443">"أرقام خدمات مشغّلي شبكة الجوّال"</string>

</resources>

res/values-as/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -492,4 +492,5 @@ 
    <string name="contacts_default_notification_channel" msgid="5116916969874075866">"জাননীসমূহ"</string>

    <string name="yes_button" msgid="1120514817091581293">"হয়"</string>

    <string name="no_button" msgid="8965841385742548947">"নহয়"</string>

    <string name="sdn_contacts_directory_search_label" msgid="9146122809408008443">"বাহকৰ সেৱাৰ নম্বৰ"</string>

</resources>