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

Commit 0ac9222e authored by Andrew Sapperstein's avatar Andrew Sapperstein
Browse files

resolve merge conflicts of 2573d83 to nyc-andromeda-dev 

Change-Id: I9b778aacf7be44585dcb2025551c1adff4963134
parents 2c112ecf 83a603ae

res/drawable/ic_check_circle.xml

+1 −1
Original line number Diff line number Diff line
@@ -19,6 +19,6 @@ Copyright (C) 2016 The Android Open Source Project 
        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="#FF009688"

        android:fillColor="?android:attr/colorAccent"

        android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10,-4.48 10,-10S17.52 2 12 2zm-2 15l-5,-5 1.41,-1.41L10 14.17l7.59,-7.59L19 8l-9 9z"/>

</vector>

res/values/attrs.xml

+0 −4
Original line number Diff line number Diff line
@@ -14,10 +14,6 @@ 
     limitations under the License.

-->

<resources>

    <declare-styleable name="DocumentsTheme">

        <attr name="colorActionMode" format="color"/>

    </declare-styleable>



    <declare-styleable name="HighlightedItemView">

        <attr name="state_highlighted" format="boolean"/>

    </declare-styleable>

res/values/colors.xml

+7 −13
Original line number Diff line number Diff line
@@ -15,9 +15,6 @@ 
-->



<resources>

    <color name="material_grey_400">#ffbdbdbd</color>

    <color name="material_teal_700">#ff00796b</color>



    <!-- This is the window background, but also the background for anything

         else that needs to manually declare a background matching the "default"

         app background (e.g. the drawer overlay). -->
@@ -26,23 +23,20 @@ 
    <color name="directory_background">#fff7f7f7</color>

    <color name="menu_search_background">@android:color/transparent</color>



    <color name="primary_dark">@*android:color/primary_dark_material_dark</color>

    <color name="primary">@*android:color/material_blue_grey_900</color>

    <color name="accent">@*android:color/accent_material_light</color>

    <color name="accent_dark">@*android:color/accent_material_dark</color>

    <color name="action_mode">@color/material_grey_400</color>

    <color name="status_bar_color">@*android:color/material_blue_grey_950</color>

    <color name="primary_dark">@*android:color/primary_dark_device_default_settings</color>

    <color name="primary">@*android:color/primary_device_default_settings</color>

    <color name="accent">@*android:color/accent_device_default_light</color>

    <color name="accent_dark">@*android:color/accent_device_default_dark</color>



    <color name="band_select_background">#88ffffff</color>

    <color name="band_select_border">#44000000</color>



    <color name="item_doc_background_disabled">#fff4f4f4</color>



    <color name="root_activated_color">@color/material_teal_700</color>

    <color name="root_activated_color">@*android:color/accent_device_default_700</color>



    <!-- TODO: Would be nice to move this to a color-set, but not sure how to support animation -->

    <color name="item_doc_background">#fffafafa</color>

    <color name="item_doc_background_selected">#ffe0f2f1</color>

    <color name="item_doc_background_disabled">#fff4f4f4</color>

    <color name="item_doc_background_selected">@*android:color/accent_device_default_50</color>

    <color name="item_breadcrumb_background_hovered">#1affffff</color>



</resources>

res/values/styles.xml

+1 −2
Original line number Diff line number Diff line
@@ -28,9 +28,8 @@ 
        <item name="android:colorPrimaryDark">@color/primary_dark</item>

        <item name="android:colorPrimary">@color/primary</item>

        <item name="android:colorAccent">@color/accent</item>

        <item name="colorActionMode">@color/action_mode</item>

        <item name="android:colorControlActivated">?android:attr/colorAccent</item>

        <item name="android:queryBackground">@color/menu_search_background</item>

        <item name="android:statusBarColor">@color/status_bar_color</item>



        <item name="android:listDivider">@*android:drawable/list_divider_material</item>