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

Commit 9dbd9d48 authored by Aayush Gupta's avatar Aayush Gupta
Browse files

Merge branch 'r_theme_changes' into 'v1-r' 

settings: Theme according to our mockups

See merge request !86
parents 368a52c9 3f1b4bfb

res/drawable/ic_arrow_back.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    android:viewportWidth="24"

    android:viewportHeight="24"

    android:autoMirrored="true"

    android:tint="?android:attr/colorControlNormal">

    android:tint="@lineageos.platform:color/color_default_accent">

    <path

        android:fillColor="@android:color/white"

        android:pathData="M20,11H7.83l5.59-5.59L12,4l-8,8l8,8l1.41-1.41L7.83,13H20V11z" />

res/drawable/ic_find_in_page_24px.xml

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 
    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?android:attr/colorControlNormal">

    android:tint="@lineageos.platform:color/color_default_accent">

  <path

      android:fillColor="#FFFFFFFF"

      android:pathData="M6,2C4.9,2 4.01,2.9 4.01,4L4,20c0,1.1 0.89,2 1.99,2H18c1.1,0 2,-0.9 2,-2V8l-6,-6H6zM18,17.59l-2.2,-2.2c0.44,-0.69 0.7,-1.51 0.7,-2.39c0,-2.48 -2.02,-4.5 -4.5,-4.5S7.5,10.52 7.5,13s2.02,4.5 4.5,4.5c0.88,0 1.69,-0.26 2.39,-0.7l3.2,3.2L6,20V4h7.17L18,8.83V17.59zM12,15.5c-1.38,0 -2.5,-1.12 -2.5,-2.5s1.12,-2.5 2.5,-2.5s2.5,1.12 2.5,2.5S13.38,15.5 12,15.5z"/>

res/layout/switch_bar.xml

+2 −3
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ 
        android:maxLines="2"

        android:ellipsize="end"

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

        android:textColor="?android:attr/textColorPrimaryInverse"

        android:textColor="@lineageos.platform:color/color_default_primary_text"

        android:textAlignment="viewStart"/>



    <ImageView
@@ -45,8 +45,7 @@ 
        android:id="@+id/switch_widget"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:theme="@style/Widget.SwitchBar.Switch"/>

        android:layout_gravity="center_vertical" />



</merge>

res/menu/time_zone_base_search_menu.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    <item

        android:id="@+id/time_zone_search_menu"

        android:title="@string/search_settings"

        android:icon="@drawable/ic_search_24dp"

        android:icon="@drawable/ic_homepage_search"

        android:showAsAction="always|collapseActionView"

        android:actionViewClass="android.widget.SearchView" />

res/values-night/colors.xml

+0 −3
Original line number Diff line number Diff line
@@ -20,10 +20,7 @@ 
    <color name="homepage_accessibility_background">#783BE5</color>

    <color name="homepage_support_background">#3F5FBD</color>

    <color name="homepage_card_dismissal_background">@*android:color/material_grey_900</color>

    <color name="contextual_card_background">@*android:color/material_grey_900</color>

    <color name="search_bar_background">@*android:color/material_grey_800</color>

    <!-- Dialog background color. -->

    <color name="dialog_background">@*android:color/material_grey_800</color>

    <color name="notification_importance_selection_bg">@*android:color/material_grey_800</color>

    <color name="notification_importance_button_selected">#AECBFA</color> <!-- material blue 200 -->

    <color name="notification_importance_button_unselected">#5F6368</color>