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

Commit 419086d8 authored by Xin Li's avatar Xin Li
Browse files

DO NOT MERGE - Merge pie-platform-release (PPRL.181205.001) into master 

Bug: 120502534
Change-Id: I63bedf30fa0a4629cfab1dbe94359b4d36cf9ac1
parents cc24a22d 03812c93

AndroidManifest.xml

+9 −4
Original line number Diff line number Diff line
@@ -3313,10 +3313,15 @@ 
        </provider>



        <receiver

            android:name=".slices.SliceBroadcastReceiver" >

            <intent-filter>

                <action android:name="com.android.settings.slice.action.WIFI_CHANGED"/>

            </intent-filter>

            android:name=".slices.SliceBroadcastReceiver"

            android:exported="false">

        </receiver>



        <receiver

            android:name=".slices.SliceRelayReceiver"

            android:permission="android.permission.MANAGE_SLICE_PERMISSIONS"

            android:exported="true">



        </receiver>



        <!-- Couldn't be triggered from outside of settings. Statsd can trigger it because we send

res/values-af/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -4150,4 +4150,5 @@ 
    <string name="pref_title_network_details" msgid="7186418845727358964">"Netwerkbesonderhede"</string>

    <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Programme op jou foon kan jou toestelnaam sien. Ander mense sal dit dalk ook kan sien wanneer jy aan Bluetooth-toestelle koppel of \'n Wi-Fi-warmkol opstel."</string>

    <string name="devices_title" msgid="7701726109334110391">"Toestelle"</string>

    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Verstek"</string>

</resources>

res/values-am/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -4150,4 +4150,5 @@ 
    <string name="pref_title_network_details" msgid="7186418845727358964">"የአውታረ መረብ ዝርዝሮች"</string>

    <string name="about_phone_device_name_warning" msgid="8885670415541365348">"የእርስዎ መሣሪያ በእርስዎ ስልክ ላይ ላሉ መተግበሪያዎች የሚታይ ነው። ወድ ብሉቱዝ መሣሪያዎች ሲያገኙ ወይም የWi-Fi መገናኛ ነጥብን ሲያቀናብሩ በተጨማሪ በሌሎች ሰዎች የሚታይ ይሆናል።"</string>

    <string name="devices_title" msgid="7701726109334110391">"መሣሪያዎች"</string>

    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"ነባሪ"</string>

</resources>

res/values-ar/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -4426,4 +4426,5 @@ 
    <string name="pref_title_network_details" msgid="7186418845727358964">"تفاصيل الشبكة"</string>

    <string name="about_phone_device_name_warning" msgid="8885670415541365348">"‏اسم جهازك مرئي للتطبيقات على هاتفك. ويمكن أيضًا أن يراه أشخاص آخرون عند الاتصال بأجهزة بلوتوث أو إعداد نقطة اتصال Wi-Fi."</string>

    <string name="devices_title" msgid="7701726109334110391">"الأجهزة"</string>

    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"تلقائي"</string>

</resources>

res/values-az/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -4150,4 +4150,5 @@ 
    <string name="pref_title_network_details" msgid="7186418845727358964">"Şəbəkə məlumatları"</string>

    <string name="about_phone_device_name_warning" msgid="8885670415541365348">"Cihazın adı telefondakı tətbiqlərdə görünəcək. Bluetooth cihazlarına qoşulduqda və ya Wi-Fi hotspotu ayarladıqda digərləri də onu görə bilər."</string>

    <string name="devices_title" msgid="7701726109334110391">"Cihazlar"</string>

    <string name="display_cutout_emulation_device_default" msgid="7957250558326167503">"Defolt"</string>

</resources>