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

Commit 7967545e authored by Wenyi Wang's avatar Wenyi Wang
Browse files

Open group fragment and duplicates fragment from PeopleActivity 

* Also handle some side nav menu logic

Bug: 30944495

Test: manual - navigate between fragments, rotation, press Back/Home/Recent
               button, search, multi-select, modify group members,
               add/delete groups.

Change-Id: I4feeed89557a5c07852a1e2d2a39306cfa59c918
parent 72353f91

AndroidManifest.xml

+7 −17
Original line number Diff line number Diff line
@@ -137,6 +137,13 @@ 
                <category android:name="android.intent.category.DEFAULT" />

                <data android:mimeType="vnd.android.cursor.dir/person" />

                <data android:mimeType="vnd.android.cursor.dir/contact" />

                <data android:mimeType="vnd.android.cursor.item/group" />

            </intent-filter>



            <intent-filter>

                <action android:name="android.intent.action.EDIT" />

                <category android:name="android.intent.category.DEFAULT" />

                <data android:mimeType="vnd.android.cursor.item/group" />

            </intent-filter>



            <intent-filter>
@@ -268,23 +275,6 @@ 
            </intent-filter>

        </activity>



        <!-- Displays the members of a group in a list -->

        <activity android:name=".activities.GroupMembersActivity"

            android:theme="@style/PeopleActivityTheme">



            <intent-filter>

                <action android:name="android.intent.action.VIEW" />

                <category android:name="android.intent.category.DEFAULT" />

                <data android:mimeType="vnd.android.cursor.item/group" />

            </intent-filter>



            <intent-filter>

                <action android:name="android.intent.action.EDIT" />

                <category android:name="android.intent.category.DEFAULT" />

                <data android:mimeType="vnd.android.cursor.item/group" />

            </intent-filter>

        </activity>



        <activity

            android:name=".quickcontact.QuickContactActivity"

            android:theme="@style/Theme.QuickContact"

res/layout/people_activity.xml

+4 −29
Original line number Diff line number Diff line
@@ -20,35 +20,10 @@ 
    android:layout_width="match_parent"

    android:layout_height="match_parent" >



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

                    android:id="@+id/list_container"

                    android:layout_width="match_parent"

                    android:layout_height="match_parent">



        <FrameLayout

            android:id="@+id/contacts_view"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_below="@id/toolbar_parent">

    <FrameLayout

        android:id="@+id/contacts_list_container"

        android:layout_height="match_parent"

        android:layout_width="match_parent" />

        </FrameLayout>



        <FrameLayout

            android:id="@+id/contacts_unavailable_view"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:layout_below="@id/toolbar_parent"

            android:visibility="gone">

            <FrameLayout

                android:id="@+id/contacts_unavailable_container"

                android:layout_height="match_parent"

                android:layout_width="match_parent" />

        </FrameLayout>



    </RelativeLayout>



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

</android.support.design.widget.CoordinatorLayout>

src-bind/com/android/contactsbind/Assistants.java

deleted100644 → 0
+0 −34
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2016 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.

 */

package com.android.contactsbind;



import android.content.Context;

import android.content.Intent;



/**

 * Creates default implementations of contacts assistants.

 */

public final class Assistants {



    private Assistants() {

    }



    /**

     * Returns an Intent to start an Activity to clean up duplicate contacts or null

     * if it is not a supported feature.

     */

    public static Intent getDuplicatesActivityIntent(Context context) {

        return null;

    }

}

src-bind/com/android/contactsbind/ObjectFactory.java

+9 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ import com.android.contactsbind.search.AutocompleteHelper; 
import com.android.contacts.common.util.DeviceAccountFilter;

import com.android.contacts.common.util.DeviceAccountPresentationValues;



import android.app.Fragment;

import android.content.Context;



/**
@@ -43,4 +44,12 @@ public class ObjectFactory { 
    public static DeviceAccountFilter getDeviceAccountFilter(Context context) {

        return DeviceAccountFilter.ONLY_NULL;

    }



    public static Fragment getDuplicatesFragment() {

        return null;

    }



    public static Fragment getDuplicatesUtilFragment() {

        return null;

    }

}

src/com/android/contacts/ContactsDrawerActivity.java

+151 −147

File changed.

Preview size limit exceeded, changes collapsed.