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

Commit 537329ba authored by Xin Li's avatar Xin Li
Browse files

Merge Android U (ab/10368041) 

Bug: 291102124
Merged-In: I407a728f1fdec88ba474df67ed989e16c8ad4738
Change-Id: I5b43c60ef667d60117969e8be41dccfa1644e0c5
parents 769ae732 6aa299eb

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-am/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -84,8 +84,8 @@ 
    <string name="deleteConfirmation" msgid="3727809366015979585">"ይህ እውቂያ ይሰረዝ?"</string>

    <string name="deleteConfirmation_positive_button" msgid="1604511403421785160">"ሰርዝ"</string>

    <string name="invalidContactMessage" msgid="6204402264821083362">"ዕውቅያው የለም።"</string>

    <string name="createContactShortcutSuccessful_NoName" msgid="532242135930208299">"እውቂያ ወደ መነሻ ማያ ገፅ ታክሏል።"</string>

    <string name="createContactShortcutSuccessful" msgid="6980032407920515698">"<xliff:g id="NAME">%s</xliff:g> ወደ መነሻ ማያ ገፅ ታክሏል።"</string>

    <string name="createContactShortcutSuccessful_NoName" msgid="532242135930208299">"እውቂያ ወደ መነሻ ማያ ገጽ ታክሏል።"</string>

    <string name="createContactShortcutSuccessful" msgid="6980032407920515698">"<xliff:g id="NAME">%s</xliff:g> ወደ መነሻ ማያ ገጽ ታክሏል።"</string>

    <string name="photoPickerNotFoundText" msgid="6535222297923110991">"በመሣሪያው ላይ ፎቶዎች የሉም።"</string>

    <string name="attach_photo_dialog_title" msgid="7948754072673745235">"የዕውቂያ ፎቶ"</string>

    <string name="customLabelPickerTitle" msgid="816694850254307154">"ብጁ መሰየሚያ ስም"</string>
@@ -120,7 +120,7 @@ 
    <string name="listFoundAllContactsZero" msgid="1933842282916988563">"እውቅያዎች የሉም"</string>

    <string name="add_contact_dlg_message_fmt" msgid="7498024710169591375">"<xliff:g id="EMAIL">%s</xliff:g> ወደ እውቅያዎች ዝርዝር ይታከል"</string>

    <string name="search_settings_description" msgid="5630675648560839920">"የዕውቂያዎችዎ ስሞች"</string>

    <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"ወደ ቀዳሚው ማያ ገፅ ለመመለስ ጠቅ ያድርጉ"</string>

    <string name="quickcontact_transparent_view_description" msgid="7783027850792852265">"ወደ ቀዳሚው ማያ ገጽ ለመመለስ ጠቅ ያድርጉ"</string>

    <string name="quickcontact_add_phone_number" msgid="1683577288080727862">"የስልክ ቁጥር ያክሉ"</string>

    <string name="quickcontact_add_email" msgid="1442894568471116797">"ኢሜይል ያክሉ"</string>

    <string name="missing_app" msgid="5674389915738964148">"ይህን እርምጃ የሚያከናውን ምንም መተግበሪያ አልተገኘም።"</string>

res/values-as/strings.xml

+3 −3
Original line number Diff line number Diff line
@@ -91,8 +91,8 @@ 
    <string name="customLabelPickerTitle" msgid="816694850254307154">"উপযোগিতা অনুসৰি লেবেলৰ নাম"</string>

    <string name="removePhoto" msgid="1190099414600730001">"ফট\' আঁতৰাওক"</string>

    <string name="noContacts" msgid="3030512741779213810">"আপোনাৰ সম্পৰ্কসূচী খালী আছে"</string>

    <string name="emptyGroup" msgid="8598261660865081152">"এই লেবেলত কোনো সম্পৰ্ক ব্যক্তি নাই"</string>

    <string name="emptyAccount" msgid="7450843210977018582">"এই একাউণ্টত কোনো সম্পৰ্ক ব্যক্তি নাই"</string>

    <string name="emptyGroup" msgid="8598261660865081152">"এই লেবেলত কোনো সম্পৰ্ক ব্য়ক্তি নাই"</string>

    <string name="emptyAccount" msgid="7450843210977018582">"এই একাউণ্টত কোনো সম্পৰ্ক ব্য়ক্তি নাই"</string>

    <string name="emptyMainList" msgid="3266182207039677163">"আপোনাৰ সম্পৰ্কসূচী খালী আছে"</string>

    <string name="contactSavedNamedToast" msgid="3067050290584834386">"<xliff:g id="DISPLAY_NAME">%s</xliff:g> ছেভ কৰা হ’ল"</string>

    <string name="contactSavedToast" msgid="4370392215196995301">"সম্পৰ্ক ছেভ কৰা হ’ল"</string>
@@ -192,7 +192,7 @@ 
    <string name="expanding_entry_card_view_see_more" msgid="6636033205952561590">"অধিক চাওক"</string>

    <string name="expanding_entry_card_view_see_less" msgid="6399603072579278030">"কম চাওক"</string>

    <string name="about_card_title" msgid="6635849009952435700">"ইয়াৰ বিষয়ে"</string>

    <string name="toast_making_personal_copy" msgid="9053129410039312386">"ব্যক্তিগত প্ৰতিলিপ সৃষ্টি কৰিথকা হৈছে…"</string>

    <string name="toast_making_personal_copy" msgid="9053129410039312386">"ব্য়ক্তিগত প্ৰতিলিপ সৃষ্টি কৰিথকা হৈছে…"</string>

    <string name="date_time_set" msgid="8526160894146496334">"ছেট কৰক"</string>

    <string name="header_im_entry" msgid="3581797653862294826">"IM"</string>

    <string name="header_organization_entry" msgid="7428066442988227441">"সংস্থা"</string>

res/values-b+sr+Latn/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -475,7 +475,7 @@ 
    <string name="sim_import_success_toast_fmt" msgid="7645974841482481503">"{count,plural, =1{Uvezen je # kontakt sa SIM-a}one{Uvezen je # kontakt sa SIM-a}few{Uvezena su # kontakta sa SIM-a}other{Uvezeno je # kontakata sa SIM-a}}"</string>

    <string name="sim_import_failed_toast" msgid="358117391138073786">"Uvoz kontakata sa SIM kartice nije uspeo"</string>

    <string name="sim_import_title" msgid="8202961146093040684">"Uvezite sa SIM-a"</string>

    <string name="sim_import_cancel_content_description" msgid="4746065462808862682">"Otkaži"</string>

    <string name="sim_import_cancel_content_description" msgid="4746065462808862682">"Otkažite"</string>

    <string name="auto_sync_off" msgid="7039314601316227882">"Automatska sinhronizacija je isključena. Dodirnite da biste je uključili."</string>

    <string name="dismiss_sync_alert" msgid="4057176963960104786">"Odbacite"</string>

    <string name="account_sync_off" msgid="6187683798342006021">"Sinhronizacija naloga je isključena. Dodirnite da biste je uključili."</string>

res/values-el/strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -331,7 +331,7 @@ 
    <string name="postal_region" msgid="6130239447563491435">"Πολιτεία"</string>

    <string name="postal_postcode" msgid="33077708757232659">"Ταχυδρομικός κώδικας"</string>

    <string name="postal_country" msgid="6642804283917549861">"Χώρα"</string>

    <string name="map_home" msgid="2169053372466501148">"Προβολή διεύθυνσης σπιτιού"</string>

    <string name="map_home" msgid="2169053372466501148">"Προβολή διεύθυνσης οικίας"</string>

    <string name="map_work" msgid="8296916987749726461">"Προβολή διεύθυνσης εργασίας"</string>

    <string name="map_other" msgid="4009931029322619674">"Προβολή διεύθυνσης"</string>

    <string name="map_custom" msgid="7797812861927817335">"Προβολή διεύθυνσης <xliff:g id="CUSTOM_LABEL">%s</xliff:g>"</string>