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

Commit d8046e52 authored by Eric Erfanian's avatar Eric Erfanian
Browse files

Update AOSP Dialer source from internal google3 repository at 

cl/152373142.

Test: make, treehugger

This CL updates the AOSP Dialer source with all the changes that have
gone into the private google3 repository. This includes all the
changes from cl/151342913 (3/27/2017) to cl/152373142 (4/06/2017).

This goal of these drops is to keep the AOSP source in sync with the
internal google3 repository. Currently these sync are done by hand
with very minor modifications to the internal source code.
See the Android.mk file for list of modifications.
Our current goal is to do frequent drops (daily if possible) and
eventually switched to an automated process.

Change-Id: I2fbc88cf6867b90ac8b65f75e5e34468988c7217
parent cdb1edf9

Android.mk

+5 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ RES_DIRS := \ 
	$(BASE_DIR)/dialer/phonenumberutil/res \

	$(BASE_DIR)/dialer/postcall/res \

	$(BASE_DIR)/dialer/shortcuts/res \

	$(BASE_DIR)/dialer/speeddial/res \

	$(BASE_DIR)/dialer/theme/res \

	$(BASE_DIR)/dialer/util/res \

	$(BASE_DIR)/dialer/voicemailstatus/res \
@@ -84,6 +85,7 @@ RES_DIRS := \ 
	$(BASE_DIR)/incallui/res \

	$(BASE_DIR)/incallui/sessiondata/res \

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

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

	$(BASE_DIR)/incallui/wifi/res \

	$(BASE_DIR)/voicemail/impl/res
@@ -112,6 +114,7 @@ DIALER_MANIFEST_FILES += \ 
	$(BASE_DIR)/dialer/postcall/AndroidManifest.xml \

	$(BASE_DIR)/dialer/shortcuts/AndroidManifest.xml \

	$(BASE_DIR)/dialer/simulator/impl/AndroidManifest.xml \

	$(BASE_DIR)/dialer/speeddial/AndroidManifest.xml \

	$(BASE_DIR)/dialer/theme/AndroidManifest.xml \

	$(BASE_DIR)/dialer/util/AndroidManifest.xml \

	$(BASE_DIR)/dialer/voicemailstatus/AndroidManifest.xml \
@@ -129,6 +132,7 @@ DIALER_MANIFEST_FILES += \ 
	$(BASE_DIR)/incallui/incall/impl/AndroidManifest.xml \

	$(BASE_DIR)/incallui/sessiondata/AndroidManifest.xml \

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

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

	$(BASE_DIR)/incallui/wifi/AndroidManifest.xml \

	$(BASE_DIR)/voicemail/impl/AndroidManifest.xml
@@ -179,6 +183,7 @@ LOCAL_AAPT_FLAGS := \ 
	--extra-packages com.android.dialer.phonenumberutil \

	--extra-packages com.android.dialer.postcall \

	--extra-packages com.android.dialer.shortcuts \

	--extra-packages com.android.dialer.speeddial \

	--extra-packages com.android.dialer.util \

	--extra-packages com.android.dialer.voicemailstatus \

	--extra-packages com.android.dialer.widget \

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

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

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

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

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

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

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

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