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

Commit 3b305b79 authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Merge tag 'android-4.4_r1' into cm-11.0 

Android 4.4 Release 1.0

Conflicts:
	res/layout/quickcontact_photo_container.xml
	res/values-sw600dp/styles.xml
	res/values/styles.xml
parents 0dbd5579 68981a30

Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -29,6 +29,7 @@ LOCAL_REQUIRED_MODULES := libvariablespeed 


LOCAL_PACKAGE_NAME := Contacts

LOCAL_CERTIFICATE := shared

LOCAL_PRIVILEGED_MODULE := true



LOCAL_PROGUARD_FLAG_FILES := proguard.flags

AndroidManifest.xml

+12 −42
Original line number Diff line number Diff line
@@ -217,7 +217,8 @@ 
        <activity

            android:name=".preference.ContactsPreferenceActivity"

            android:label="@string/activity_title_settings"

            android:theme="@style/ContactsPreferencesTheme" />

            android:theme="@style/ContactsPreferencesTheme"

            android:exported="false"/>



        <!-- Used to filter contacts list by account -->

        <activity
@@ -453,24 +454,6 @@ 
            </intent-filter>

        </activity>



        <!-- The widget that shows details and the social stream of a contact -->

        <receiver android:name=".socialwidget.SocialWidgetProvider"

            android:label="@string/social_widget_label" >

            <intent-filter>

                <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />

            </intent-filter>

            <meta-data android:name="android.appwidget.provider"

                    android:resource="@xml/social_widget_info" />

        </receiver>



        <activity

            android:name=".socialwidget.SocialWidgetConfigureActivity"

            android:theme="@android:style/Theme.Translucent.NoTitleBar" >

            <intent-filter>

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

            </intent-filter>

        </activity>



        <!-- Intercept Dialer Intents for devices without a phone.

             This activity should have the same intent filters as the DialtactsActivity,

             so that its capturing the same events. Omit android.intent.category.LAUNCHER, because
@@ -480,23 +463,6 @@ 
            android:name="com.android.contacts.NonPhoneActivity"

            android:theme="@style/NonPhoneActivityTheme"

            >

            <intent-filter android:priority="-1">

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

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

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

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

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

            </intent-filter>

            <intent-filter android:priority="-1">

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

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

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

                <data android:scheme="voicemail"/>

            </intent-filter>

            <intent-filter android:priority="-1">

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

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

            </intent-filter>

            <intent-filter android:priority="-1">

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

                <category android:name="android.intent.category.DEFAULT"/>
@@ -504,7 +470,6 @@ 
            </intent-filter>

            <intent-filter android:priority="-1">

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

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

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

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

                <data android:scheme="tel"/>
@@ -515,11 +480,6 @@ 
                <category android:name="android.intent.category.BROWSABLE"/>

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

            </intent-filter>

            <intent-filter android:priority="-1">

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

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

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

            </intent-filter>

        </activity>



        <!-- Service that is exclusively for the Phone application that sends out a view
@@ -538,6 +498,16 @@ 
            </intent-filter>

        </service>



        <provider

            android:name="android.support.v4.content.FileProvider"

            android:authorities="com.android.contacts.files"

            android:grantUriPermissions="true"

            android:exported="false">

            <meta-data

                android:name="android.support.FILE_PROVIDER_PATHS"

                android:resource="@xml/file_paths" />

        </provider>



        <meta-data android:name="android.nfc.disable_beam_default" android:value="true" />

    </application>

</manifest>

res/drawable-hdpi/btn_star_off_normal_holo_dark.png

+841 B (1.67 KiB)
Loading image diff...

res/drawable-hdpi/btn_star_off_normal_holo_light.png

+843 B (1.7 KiB)
Loading image diff...

res/drawable-hdpi/btn_star_on_normal_holo_dark.png

+739 B (1.42 KiB)
Loading image diff...