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

Commit ca5ca5dc authored by Lalit Kansara's avatar Lalit Kansara
Browse files

Merge commit 'bf368e07' into remote 

Conflicts:
	res/values/bools.xml

Change-Id: I659e54ec50cdd8b332ec7b207429ecd8944c1be3
parents 9fe469b3 bf368e07

Android.mk

+1 −3
Original line number Diff line number Diff line
@@ -23,11 +23,9 @@ support_library_root_dir := prebuilts/sdk/current/support 
endif



src_dirs := src $(contacts_common_dir)/src $(phone_common_dir)/src

res_dirs := res $(contacts_common_dir)/res $(phone_common_dir)/res

res_dirs := res res-aosp $(contacts_common_dir)/res $(contacts_common_dir)/icons/res $(phone_common_dir)/res

asset_dirs := $(contacts_common_dir)/assets



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_SRC_FILES += src/org/codeaurora/presenceserv/IPresenceService.aidl \

                   src/org/codeaurora/presenceserv/IPresenceServiceCB.aidl

AndroidManifest.xml

+9 −3
Original line number Diff line number Diff line
@@ -16,10 +16,10 @@ 


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

    package="com.android.contacts"

    android:versionCode="10417"

    android:versionName="1.4.17">

    android:versionCode="10422"

    android:versionName="1.4.22">



    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="24" />

    <uses-sdk android:minSdkVersion="21" android:targetSdkVersion="25" />

    <original-package android:name="com.android.contacts" />



    <uses-permission android:name="android.permission.CALL_PHONE" />
@@ -56,6 +56,7 @@ 
        android:name="com.android.contacts.ContactsApplication"

        android:label="@string/applicationLabel"

        android:icon="@mipmap/ic_contacts_launcher"

        android:roundIcon="@mipmap/ic_contacts_launcher"

        android:taskAffinity="android.task.contacts"

        android:hardwareAccelerated="true"

        android:supportsRtl="true"
@@ -140,6 +141,11 @@ 
            <meta-data android:name="android.app.searchable"

                android:resource="@xml/searchable"

            />



           <meta-data android:name="android.app.shortcuts"

                android:resource="@xml/shortcuts"

            />



        </activity>



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

res-aosp/xml/shortcuts.xml

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

<!-- 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.

-->



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

    <shortcut

        android:enabled="true"

        android:icon="@drawable/ic_add_circle_24dp"

        android:shortcutId="shortcut-add-contact"

        android:shortcutShortLabel="@string/menu_new_contact_action_bar">

        <intent

            android:action="android.intent.action.INSERT"

            android:data="content://com.android.contacts/contacts"

            android:targetPackage="com.android.contacts"

            android:targetClass="com.android.contacts.activities.CompactContactEditorActivity"/>

    </shortcut>

</shortcuts>

res/drawable-hdpi/ic_message_24dp.png

deleted100644 → 0
−242 B
Loading image diff...

res/drawable-mdpi/ic_message_24dp.png

deleted100644 → 0
−207 B
Loading image diff...