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

Commit 7f898af3 authored by Wenyi Wang's avatar Wenyi Wang Committed by android-build-merger
Browse files

Merge branch 'ub-contactsdialer-master-dev' of...

Merge branch 'ub-contactsdialer-master-dev' of /usr/local/google/game/mirror/googleplex-android_googlesource_com/platform/packages/apps/Contacts into ub-contactsdialer-master-dev
parents 165d43bc 5c39d515
Loading
Loading
Loading
Loading
+1 −7
Original line number Diff line number Diff line
@@ -20,17 +20,13 @@ 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 \
    $(support_library_root_dir)/design/res
    $(support_library_root_dir)/v7/cardview/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.v7.appcompat \
    --extra-packages android.support.design \
    --extra-packages android.support.v7.cardview

LOCAL_STATIC_JAVA_LIBRARIES := \
@@ -38,11 +34,9 @@ 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 \
    android-support-design \
    libphonenumber

LOCAL_PACKAGE_NAME := Contacts
+15 −15
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@

<manifest xmlns:android="http://schemas.android.com/apk/res/android"
    package="com.android.contacts"
    android:versionCode="10401"
    android:versionName="1.4.1">
    android:versionCode="10406"
    android:versionName="1.4.6">

    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="23" />
    <original-package android:name="com.android.contacts" />
@@ -27,6 +27,7 @@
    <uses-permission android:name="android.permission.WRITE_CONTACTS" />
    <uses-permission android:name="android.permission.MANAGE_ACCOUNTS" />
    <uses-permission android:name="android.permission.GET_ACCOUNTS" />
    <uses-permission android:name="android.permission.GET_ACCOUNTS_PRIVILEGED" />
    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -63,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"
@@ -231,6 +232,12 @@
            android:theme="@style/PeopleTheme"
            android:exported="false"/>

        <activity
            android:name=".common.activity.RequestDesiredPermissionsActivity"
            android:label="@string/launcherActivityLabel"
            android:theme="@style/PeopleTheme"
            android:exported="false"/>

        <activity
            android:name=".common.activity.RequestImportVCardPermissionsActivity"
            android:label="@string/launcherActivityLabel"
@@ -418,17 +425,6 @@
            </intent-filter>
        </activity>

        <!-- Blocked numbers activity -->
        <activity android:name=".activities.BlockedNumbersActivity"
                  android:label="@string/blocked_numbers_title"
                  android:theme="@style/BlockedNumbersStyle">
            <intent-filter>
                <action android:name="android.intent.action.EDIT" />
                <data android:mimeType="blocked_numbers/*" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
        </activity>

        <!-- vCard related -->
        <activity android:name=".common.vcard.ImportVCardActivity"
            android:label="@string/launcherActivityLabel"
@@ -467,6 +463,10 @@
            android:label="@string/launcherActivityLabel"
            android:theme="@style/BackgroundOnlyTheme" />

        <activity android:name=".common.vcard.ShareVCardActivity"
                  android:label="@string/launcherActivityLabel"
                  android:theme="@style/BackgroundOnlyTheme" />

        <service
            android:name=".common.vcard.VCardService"
            android:exported="false" />
@@ -534,7 +534,7 @@

        <provider
            android:name="android.support.v4.content.FileProvider"
            android:authorities="com.android.contacts.files"
            android:authorities="@string/contacts_file_provider_authority"
            android:grantUriPermissions="true"
            android:exported="false">
            <meta-data
−2.4 KiB
Loading image diff...
−537 B
Loading image diff...
−565 B
Loading image diff...
Loading