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

Commit 36036581 authored by Ivan Chiang's avatar Ivan Chiang Committed by Android (Google) Code Review
Browse files

Merge "Fine tune the UI of hamburger Menu"

parents 2df28fbd b7543de4

res/drawable/ic_exit_to_app.xml

0 → 100644
+24 −0
Original line number Diff line number Diff line 
<!--

Copyright (C) 2018 The Android Open Source Project



   Licensed under the Apache License, Version 2.0 (the "License");

    you may not use this file except in compliance with the License.

    You may obtain a copy of the License at



         http://www.apache.org/licenses/LICENSE-2.0



    Unless required by applicable law or agreed to in writing, software

    distributed under the License is distributed on an "AS IS" BASIS,

    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

    See the License for the specific language governing permissions and

    limitations under the License.

-->

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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:fillColor="?android:textColorPrimary"

        android:pathData="M10.09 15.59L11.5 17l5-5-5-5-1.41 1.41L12.67 11H3v2h9.67l-2.58 2.59zM19 3H5c-1.11 0-2 .9-2 2v4h2V5h14v14H5v-4H3v4c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2z"/>

</vector>

res/layout/item_root.xml

+10 −5
Original line number Diff line number Diff line
@@ -69,18 +69,23 @@ 


    </LinearLayout>



    <include layout="@layout/root_vertical_divider" />



    <FrameLayout

        android:id="@+id/action_icon_area"

        android:layout_width="@dimen/icon_size"

        android:layout_height="@dimen/icon_size"

        android:duplicateParentState="true">

        android:paddingEnd="@dimen/grid_padding_horiz"

        android:duplicateParentState="true"

        android:visibility="gone">



        <ImageView

            android:id="@+id/eject_icon"

            android:id="@+id/action_icon"

            android:focusable="false"

            android:layout_width="@dimen/root_icon_size"

            android:layout_height="match_parent"

            android:scaleType="centerInside"

            android:contentDescription="@string/menu_eject_root"

            android:visibility="gone" />

            android:layout_gravity="center"

            android:scaleType="centerInside"/>



    </FrameLayout>

res/layout/root_vertical_divider.xml

0 → 100644
+34 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2018 The Android Open Source Project



  Licensed under the Apache License, Version 2.0 (the "License");

  you may not use this file except in compliance with the License.

  You may obtain a copy of the License at



       http://www.apache.org/licenses/LICENSE-2.0



  Unless required by applicable law or agreed to in writing, software

  distributed under the License is distributed on an "AS IS" BASIS,

  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.

  See the License for the specific language governing permissions and

  limitations under the License.

  -->



<LinearLayout

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

    android:id="@+id/vertical_divider"

    android:layout_width="wrap_content"

    android:layout_height="match_parent"

    android:gravity="start|center_vertical"

    android:orientation="horizontal"

    android:paddingTop="@dimen/drawer_edge_width"

    android:paddingBottom="@dimen/drawer_edge_width"

    android:paddingStart="@dimen/grid_padding_horiz"

    android:paddingEnd="@dimen/grid_padding_horiz"

    android:visibility="gone">

    <View

        android:layout_width="1dp"

        android:layout_height="match_parent"

        android:background="?android:attr/listDivider"/>

</LinearLayout>
 
 No newline at end of file

res/values/colors.xml

+17 −15
Original line number Diff line number Diff line
@@ -18,32 +18,34 @@ 
    <!-- 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). -->

    <color name="g_dark_grey">#ff202124</color>     <!--M2 Grey 900-->

    <color name="g_grey">#ff3c4043</color>          <!--M2 Grey 800-->

    <color name="g_light_grey">#fff1f3f4</color>    <!--M2 Grey 100-->

    <color name="g_dark_grey">#ff202124</color>

    <color name="g_grey">#ff3c4043</color>

    <color name="g_light_grey">#fff1f3f4</color>

    <color name="drawer_border">#ffd4d4d4</color>

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



    <color name="primary_dark">@color/g_dark_grey</color>

    <color name="primary">@android:color/white</color>

    <color name="accent">#004ac2</color>            <!--M2 Google Blue 900-->

    <color name="accent_dark">#2297f0</color>       <!--M2 Google Blue 600-->

    <color name="accent">#004ac2</color>

    <color name="accent_dark">#2297f0</color>



    <color name="text_cursor">@color/text_hint</color>

    <color name="text_cursor_dark">@color/text_hint_dark</color>

    <color name="text_handle">#ffcdf5fa</color>         <!--M2 Google Blue 100-->

    <color name="text_handle_dark">#ff3ce4fa</color>    <!--M2 Google Blue 400-->

    <color name="text_highlight">#ffcdf5fa</color>      <!--M2 Google Blue 100-->

    <color name="text_highlight_dark">#ff3ce4fa</color> <!--M2 Google Blue 400-->

    <color name="text_hint">#ff80868b</color>           <!--M2 Google Grey 600-->

    <color name="text_hint_dark">#fff8f9fa</color>      <!--M2 Google Grey 50-->

    <color name="text_secondary">#ff5f6368</color>      <!--M2 Google Grey 700-->

    <color name="text_handle">#ffcdf5fa</color>

    <color name="text_handle_dark">#ff3ce4fa</color>

    <color name="text_highlight">#ffcdf5fa</color>

    <color name="text_highlight_dark">#ff3ce4fa</color>

    <color name="text_hint">#ff80868b</color>

    <color name="text_hint_dark">#fff8f9fa</color>

    <color name="text_secondary">#ff5f6368</color>



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

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



    <color name="drawer_title_color">?android:attr/textColorPrimary</color>



    <color name="root_title_color">#de000000</color>

    <color name="root_activated_color">#ff127beb</color>    <!--M2 Google Blue 700-->

    <color name="root_activated_color">#ff127beb</color>

    <color name="root_details_color">#8a000000</color>

    <color name="root_focus_color">?android:attr/colorControlHighlight</color>
@@ -69,8 +71,8 @@ 
    <color name="item_breadcrumb_background_hovered">#1affffff</color>

    <color name="item_doc_droppable_background">#ffe8f0fb</color>

    <color name="item_doc_not_droppable_background">#ffe0e0e0</color>

    <color name="item_grid_tint">#ff127beb</color>                  <!--M2 Google Blue 700-->

    <color name="item_grid_tint_dark">#ff0e70e8</color>             <!--M2 Google Blue 800-->

    <color name="item_grid_tint">#ff127beb</color>

    <color name="item_grid_tint_dark">#ff0e70e8</color>



    <color name="item_drag_shadow_background">@android:color/white</color>

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