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

Commit ad3fa60e authored by Xin Li's avatar Xin Li
Browse files

Merge ab/7061308 into stage. 

Bug: 180401296
Merged-In: I35fe00aeeb112d5d9971985619e3ec5095dcdb7b
Change-Id: I07d008e38827280c9e9c6b7fa31393309f9de8a3
parents 9e3bb702 8e18b5b6

AndroidManifest.xml

+9 −0
Original line number Diff line number Diff line
@@ -3423,6 +3423,15 @@ 
                       android:value="com.android.settings.sound.MediaControlsSettings" />

        </activity>



        <receiver

            android:name=".media.BluetoothPairingReceiver"

            android:exported="true"

            android:permission="android.permission.BLUETOOTH_ADMIN">

            <intent-filter>

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

            </intent-filter>/>

        </receiver>



        <!-- This is the longest AndroidManifest.xml ever. -->

    </application>

</manifest>

res/layout/battery_header.xml

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ 
    style="@style/EntityHeader">



    <LinearLayout

        android:id="@+id/battery_info_layout"

        android:layout_width="170dp"

        android:layout_height="wrap_content"

        android:layout_marginStart="72dp"

res/values-af/arrays.xml

+9 −11
Original line number Diff line number Diff line
@@ -379,17 +379,10 @@ 
  <string-array name="captioning_font_size_selector_titles">

    <item msgid="923916134548435468">"Baie klein"</item>

    <item msgid="5738147437573674872">"Klein"</item>

    <item msgid="3942006483573485941">"Verstek"</item>

    <item msgid="8111006422178051129">"Normaal"</item>

    <item msgid="824386705928670045">"Groot"</item>

    <item msgid="2790561781512874585">"Baie groot"</item>

  </string-array>

  <string-array name="captioning_font_size_selector_summaries">

    <item msgid="5700290209695344464">"Baie klein teksgrootte"</item>

    <item msgid="4400431625665186389">"Klein teksgrootte"</item>

    <item msgid="2340994108094808362">"Verstekteksgrootte"</item>

    <item msgid="6446684863055375405">"Groot teksgrootte"</item>

    <item msgid="6838252010935384975">"Baie groot teksgrootte"</item>

  </string-array>

  <string-array name="captioning_edge_type_selector_titles">

    <item msgid="70686029249840227">"Verstek"</item>

    <item msgid="4224714345662348668">"Geen"</item>
@@ -405,7 +398,7 @@ 
    <item msgid="3237802033158517495">"100%"</item>

  </string-array>

  <string-array name="captioning_preset_selector_titles">

    <item msgid="3880932435325583041">"Stel volgens program"</item>

    <item msgid="4180191497452407161">"Gebruik programverstekke"</item>

    <item msgid="8719204526359229387">"Wit op swart"</item>

    <item msgid="5410164687403735103">"Swart op wit"</item>

    <item msgid="1119043472912497241">"Geel op swart"</item>
@@ -525,7 +518,7 @@ 
    <item msgid="30756226617172695">"CDMA/EvDo/GSM/WCDMA"</item>

    <item msgid="2847125869624632806">"CDMA + LTE/EvDo"</item>

    <item msgid="2247906254631766720">"GSM/WCDMA/LTE"</item>

    <item msgid="4147872615520331421">"LTE/CDMA/EvDo/GSM/WCDMA"</item>

    <item msgid="1091258946200124345">"Globaal"</item>

    <item msgid="2908834445708457736">"LTE"</item>

    <item msgid="2947411877551747693">"LTE/WCDMA"</item>

    <item msgid="7723670142495874534">"Net TDSCDMA"</item>
@@ -542,7 +535,7 @@ 
    <item msgid="8150548370973671395">"NR/LTE"</item>

    <item msgid="5237423971422723128">"NR/LTE/CDMA/EvDo"</item>

    <item msgid="6856991565745877075">"NR/LTE/GSM/WCDMA"</item>

    <item msgid="8908263949185004366">"Globaal"</item>

    <item msgid="473436147270962091">"NR/LTE/CDMA/EvDo/GSM/WCDMA"</item>

    <item msgid="6692179237956480280">"NR/LTE/WCDMA"</item>

    <item msgid="8160757136163231885">"NR/LTE/TDSCDMA"</item>

    <item msgid="2207530656708814396">"NR/LTE/TDSCDMA/GSM"</item>
@@ -553,6 +546,11 @@ 
  <string-array name="cdma_subscription_choices">

    <item msgid="6242790734457941014">"RUIM/SIM"</item>

    <item msgid="8980776035119085660">"NV"</item>

  </string-array>

  <string-array name="preferred_network_mode_choices_world_mode">

    <item msgid="8219021147046131771">"Globaal"</item>

    <item msgid="5291208617720023560">"LTE/CDMA"</item>

    <item msgid="6742002477816975742">"LTE/GSM/UMTS"</item>

  </string-array>

    <!-- no translation found for enhanced_4g_lte_mode_title_variant:0 (1841976293698111057) -->

    <!-- no translation found for enhanced_4g_lte_mode_title_variant:1 (6822859933189908133) -->