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

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

Merge stage-dr1-aosp-master into stage-aosp-master 

Bug: 112535855
Change-Id: Ifd79dc537052cc78e7f5451316d637b24c9830ca
parents b69559f8 2c23e6ab

AndroidManifest.xml

+14 −0
Original line number Diff line number Diff line
@@ -463,6 +463,20 @@ 
                android:value="com.android.settings.TetherSettings" />

        </activity>



        <activity

            android:name="Settings$WifiTetherSettingsActivity"

            android:label="@string/wifi_hotspot_checkbox_text"

            android:icon="@drawable/ic_wifi_tethering"

            android:parentActivityName="Settings">

            <intent-filter>

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

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                android:value="com.android.settings.wifi.tether.WifiTetherSettings" />

        </activity>





        <!-- Keep compatibility with old shortcuts. -->

        <activity-alias android:name=".TetherSettings"

                  android:label="@string/tether_settings_title_all"

res/values-af/arrays.xml

+10 −26
Original line number Diff line number Diff line
@@ -100,12 +100,6 @@ 
    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->

    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->

    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->

    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->

    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->

  <string-array name="wifi_tether_security_values">

    <item msgid="2252927183588236198">"4"</item>

    <item msgid="5900372418924184351">"0"</item>

  </string-array>

  <string-array name="wifi_eap_method">

    <item msgid="1160193392455075561">"PEAP"</item>

    <item msgid="7981731051382306293">"TLS"</item>
@@ -123,8 +117,7 @@ 
  </string-array>

    <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->

    <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->

    <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->

    <!-- no translation found for wifi_ap_band_summary_full:1 (311895158827229479) -->

    <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->

    <!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->

    <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->

  <string-array name="wifi_p2p_wps_setup">
@@ -145,14 +138,12 @@ 
    <item msgid="477015974247590543">"1 uur"</item>

    <item msgid="5198271470953124739">"Moenie uittel nie"</item>

  </string-array>

  <string-array name="bluetooth_max_connected_audio_devices">

    <item msgid="834764606877643762">"Gebruik stelselverstek: <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>

    <item msgid="4428462068012149533">"1"</item>

    <item msgid="2620881722754455257">"2"</item>

    <item msgid="402831176731135702">"3"</item>

    <item msgid="4923580285404888038">"4"</item>

    <item msgid="3643103044864989283">"5"</item>

  </string-array>

    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->

    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->

    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->

    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->

    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->

    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->

  <string-array name="wifi_signal">

    <item msgid="2245412278046491293">"Swak"</item>

    <item msgid="2042505933058940139">"Swak"</item>
@@ -387,7 +378,7 @@ 
  </string-array>

  <string-array name="long_press_timeout_selector_titles">

    <item msgid="3511504869290423954">"Kort"</item>

    <item msgid="2560532955514699713">"Middelmatig"</item>

    <item msgid="2560532955514699713">"Medium"</item>

    <item msgid="2372711992605524591">"Lank"</item>

  </string-array>

  <string-array name="captioning_typeface_selector_titles">
@@ -428,7 +419,7 @@ 
    <item msgid="758587126802411846">"Swart op wit"</item>

    <item msgid="1495307195241623402">"Geel op swart"</item>

    <item msgid="6039700130994371612">"Geel op blou"</item>

    <item msgid="7169235156349580064">"Gepasmaak"</item>

    <item msgid="7169235156349580064">"Pasgemaak"</item>

  </string-array>

  <string-array name="vpn_types_long">

    <item msgid="2732002039459078847">"PPTP VPN"</item>
@@ -494,20 +485,13 @@ 
    <item msgid="5692284879054004388">"Meer as 90 dae oud"</item>

  </string-array>

  <string-array name="wifi_metered_entries">

    <item msgid="5200910605264415911">"Bespeur outomaties"</item>

    <item msgid="2975784243692054526">"Gebruik netwerkvoorkeur"</item>

    <item msgid="8745603368609022803">"Hanteer as beperk"</item>

    <item msgid="2266114985518865625">"Hanteer as onbeperk"</item>

  </string-array>

  <string-array name="wifi_hidden_entries">

    <item msgid="234221371123852300">"Nee"</item>

    <item msgid="3863157480502955888">"Ja"</item>

  </string-array>

  <string-array name="dark_ui_mode_entries">

    <item msgid="146804192658443142">"Outomaties (op grond van die tyd van die dag)"</item>

    <item msgid="6620560879508595181">"Altyd aan"</item>

    <item msgid="6385301106124765323">"Altyd af"</item>

  </string-array>

    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->

    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->

    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->

</resources>

res/values-af/strings.xml

+208 −484

File changed.

Preview size limit exceeded, changes collapsed.

res/values-am/arrays.xml

+9 −25
Original line number Diff line number Diff line
@@ -100,12 +100,6 @@ 
    <!-- no translation found for wifi_security_no_eap:0 (2084555984818107151) -->

    <!-- no translation found for wifi_security_no_eap:1 (397579322683471524) -->

    <!-- no translation found for wifi_security_no_eap:2 (1968820975358150484) -->

    <!-- no translation found for wifi_tether_security:0 (1748357338693290598) -->

    <!-- no translation found for wifi_tether_security:1 (4760482622566629462) -->

  <string-array name="wifi_tether_security_values">

    <item msgid="2252927183588236198">"4"</item>

    <item msgid="5900372418924184351">"0"</item>

  </string-array>

  <string-array name="wifi_eap_method">

    <item msgid="1160193392455075561">"PEAP"</item>

    <item msgid="7981731051382306293">"TLS"</item>
@@ -123,8 +117,7 @@ 
  </string-array>

    <!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->

    <!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->

    <!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->

    <!-- no translation found for wifi_ap_band_summary_full:1 (311895158827229479) -->

    <!-- no translation found for wifi_ap_band_config_full:2 (3580217704310339410) -->

    <!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->

    <!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->

  <string-array name="wifi_p2p_wps_setup">
@@ -145,14 +138,12 @@ 
    <item msgid="477015974247590543">"1 ሰዓት"</item>

    <item msgid="5198271470953124739">"በጭራሽ አታቋርጥ"</item>

  </string-array>

  <string-array name="bluetooth_max_connected_audio_devices">

    <item msgid="834764606877643762">"የስርዓት ነባሪ ይጠቀሙ፦ <xliff:g id="DEFAULT_BLUETOOTH_MAX_CONNECTED_AUDIO_DEVICES">%1$d</xliff:g>"</item>

    <item msgid="4428462068012149533">"1"</item>

    <item msgid="2620881722754455257">"2"</item>

    <item msgid="402831176731135702">"3"</item>

    <item msgid="4923580285404888038">"4"</item>

    <item msgid="3643103044864989283">"5"</item>

  </string-array>

    <!-- no translation found for bluetooth_max_connected_audio_devices:0 (834764606877643762) -->

    <!-- no translation found for bluetooth_max_connected_audio_devices:1 (4428462068012149533) -->

    <!-- no translation found for bluetooth_max_connected_audio_devices:2 (2620881722754455257) -->

    <!-- no translation found for bluetooth_max_connected_audio_devices:3 (402831176731135702) -->

    <!-- no translation found for bluetooth_max_connected_audio_devices:4 (4923580285404888038) -->

    <!-- no translation found for bluetooth_max_connected_audio_devices:5 (3643103044864989283) -->

  <string-array name="wifi_signal">

    <item msgid="2245412278046491293">"ደካማ"</item>

    <item msgid="2042505933058940139">"ደካማ"</item>
@@ -371,7 +362,7 @@ 
    <item msgid="5964768335278263478">"የረዳት መዋቅር"</item>

    <item msgid="2657138701132782702">"የረዳት ቅጽበታዊ ገጽ እይታ"</item>

    <item msgid="8571369610363539266">"የስልክ ግዛት ያንብቡ"</item>

    <item msgid="4542463358215230845">"የድምጽ መልዕክት ያክሉ"</item>

    <item msgid="4542463358215230845">"የድምጽ መልእክት ያክሉ"</item>

    <item msgid="864565065016166003">"sip ይጠቀሙ"</item>

    <item msgid="1958009349883195116">"ወጪ ጥሪን አስኪድ"</item>

    <item msgid="8526563410140613458">"የጣት አሻራ"</item>
@@ -494,20 +485,13 @@ 
    <item msgid="5692284879054004388">"ከ90 ቀኖች በላይ የሆናቸው"</item>

  </string-array>

  <string-array name="wifi_metered_entries">

    <item msgid="5200910605264415911">"በራስ-ሰር አግኝ"</item>

    <item msgid="2975784243692054526">"የአውታረ መረብ ምርጫን ተጠቀም"</item>

    <item msgid="8745603368609022803">"እንደ ተለካ አስተናግድ"</item>

    <item msgid="2266114985518865625">"እንደ ያልተለካ አስተናግድ"</item>

  </string-array>

  <string-array name="wifi_hidden_entries">

    <item msgid="234221371123852300">"አይ"</item>

    <item msgid="3863157480502955888">"አዎ"</item>

  </string-array>

  <string-array name="dark_ui_mode_entries">

    <item msgid="146804192658443142">"ራስ-ሰር (በቀኑ ጊዜ ላይ በመመርኮዝ)"</item>

    <item msgid="6620560879508595181">"ሁልጊዜ አብራ"</item>

    <item msgid="6385301106124765323">"ሁልጊዜ አጥፋ"</item>

  </string-array>

    <!-- no translation found for systemui_theme_entries:0 (2470122177508109711) -->

    <!-- no translation found for systemui_theme_entries:1 (5595198131199979987) -->

    <!-- no translation found for systemui_theme_entries:2 (883155044873038544) -->

</resources>

res/values-am/strings.xml

+185 −461

File changed.

Preview size limit exceeded, changes collapsed.