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

Commit f568b30b authored by Wenyi Wang's avatar Wenyi Wang
Browse files

Add hamburger menu to PeopleActivity 

1. This CL moves "settings" and "help & feedback" to hamburger menu.
2. Changes in people_activity.xml may be hard to read. We just wrap the
   existing content of people_activity.xml with DrawerLayout and add a
   NavigationView below it: https://paste.googleplex.com/6376771465248768
3. Screenshot https://goto.google.com/contacts-hamburger

Bug 27687799

Change-Id: Ia8ce3746cee9ad63689157dbe0b1ea81200bedf6
parent 3c3b6f1d

Android.mk

+8 −2
Original line number Diff line number Diff line
@@ -20,24 +20,30 @@ src_dirs += src-N $(contacts_common_dir)/src-N $(phone_common_dir)/src-N 


LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs))

LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) \

    $(support_library_root_dir)/design/res \

    $(support_library_root_dir)/v7/appcompat/res \

    $(support_library_root_dir)/v7/cardview/res

    $(support_library_root_dir)/v7/cardview/res \

    $(support_library_root_dir)/v7/recyclerview/res

LOCAL_ASSET_DIR := $(addprefix $(LOCAL_PATH)/, $(asset_dirs))



LOCAL_AAPT_FLAGS := \

    --auto-add-overlay \

    --extra-packages com.android.contacts.common \

    --extra-packages com.android.phone.common \

    --extra-packages android.support.design \

    --extra-packages android.support.v7.appcompat \

    --extra-packages android.support.v7.cardview

    --extra-packages android.support.v7.cardview \

    --extra-packages android.support.v7.recyclerview



LOCAL_STATIC_JAVA_LIBRARIES := \

    com.android.vcard \

    android-common \

    guava \

    android-support-design \

    android-support-v13 \

    android-support-v7-appcompat \

    android-support-v7-cardview \

    android-support-v7-recyclerview \

    android-support-v7-palette \

    android-support-v4 \

    libphonenumber

res/drawable/ic_menu_hamburger.xml

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

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

        android:width="24dp"

        android:height="24dp"

        android:viewportHeight="24.0"

        android:viewportWidth="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M3 18h18v-2H3v2zm0-5h18v-2H3v2zm0-7v2h18V6H3z"/>

</vector>
 
 No newline at end of file

res/drawable/ic_menu_help.xml

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

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

        android:width="24dp"

        android:height="24dp"

        android:viewportHeight="24.0"

        android:viewportWidth="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 17h-2v-2h2v2zm2.07-7.75l-.9.92C13.45 12.9 13 13.5 13 15h-2v-.5c0-1.1.45-2.1 1.17-2.83l1.24-1.26c.37-.36.59-.86.59-1.41 0-1.1-.9-2-2-2s-2 .9-2 2H8c0-2.21 1.79-4 4-4s4 1.79 4 4c0 .88-.36 1.68-.93 2.25z"/>

</vector>

res/drawable/ic_menu_settings.xml

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

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

        android:width="24dp"

        android:height="24dp"

        android:viewportHeight="24.0"

        android:viewportWidth="24.0">

    <path

        android:fillColor="#FF000000"

        android:pathData="M19.43 12.98c.04-.32.07-.64.07-.98s-.03-.66-.07-.98l2.11-1.65c.19-.15.24-.42.12-.64l-2-3.46c-.12-.22-.39-.3-.61-.22l-2.49 1c-.52-.4-1.08-.73-1.69-.98l-.38-2.65C14.46 2.18 14.25 2 14 2h-4c-.25 0-.46.18-.49.42l-.38 2.65c-.61.25-1.17.59-1.69.98l-2.49-1c-.23-.09-.49 0-.61.22l-2 3.46c-.13.22-.07.49.12.64l2.11 1.65c-.04.32-.07.65-.07.98s.03.66.07.98l-2.11 1.65c-.19.15-.24.42-.12.64l2 3.46c.12.22.39.3.61.22l2.49-1c.52.4 1.08.73 1.69.98l.38 2.65c.03.24.24.42.49.42h4c.25 0 .46-.18.49-.42l.38-2.65c.61-.25 1.17-.59 1.69-.98l2.49 1c.23.09.49 0 .61-.22l2-3.46c.12-.22.07-.49-.12-.64l-2.11-1.65zM12 15.5c-1.93 0-3.5-1.57-3.5-3.5s1.57-3.5 3.5-3.5 3.5 1.57 3.5 3.5-1.57 3.5-3.5 3.5z"/>

</vector>

res/drawable/side_nav_bar.xml

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

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

       android:shape="rectangle">

    <gradient

        android:angle="135"

        android:endColor="@color/primary_color_dark"

        android:startColor="@color/primary_color"

        android:type="linear"/>

</shape>
 
 No newline at end of file