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

Commit e119e47c authored by Ricardo Cerqueira's avatar Ricardo Cerqueira
Browse files

Merge tag 'android-4.4.3_r1' into HEAD 

Android 4.4.3 release 1

Conflicts:
	AndroidManifest.xml
	res/drawable-hdpi/ic_dial_action_delete.png
	res/drawable-mdpi/ic_dial_action_delete.png
	res/drawable-xhdpi/ic_dial_action_delete.png
	res/drawable-xxhdpi/ic_dial_action_delete.png
	res/layout/dialpad_fragment.xml
	res/layout/dialpad_key.xml
	res/layout/dialtacts_activity.xml
	res/values-zh-rCN/strings.xml
	res/values/colors.xml
	res/values/dimens.xml
	res/values/strings.xml
	res/values/styles.xml
	src/com/android/dialer/CallDetailActivity.java
	src/com/android/dialer/DialtactsActivity.java
	src/com/android/dialer/calllog/CallLogAdapter.java
	src/com/android/dialer/calllog/ContactInfoHelper.java
	src/com/android/dialer/database/DialerDatabaseHelper.java
	src/com/android/dialer/dialpad/DialpadFragment.java

Change-Id: If163d8fe46692e4f2a3c1d9f92994005f94cfac2
parents 7fde4358 97794b6c

AndroidManifest.xml

+3 −2
Original line number Diff line number Diff line
@@ -16,7 +16,8 @@ 


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

    android:sharedUserId="com.android.dialer"

    package="com.android.dialer">

    package="com.android.dialer"

    coreApp="true" >



    <uses-permission android:name="android.permission.CALL_PRIVILEGED" />

    <uses-permission android:name="android.permission.READ_CONTACTS" />
@@ -72,7 +73,7 @@ 
             dialpad screen. -->

        <activity android:name=".DialtactsActivity"

            android:label="@string/launcherDialer"

            android:theme="@style/DialtactsTheme"

            android:theme="@style/DialtactsThemeHiddenActionBar"

            android:launchMode="singleTask"

            android:clearTaskOnLaunch="true"

            android:icon="@mipmap/ic_launcher_phone"

res/drawable-hdpi/dialer_recent_card_bg.9.png

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

res/drawable-hdpi/divider.9.png

0 → 100644
+118 B
Loading image diff...

res/drawable-hdpi/ic_back_arrow.png

0 → 100644
+670 B
Loading image diff...

res/drawable-hdpi/ic_contact_info.png

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