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

Commit 079308d9 authored by Nishith Khanna's avatar Nishith Khanna
Browse files

Merge branch '1515-t-chips_color' into 'v1-t' 

Update privacy chip and dialog according to theme

See merge request e/os/android_frameworks_base!171
parents 4e0893f3 105d5f17

packages/SystemUI/res/drawable/qs_dialog_bg.xml

+1 −1
Original line number Diff line number Diff line
@@ -17,6 +17,6 @@ 


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

       android:shape="rectangle">

    <solid android:color="?android:attr/colorBackground" />

    <solid android:color="@color/privacy_dialog_bg" />

    <corners android:radius="?android:attr/dialogCornerRadius" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/layout/privacy_dialog_item.xml

+2 −1
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
        android:layout_marginEnd="16dp"

        android:textDirection="locale"

        android:textAlignment="viewStart"

        android:textColor="@color/privacy_dialog_text"

        android:gravity="start | center_vertical"

        android:textAppearance="@style/TextAppearance.PrivacyDialog"

        android:lineHeight="20sp"
@@ -56,7 +57,7 @@ 
        android:layout_width="24dp"

        android:layout_gravity="center_vertical"

        android:src="@*android:drawable/ic_chevron_end"

        android:tint="?android:attr/textColorPrimary"

        android:tint="@color/privacy_dialog_chevron"

        />



</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/values-night/colors.xml

+5 −0
Original line number Diff line number Diff line
@@ -112,4 +112,9 @@ 
    <color name="udfps_enroll_progress">#7DA7F1</color>

    <color name="udfps_enroll_progress_help">#607DA7F1</color>

    <color name="udfps_enroll_progress_help_with_talkback">#FFEE675C</color>



    <color name="privacy_chip_icon">@*android:color/background_floating_material_dark</color>

    <color name="privacy_dialog_bg">@*android:color/background_floating_material_dark</color>

    <color name="privacy_dialog_text">@*android:color/bright_foreground_holo_dark</color>

    <color name="privacy_dialog_chevron">@*android:color/dim_foreground_holo_dark</color>

</resources>

packages/SystemUI/res/values/colors.xml

+5 −0
Original line number Diff line number Diff line
@@ -254,4 +254,9 @@ 
    <!-- Rear Display Education -->

    <color name="rear_display_overlay_animation_background_color">#1E1B17</color>

    <color name="rear_display_overlay_dialog_background_color">#1E1B17</color>



    <color name="privacy_chip_icon">@*android:color/background_floating_material_light</color>

    <color name="privacy_dialog_bg">@*android:color/background_floating_material_light</color>

    <color name="privacy_dialog_text">@*android:color/bright_foreground_holo_light</color>

    <color name="privacy_dialog_chevron">@*android:color/dim_foreground_holo_light</color>

</resources>

packages/SystemUI/res/values/styles.xml

+0 −1
Original line number Diff line number Diff line
@@ -956,7 +956,6 @@ 
    <style name="TextAppearance.PrivacyDialog">

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

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

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

    </style>



    <!-- Wallet styles -->