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

Commit 10ae593a authored by Eric Erfanian's avatar Eric Erfanian
Browse files

This change brings Dialer oc-mr1-dev up to date with v11.1 RC06. 

This is to resolve a merge conflict in:
I48296c56fb1d275a06b7c314f5380266c1195ef2

Test: make

master is already up to date and

Merged-In: I858e3665253139b8aab4e4c063bfc4c419f33cc9

Change-Id: Ifc146f2fec24fd2f8a51cd32feb3699bb1c07136
parent e1a73952

Android.mk

+4 −1
Original line number Diff line number Diff line
@@ -118,6 +118,7 @@ RES_DIRS := \ 
	$(BASE_DIR)/incallui/telecomeventui/res \

	$(BASE_DIR)/incallui/video/impl/res \

	$(BASE_DIR)/incallui/video/protocol/res \

	$(BASE_DIR)/voicemail/impl/configui/res \

	$(BASE_DIR)/voicemail/impl/res \
@@ -178,6 +179,7 @@ DIALER_MANIFEST_FILES += \ 
	$(BASE_DIR)/incallui/video/impl/AndroidManifest.xml \

	$(BASE_DIR)/incallui/video/protocol/AndroidManifest.xml \

	$(BASE_DIR)/voicemail/AndroidManifest.xml \

	$(BASE_DIR)/voicemail/impl/configui/AndroidManifest.xml \

	$(BASE_DIR)/voicemail/impl/AndroidManifest.xml \
@@ -257,6 +259,7 @@ LOCAL_AAPT_FLAGS := \ 
	--extra-packages com.android.incallui.video.impl \

	--extra-packages com.android.phone.common \

	--extra-packages com.android.voicemail \

	--extra-packages com.android.voicemail.impl.configui \

	--extra-packages com.android.voicemail.impl \

	--extra-packages com.android.voicemail.impl.fetch \

	--extra-packages com.android.voicemail.impl.settings \

AndroidManifest.xml

+2 −3
Original line number Diff line number Diff line
@@ -16,8 +16,8 @@ 
<manifest xmlns:android="http://schemas.android.com/apk/res/android"

  coreApp="true"

  package="com.android.dialer"

  android:versionCode="160000"

  android:versionName="12.0">

  android:versionCode="150000"

  android:versionName="11.0">



  <uses-sdk

    android:minSdkVersion="23"
@@ -114,7 +114,6 @@ 
    android:usesCleartextTraffic="false">







  </application>



</manifest>

assets/quantum/res/drawable-hdpi/quantum_ic_report_grey600_24.png

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

assets/quantum/res/drawable-mdpi/quantum_ic_report_grey600_24.png

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

assets/quantum/res/drawable-xhdpi/quantum_ic_report_grey600_24.png

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