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

Commit ce9c5064 authored by Nishith  Khanna's avatar Nishith Khanna
Browse files

Merge branch 'lineage-20.0' into v1-t

parents 6e16b075 37670b2e
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@

<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
    android:opacity="opaque">
  <item android:drawable="@color/background_material_dark" />
  <item android:drawable="@android:color/system_neutral1_900" />
  <item
      android:id="@+id/launchscreens_product_logo"
      android:bottom="@dimen/launchscreens_product_logo_bottom">
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@

<layer-list xmlns:android="http://schemas.android.com/apk/res/android"
    android:opacity="opaque">
  <item android:drawable="@android:color/white" />
  <item android:drawable="@android:color/system_neutral1_0" />
  <item
      android:id="@+id/launchscreens_product_logo"
      android:bottom="@dimen/launchscreens_product_logo_bottom">
+4 −0
Original line number Diff line number Diff line
@@ -9,4 +9,8 @@

    <!-- Color of contact name in list. -->
    <color name="contact_list_name_text_color">#dadada</color>

    <!-- Color of the background of the contact detail and editor pages -->
    <color name="background_primary">@*android:color/system_neutral1_900</color>
    <color name="contact_all_list_background_color">@*android:color/system_neutral1_900</color>
</resources>
+3 −3
Original line number Diff line number Diff line
@@ -47,12 +47,12 @@
    <color name="group_primary_color">@color/e_action_bar</color>

    <!-- Color of the selected tab underline -->
    <color name="contacts_accent_color">#FFFFFF</color>
    <color name="contacts_accent_color">@*android:color/system_neutral1_0</color>

    <color name="floating_action_button_icon_color">@color/e_background</color>

    <!-- Horizontal separator line should be 12% dark in the light theme. -->
    <color name="divider_line_color_light">#e0e0e0</color>
    <color name="divider_line_color_light">@*android:color/transparent</color>

    <!-- Color of the text on an ExpandingEntryCard button -->
    <color name="expanding_entry_card_button_text_color">@android:color/black</color>
@@ -105,7 +105,7 @@
    <color name="section_header_text_color">@color/e_primary_text_color</color>

    <!-- Color of the theme of the People app -->
    <color name="people_app_theme_color">#363636</color>
    <color name="people_app_theme_color">@*android:color/system_neutral1_800</color>

    <!-- Color of the theme of the Dialer app -->
    <color name="dialtacts_theme_color">@color/e_accent</color>