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

Commit 478e8f96 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge " Contacts: Modify review comments in Contacts"

parents 1c0325ce e339bd23
Loading
Loading
Loading
Loading
+2 −0
Original line number Diff line number Diff line
@@ -20,6 +20,8 @@ LOCAL_AAPT_FLAGS := \
    --extra-packages android.support.v7.cardview

LOCAL_JAVA_LIBRARIES := telephony-common voip-common
LOCAL_JAVA_LIBRARIES += rcs_service_api

LOCAL_STATIC_JAVA_LIBRARIES := \
    com.android.vcard \
    android-common \

AndroidManifest.xml

100755 → 100644
+23 −0
Original line number Diff line number Diff line
@@ -47,6 +47,9 @@
    <uses-permission android:name="android.permission.READ_SMS" />
    <uses-permission android:name="android.permission.READ_CALENDAR" />
    <uses-permission android:name="android.permission.WRITE_MEDIA_STORAGE" />
    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

    <application
        android:name="com.android.contacts.ContactsApplication"
@@ -56,6 +59,8 @@
        android:hardwareAccelerated="true"
        android:supportsRtl="true"
    >
        <uses-library android:name="com.suntek.mway.rcs.client.api" android:required="false" />


        <!-- The main Contacts activity with the contact list, favorites, and groups. -->
        <activity android:name=".activities.PeopleActivity"
@@ -278,6 +283,15 @@
            </intent-filter>
        </activity>

        <activity
            android:name=".quickcontact.MyQrcodeActivity"
            android:label="@string/menu_qrcode"
            android:theme="@style/PeopleTheme" >
        </activity>
        <activity android:name=".quickcontact.QrcodeInfoSettingActivity"
            android:theme="@style/PeopleTheme" >
        </activity>

        <receiver
            android:name=".quickcontact.QuickContactBroadcastReceiver"
            android:exported="false" />
@@ -543,6 +557,15 @@
                android:resource="@xml/file_paths" />
        </provider>

        <receiver
            android:name="com.android.contacts.util.RCSUtil$WifiReceiver"
            android:exported="true" >
            <intent-filter>
                <action android:name="android.net.wifi.WIFI_STATE_CHANGED" />
                <action android:name="android.net.conn.CONNECTIVITY_CHANGE" />
            </intent-filter>
        </receiver>

        <meta-data android:name="android.nfc.disable_beam_default" android:value="true" />
    </application>
</manifest>
+2.02 KiB
Loading image diff...
+2.09 KiB
Loading image diff...
+2.12 KiB
Loading image diff...
Loading