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

Commit 92f02b80 authored by Wenyi Wang's avatar Wenyi Wang
Browse files

resolve merge conflicts of 2829deb5 to master 

Test: build locally

Change-Id: I37187546adacb8431143a9cafd745ca09137d972
parents cf61e4f3 2829deb5

res/drawable/drawer_item_background.xml

+6 −9
Original line number Original line Diff line number Diff line
@@ -14,12 +14,9 @@ 
     limitations under the License.

     limitations under the License.

-->

-->





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



        android:color="@color/nav_item_selected_background">

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

  <item>

  <item android:state_activated="true"

    <selector>

        android:drawable="@color/drawer_selected_color"/>

      <item android:drawable="@color/nav_item_selected_background" android:state_checked="true"/>

  <item android:drawable="@drawable/ripple_background" />

      <item android:drawable="@android:color/transparent"/>

</selector>
 
</selector>
 
 No newline at end of file
 
  </item>

</ripple>
 
 No newline at end of file

res/drawable/ripple_background.xml

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



<!-- Copyright (C) 2017 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.

-->



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

        android:color="@color/control_highlight_color" />
 
 No newline at end of file

res/layout/contacts_drawer_activity.xml

+5 −10
Original line number Original line Diff line number Diff line
@@ -17,7 +17,6 @@ 




<android.support.v4.widget.DrawerLayout

<android.support.v4.widget.DrawerLayout

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

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

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

    xmlns:tools="http://schemas.android.com/tools"

    xmlns:tools="http://schemas.android.com/tools"

    android:id="@+id/drawer_layout"

    android:id="@+id/drawer_layout"

    android:layout_width="match_parent"

    android:layout_width="match_parent"
@@ -42,15 +41,11 @@ 
            android:background="?android:attr/windowBackground" />

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

    </LinearLayout>

    </LinearLayout>





    <android.support.design.widget.NavigationView

    <fragment

        android:id="@+id/nav_view"

        android:id="@+id/drawer"

        android:theme="@style/NavigationDrawerMenuItemTextAppearance"

        android:name="com.android.contacts.drawer.DrawerFragment"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:layout_gravity="start"

        android:layout_gravity="start"

        android:fitsSystemWindows="true"

        android:layout_width="@dimen/drawer_width"

        app:itemBackground="@drawable/drawer_item_background"

        android:layout_height="match_parent" />

        app:headerLayout="@layout/nav_header_main"

        app:menu="@menu/activity_main_drawer"/>





</android.support.v4.widget.DrawerLayout>
 
</android.support.v4.widget.DrawerLayout>

res/layout/drawer_fragment.xml

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



<!-- Copyright (C) 2017 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.

-->



<FrameLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:fitsSystemWindows="true">



    <android.support.v7.widget.RecyclerView

        android:id="@+id/list"

        android:background="#FAFAFA"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:divider="@null" />

</FrameLayout>
 
 No newline at end of file

res/layout/assistant_new_badge.xml→res/layout/drawer_header.xml

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

<?xml version="1.0" encoding="utf-8"?>

<!--



     Copyright (C) 2016 The Android Open Source Project

<!-- Copyright (C) 2017 The Android Open Source Project





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

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

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

     you may not use this file except in compliance with the License.
@@ -15,18 +15,27 @@ 
     limitations under the License.

     limitations under the License.

-->

-->





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

<LinearLayout

    android:id="@+id/assistant_new_badge"

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

    android:layout_width="wrap_content"

    android:id="@+id/label_header"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_height="wrap_content"

    android:layout_gravity="center_vertical"

    android:layout_gravity="center_vertical"

    android:paddingLeft="@dimen/nav_new_badge_horizontal_pad"

    android:orientation="vertical"

    android:paddingTop="@dimen/nav_new_badge_vertical_pad"

    android:background="@color/navigation_drawer_background_color">

    android:paddingRight="@dimen/nav_new_badge_horizontal_pad"



    android:paddingBottom="@dimen/nav_new_badge_vertical_pad"

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

    android:background="@drawable/new_badge_background"



    android:textSize="@dimen/nav_new_badge_font_size"

    <FrameLayout

    android:textStyle="bold"

        style="@style/DrawerHeaderItemStyle"

    android:textAllCaps="true"

        android:layout_width="match_parent"

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

        android:layout_height="wrap_content"

    android:text="@string/menu_assistant_new_badge"/>
 
        android:clickable="false">

 No newline at end of file
 


        <TextView

            android:id="@+id/title"

            style="@style/DrawerHeaderTextStyle"

            android:layout_height="wrap_content"

            android:layout_width="wrap_content"/>

    </FrameLayout>

</LinearLayout>
 
 No newline at end of file