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

Commit 6667dc97 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '2798-u-theme' into 'v2.6-u' 

UI fixes

See merge request e/os/android_frameworks_base!244
parents de00019b d8c57a39

packages/SettingsLib/res/values-nl/cm_strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,5 +19,5 @@ 
-->

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

    <string name="screen_zoom_summary_smaller">Kleiner</string>

    <string name="screen_zoom_summary_smallest">Kleinst</string>

    <string name="screen_zoom_summary_smallest">Kleinste</string>

</resources>

packages/SystemUI/res-keyguard/layout/keyguard_sim_pin_view.xml

+2 −2
Original line number Diff line number Diff line
@@ -47,8 +47,8 @@ 


            <ImageView

                android:id="@+id/keyguard_sim"

                android:layout_width="40dp"

                android:layout_height="40dp"

                android:layout_width="60dp"

                android:layout_height="60dp"

                android:layout_gravity="center_horizontal"

                android:src="@drawable/ic_lockscreen_sim"

                app:tint="@color/background_protected" />

packages/SystemUI/res-keyguard/layout/keyguard_sim_puk_view.xml

+2 −2
Original line number Diff line number Diff line
@@ -50,8 +50,8 @@ 


            <ImageView

                android:id="@+id/keyguard_sim"

                android:layout_width="40dp"

                android:layout_height="40dp"

                android:layout_width="60dp"

                android:layout_height="60dp"

                android:layout_gravity="center_horizontal"

                android:src="@drawable/ic_lockscreen_sim"

                app:tint="@color/background_protected" />

packages/SystemUI/res-keyguard/values/styles.xml

+1 −1
Original line number Diff line number Diff line
@@ -45,7 +45,7 @@ 
        <item name="android:textColor">?androidprv:attr/materialColorOnSurfaceVariant</item>

    </style>

    <style name="Keyguard.TextView.EmergencyButton" parent="Theme.SystemUI">

        <item name="android:textColor">?androidprv:attr/materialColorOnTertiaryFixed</item>

        <item name="android:textColor">?android:attr/colorBackground</item>

        <item name="android:textSize">16sp</item>

        <item name="android:background">@drawable/kg_emergency_button_background</item>

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

packages/SystemUI/res/values-az/cm_strings.xml

+1 −1
Original line number Diff line number Diff line
@@ -30,7 +30,7 @@ 
    <string name="global_action_restart_bootloader_progress">Önyükləyici rejimində yenidən başladılır\u2026</string>

    <string name="global_action_restart_download_progress">Endirmə rejimində yenidən başladılır\u2026</string>

    <string name="global_action_restart_fastboot_progress">Fastbootd rejimində yenidən başladılır\u2026</string>

    <string name="global_action_current_user">Hazırki</string>

    <string name="global_action_current_user">Hazırkı</string>

    <string name="global_action_users">İstifadəçilər</string>

    <string name="status_bar_icons_title">Status çubuğu ikonları</string>

    <string name="drag_or_tap_to_add_tiles">Xana əlavə etmək üçün basılı tutub sürükləyin və ya toxunun</string>