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

Commit d2572894 authored by Wenyi Wang's avatar Wenyi Wang Committed by Android (Google) Code Review
Browse files

Merge "Remove AppCompat library from Contacts (1/3)" into nyc-dev

parents a5dc1f35 bf96dd1b

Android.mk

+0 −3
Original line number Diff line number Diff line
@@ -20,7 +20,6 @@ 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)/v7/appcompat/res \

    $(support_library_root_dir)/v7/cardview/res

LOCAL_ASSET_DIR := $(addprefix $(LOCAL_PATH)/, $(asset_dirs))
@@ -28,7 +27,6 @@ LOCAL_AAPT_FLAGS := \ 
    --auto-add-overlay \

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

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

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

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



LOCAL_STATIC_JAVA_LIBRARIES := \
@@ -36,7 +34,6 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
    android-common \

    guava \

    android-support-v13 \

    android-support-v7-appcompat \

    android-support-v7-cardview \

    android-support-v7-palette \

    android-support-v4 \

AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -64,7 +64,7 @@ 
        <!-- The main Contacts activity with the contact list, favorites, and groups. -->

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

            android:label="@string/launcherActivityLabel"

            android:theme="@style/PeopleActivityTheme"

            android:theme="@style/PeopleTheme"

            android:clearTaskOnLaunch="true"

            android:launchMode="singleTop"

            android:resizeableActivity="true"

res/layout-land/contacts_unavailable_fragment_content.xml

+0 −2
Original line number Diff line number Diff line
@@ -69,7 +69,6 @@ 
            android:layout_gravity="center_horizontal">



            <Button

                style="@style/ContactsUnavailableButtonStyle"

                android:id="@+id/add_account_button"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"
@@ -79,7 +78,6 @@ 
                android:text="@string/contacts_unavailable_add_account" />



            <Button

                style="@style/ContactsUnavailableButtonStyle"

                android:id="@+id/import_contacts_button"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

res/layout-land/people_activity_toolbar.xml

+3 −5
Original line number Diff line number Diff line
@@ -28,15 +28,13 @@ 
    <FrameLayout

        android:id="@+id/toolbar_frame"

        android:layout_width="match_parent"

        android:layout_height="?attr/actionBarSize"

        android:layout_height="?android:attr/actionBarSize"

        android:background="@color/actionbar_background_color">



        <!-- the attribute padding removes the gap between this Toolbar and its parent FrameLayout on tablet -->

        <android.support.v7.widget.Toolbar

        <Toolbar

            android:layout_width="match_parent"

            android:layout_height="?attr/actionBarSize"

            android:layout_height="?android:attr/actionBarSize"

            android:id="@+id/toolbar"

            android:padding="0dp"

            style="@style/ContactsToolbarStyle" />



    </FrameLayout>

res/layout/contacts_unavailable_fragment_content.xml

+0 −2
Original line number Diff line number Diff line
@@ -58,7 +58,6 @@ 
        android:layout_height="wrap_content">



        <Button

            style="@style/ContactsUnavailableButtonStyle"

            android:id="@+id/add_account_button"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"
@@ -68,7 +67,6 @@ 
            android:text="@string/contacts_unavailable_add_account" />



        <Button

            style="@style/ContactsUnavailableButtonStyle"

            android:id="@+id/import_contacts_button"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"