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

Commit c5e73868 authored by Adam Lesinski's avatar Adam Lesinski Committed by Android (Google) Code Review
Browse files

Merge "Remove duplicate resource definitions"

parents acda6e02 60862bd1

packages/SystemUI/res/layout-television/recents_tv_card_info_field.xml

+2 −3
Original line number Diff line number Diff line
@@ -18,8 +18,7 @@ 
        xmlns:tools="http://schemas.android.com/tools"

        android:id="@+id/card_info_field"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        tools:showIn="@layout/recents_tv_task_card_view_fallback_banner">

        android:layout_height="wrap_content">

    <ImageView

            android:id="@+id/card_extra_badge"

            android:layout_width="@dimen/recents_tv_card_extra_badge_size"

packages/SystemUI/res/values-af/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ 
    <string name="accessibility_desc_settings" msgid="3417884241751434521">"Instellings"</string>

    <string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"Oorsig."</string>

    <string name="accessibility_desc_close" msgid="7479755364962766729">"Maak toe"</string>

    <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"Gebruiker <xliff:g id="USER">%s</xliff:g>."</string>

    <string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>

    <string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wi-Fi afgeskakel."</string>

    <string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wi-Fi aangeskakel."</string>

packages/SystemUI/res/values-am/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -185,7 +185,6 @@ 
    <string name="accessibility_desc_settings" msgid="3417884241751434521">"ቅንብሮች"</string>

    <string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"አጠቃላይ እይታ።"</string>

    <string name="accessibility_desc_close" msgid="7479755364962766729">"ዝጋ"</string>

    <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"ተጠቃሚ <xliff:g id="USER">%s</xliff:g>።"</string>

    <string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>።"</string>

    <string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wifi ጠፍቷል።"</string>

    <string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wifi በርቷል።"</string>

packages/SystemUI/res/values-ar/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -188,7 +188,6 @@ 
    <string name="accessibility_desc_settings" msgid="3417884241751434521">"الإعدادات"</string>

    <string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"النظرة عامة."</string>

    <string name="accessibility_desc_close" msgid="7479755364962766729">"إغلاق"</string>

    <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"المستخدم <xliff:g id="USER">%s</xliff:g>."</string>

    <string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>

    <string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"‏تم إيقاف Wifi."</string>

    <string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"‏تم تشغيل Wifi."</string>

packages/SystemUI/res/values-az-rAZ/strings.xml

+0 −1
Original line number Diff line number Diff line
@@ -184,7 +184,6 @@ 
    <string name="accessibility_desc_settings" msgid="3417884241751434521">"Ayarlar"</string>

    <string name="accessibility_desc_recent_apps" msgid="4876900986661819788">"İcmal"</string>

    <string name="accessibility_desc_close" msgid="7479755364962766729">"Qapadın"</string>

    <string name="accessibility_quick_settings_user" msgid="1104846699869476855">"İstifadəçi <xliff:g id="USER">%s</xliff:g>."</string>

    <string name="accessibility_quick_settings_wifi" msgid="5518210213118181692">"<xliff:g id="SIGNAL">%1$s</xliff:g>."</string>

    <string name="accessibility_quick_settings_wifi_changed_off" msgid="8716484460897819400">"Wifi deaktivdir."</string>

    <string name="accessibility_quick_settings_wifi_changed_on" msgid="6440117170789528622">"Wifi aktivdir."</string>