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

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

Merge Coral/Flame into AOSP master 

Bug: 141248619
Change-Id: I51f1a2ca3dc80d779ac0522e3e91070736eb6851
Merged-In: I76f971e04ea413fc446867812ea6f542aaf824c0
parents da5e88a4 1bef6736

res/layout/request_role_view.xml

+6 −2
Original line number Diff line number Diff line
@@ -16,12 +16,16 @@ 
  ~ limitations under the License.

  -->



<FrameLayout

<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    style="@style/RequestRoleView">



    <ListView

        android:id="@+id/list"

        style="@style/RequestRoleViewListView" />



    <CheckBox

        android:id="@+id/dont_ask_again"

        android:text="@string/request_role_dont_ask_again"

        style="@style/RequestRoleViewCheckbox" />

</FrameLayout>
 
</LinearLayout>

res/values-af-television/strings.xml

+9 −9
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 


<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="grant_dialog_button_deny_dont_ask_again" msgid="7721279038965659947">"Weier en moenie weer vra nie"</string>

    <string name="grant_dialog_how_to_change" msgid="1457823911185462983">"Jy kan dit later verander in Instellings &gt; Programme"</string>

    <string name="current_permission_template" msgid="4118665041847213236">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>

    <string name="preference_show_system_apps" msgid="4678781389736017160">"Wys stelselprogramme"</string>

    <string name="app_permissions_decor_title" msgid="6741131742122538279">"Programtoestemmings"</string>

    <string name="manage_permissions_decor_title" msgid="2141772075499530041">"Programtoestemmings"</string>

    <string name="permission_apps_decor_title" msgid="8174296221656857830">"<xliff:g id="PERMISSION">%1$s</xliff:g>-toestemmings"</string>

    <string name="additional_permissions_decor_title" msgid="481207295679483982">"Bykomende toestemmings"</string>

    <string name="system_apps_decor_title" msgid="6907923614189992830">"<xliff:g id="PERMISSION">%1$s</xliff:g>-toestemmings"</string>

    <string name="grant_dialog_button_deny_dont_ask_again" msgid="5694574989758145558">"Weier en moenie weer vra nie"</string>

    <string name="grant_dialog_how_to_change" msgid="615414835189256888">"Jy kan dit later verander in Instellings &gt; Programme"</string>

    <string name="current_permission_template" msgid="4793247012451594523">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>

    <string name="preference_show_system_apps" msgid="7330308025768596149">"Wys stelselprogramme"</string>

    <string name="app_permissions_decor_title" msgid="1461057434211920209">"Programtoestemmings"</string>

    <string name="manage_permissions_decor_title" msgid="4823785025722958092">"Programtoestemmings"</string>

    <string name="permission_apps_decor_title" msgid="3644363529649579576">"<xliff:g id="PERMISSION">%1$s</xliff:g>toestemmings"</string>

    <string name="additional_permissions_decor_title" msgid="7000432624396037882">"Bykomende toestemmings"</string>

    <string name="system_apps_decor_title" msgid="5292119639812561805">"<xliff:g id="PERMISSION">%1$s</xliff:g>toestemmings"</string>

</resources>

res/values-af-watch/strings.xml

+6 −6
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 


<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="grant_dialog_button_deny_dont_ask_again" msgid="2362190433398675134">"Weier; moenie weer vra nie"</string>

    <string name="current_permission_template" msgid="2021373647237300894">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>

    <string name="preference_show_system_apps" msgid="4294454268471039411">"Wys stelselprogramme"</string>

    <string name="permission_summary_enforced_by_policy" msgid="4585829669508910191">"Onveranderbaar"</string>

    <string name="generic_yes" msgid="4382007256855869198">"Ja"</string>

    <string name="generic_cancel" msgid="1201376302604725627">"Kanselleer"</string>

    <string name="grant_dialog_button_deny_dont_ask_again" msgid="5828565432145544298">"Weier; moenie weer vra nie"</string>

    <string name="current_permission_template" msgid="6691830243038105737">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>

    <string name="preference_show_system_apps" msgid="7042886929865431207">"Wys stelselprogramme"</string>

    <string name="permission_summary_enforced_by_policy" msgid="9002523259681588936">"Onveranderbaar"</string>

    <string name="generic_yes" msgid="3394094077553763689">"Ja"</string>

    <string name="generic_cancel" msgid="6384078447202012984">"Kanselleer"</string>

</resources>

res/values-af/strings.xml

+274 −187

File changed.

Preview size limit exceeded, changes collapsed.

res/values-am-television/strings.xml

+9 −9
Original line number Diff line number Diff line
@@ -16,13 +16,13 @@ 


<resources xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <string name="grant_dialog_button_deny_dont_ask_again" msgid="7721279038965659947">"አትቀበል እና እንደገና አትጠይቅ"</string>

    <string name="grant_dialog_how_to_change" msgid="1457823911185462983">"ይሄንን በኋላ ላይ በቅንብሮችና መተግበሪያዎች ውስጥ ሊቀይሩት ይችላሉ"</string>

    <string name="current_permission_template" msgid="4118665041847213236">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>

    <string name="preference_show_system_apps" msgid="4678781389736017160">"የሥርዓት መተግበሪያዎችን አሳይ"</string>

    <string name="app_permissions_decor_title" msgid="6741131742122538279">"የመተግበሪያ ፈቃዶች"</string>

    <string name="manage_permissions_decor_title" msgid="2141772075499530041">"የመተግበሪያ ፈቃዶች"</string>

    <string name="permission_apps_decor_title" msgid="8174296221656857830">"<xliff:g id="PERMISSION">%1$s</xliff:g> ፈቃዶች"</string>

    <string name="additional_permissions_decor_title" msgid="481207295679483982">"ተጨማሪ ፈቃዶች"</string>

    <string name="system_apps_decor_title" msgid="6907923614189992830">"<xliff:g id="PERMISSION">%1$s</xliff:g> ፈቃዶች"</string>

    <string name="grant_dialog_button_deny_dont_ask_again" msgid="5694574989758145558">"አይቀበሉና እንደገና ይጠይቁ"</string>

    <string name="grant_dialog_how_to_change" msgid="615414835189256888">"ይሄንን በኋላ ላይ በቅንብሮችና መተግበሪያዎች ውስጥ ሊቀይሩት ይችላሉ"</string>

    <string name="current_permission_template" msgid="4793247012451594523">"<xliff:g id="CURRENT_PERMISSION_INDEX">%1$s</xliff:g> / <xliff:g id="PERMISSION_COUNT">%2$s</xliff:g>"</string>

    <string name="preference_show_system_apps" msgid="7330308025768596149">"የስርዓት መተግበሪያዎችን አሳይ"</string>

    <string name="app_permissions_decor_title" msgid="1461057434211920209">"የመተግበሪያ ፈቃዶች"</string>

    <string name="manage_permissions_decor_title" msgid="4823785025722958092">"የመተግበሪያ ፈቃዶች"</string>

    <string name="permission_apps_decor_title" msgid="3644363529649579576">"<xliff:g id="PERMISSION">%1$s</xliff:g> ፈቃዶች"</string>

    <string name="additional_permissions_decor_title" msgid="7000432624396037882">"ተጨማሪ ፈቃዶች"</string>

    <string name="system_apps_decor_title" msgid="5292119639812561805">"<xliff:g id="PERMISSION">%1$s</xliff:g> ፈቃዶች"</string>

</resources>