Update Dialer source to latest internal Google revision.
Previously, Android's Dialer app was developed in an internal Google
source control system and only exported to public during AOSP drops.
The Dialer team is now switching to a public development model similar
to the telephony team.
This CL represents all internal Google changes that were committed to
Dialer between the public O release and today's tip of tree on internal
master. This CL squashes those changes into a single commit.
In subsequent changes, changes will be exported on a per-commit basis.
(cherry picked from commit 2ca4318cc1ee57dda907ba2069bd61d162b1baef
and amended to match paths of dependencies under
prebuilts/maven_repo/bumptech/com/github/bumptech/glide/.)
This CL was generated using these commands from a repository at
stage-stage-master at revision ea7b4dc89590ffa3332766a531e0eab6ffb9aebd
("Merge "Update Dialer source to latest internal Google revision." am: c39ea3c55f -s ours"):
git diff --binary 2ca4318cc1ee57dda907ba2069bd61d162b1baef | git apply -R --index
git commit -c 2ca4318cc1ee57dda907ba2069bd61d162b1baef
Test: make, flash install, run
Change-Id: I529aaeb88535b9533c0ae4ef4e6c1222d4e0f1c8
PiperOrigin-RevId: 167068436
diff --git a/Android.mk b/Android.mk
index 17823e7..bf5494e 100644
--- a/Android.mk
+++ b/Android.mk
@@ -1,25 +1,17 @@
# Local modifications:
-# * removed com.google.android.backup.api_key. This should be added to
-# the manifest in the top level directory.
# * removed com.google.android.geo.API_KEY key. This should be added to
# the manifest files in java/com/android/incallui/calllocation/impl/
# and /java/com/android/incallui/maps/impl/
# * b/62417801 modify translation string naming convention:
# $ find . -type d | grep 262 | rename 's/(values)\-([a-zA-Z\+\-]+)\-(mcc262-mnc01)/$1-$3-$2/'
-# * b/62343966 include manually generated GRPC service class:
+# * b/37077388 temporarily disable proguard with javac
+# * b/62875795 include manually generated GRPC service class:
# $ protoc --plugin=protoc-gen-grpc-java=prebuilts/tools/common/m2/repository/io/grpc/protoc-gen-grpc-java/1.0.3/protoc-gen-grpc-java-1.0.3-linux-x86_64.exe \
# --grpc-java_out=lite:"packages/apps/Dialer/java/com/android/voicemail/impl/" \
# --proto_path="packages/apps/Dialer/java/com/android/voicemail/impl/transcribe/grpc/" "packages/apps/Dialer/java/com/android/voicemail/impl/transcribe/grpc/voicemail_transcription.proto"
-# * b/37077388 temporarily disable proguard with javac
LOCAL_PATH:= $(call my-dir)
include $(CLEAR_VARS)
-ifeq ($(TARGET_BUILD_APPS),)
-support_library_root_dir := frameworks/support
-else
-support_library_root_dir := prebuilts/sdk/current/support
-endif
-
# The base directory for Dialer sources.
BASE_DIR := java/com/android
@@ -61,218 +53,123 @@
$(BASE_DIR)/dialer/buildtype/test/BuildTypeAccessorImpl.java \
$(BASE_DIR)/dialer/constants/googledialer/ConstantsImpl.java \
$(BASE_DIR)/dialer/binary/google/GoogleStubDialerRootComponent.java \
- $(BASE_DIR)/dialer/binary/google/GoogleStubDialerApplication.java
+ $(BASE_DIR)/dialer/binary/google/GoogleStubDialerApplication.java \
+
+EXCLUDE_RESOURCE_DIRECTORIES := \
+ java/com/android/incallui/maps/impl/res \
# All Dialers resources.
-# find . -type d -name "res" | uniq | sort
-RES_DIRS := \
- assets/product/res \
- assets/quantum/res \
- $(BASE_DIR)/contacts/common/res \
- $(BASE_DIR)/dialer/about/res \
- $(BASE_DIR)/dialer/app/res \
- $(BASE_DIR)/dialer/app/voicemail/error/res \
- $(BASE_DIR)/dialer/blocking/res \
- $(BASE_DIR)/dialer/callcomposer/camera/camerafocus/res \
- $(BASE_DIR)/dialer/callcomposer/cameraui/res \
- $(BASE_DIR)/dialer/callcomposer/res \
- $(BASE_DIR)/dialer/calldetails/res \
- $(BASE_DIR)/dialer/calllog/ui/res \
- $(BASE_DIR)/dialer/calllogutils/res \
- $(BASE_DIR)/dialer/common/res \
- $(BASE_DIR)/dialer/contactactions/res \
- $(BASE_DIR)/dialer/contactsfragment/res \
- $(BASE_DIR)/dialer/dialpadview/res \
- $(BASE_DIR)/dialer/enrichedcall/simulator/res \
- $(BASE_DIR)/dialer/interactions/res \
- $(BASE_DIR)/dialer/main/impl/res \
- $(BASE_DIR)/dialer/notification/res \
- $(BASE_DIR)/dialer/oem/res \
- $(BASE_DIR)/dialer/phonenumberutil/res \
- $(BASE_DIR)/dialer/postcall/res \
- $(BASE_DIR)/dialer/searchfragment/common/res \
- $(BASE_DIR)/dialer/searchfragment/list/res \
- $(BASE_DIR)/dialer/searchfragment/nearbyplaces/res \
- $(BASE_DIR)/dialershared/bubble/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 \
- $(BASE_DIR)/dialer/widget/res \
- $(BASE_DIR)/incallui/answer/impl/affordance/res \
- $(BASE_DIR)/incallui/answer/impl/answermethod/res \
- $(BASE_DIR)/incallui/answer/impl/hint/res \
- $(BASE_DIR)/incallui/answer/impl/res \
- $(BASE_DIR)/incallui/audioroute/res \
- $(BASE_DIR)/incallui/autoresizetext/res \
- $(BASE_DIR)/incallui/calllocation/impl/res \
- $(BASE_DIR)/incallui/commontheme/res \
- $(BASE_DIR)/incallui/contactgrid/res \
- $(BASE_DIR)/incallui/disconnectdialog/res \
- $(BASE_DIR)/incallui/hold/res \
- $(BASE_DIR)/incallui/incall/impl/res \
- $(BASE_DIR)/incallui/res \
- $(BASE_DIR)/incallui/sessiondata/res \
- $(BASE_DIR)/incallui/speakerbuttonlogic/res \
- $(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 \
+RES_DIRS := $(call all-subdir-named-dirs,res,.)
+RES_DIRS := $(filter-out $(EXCLUDE_RESOURCE_DIRECTORIES),$(RES_DIRS))
+EXCLUDE_MANIFESTS := \
+ $(BASE_DIR)/dialer/binary/aosp/testing/AndroidManifest.xml \
+ $(BASE_DIR)/dialer/binary/google/AndroidManifest.xml \
+ $(BASE_DIR)/incallui/calllocation/impl/AndroidManifest.xml \
+ $(BASE_DIR)/incallui/maps/impl/AndroidManifest.xml \
# Dialer manifest files to merge.
-# find . -type f -name "AndroidManifest.xml" | uniq | sort
-DIALER_MANIFEST_FILES += \
- $(BASE_DIR)/contacts/common/AndroidManifest.xml \
- $(BASE_DIR)/dialer/about/AndroidManifest.xml \
- $(BASE_DIR)/dialer/app/AndroidManifest.xml \
- $(BASE_DIR)/dialer/app/manifests/activities/AndroidManifest.xml \
- $(BASE_DIR)/dialer/app/voicemail/error/AndroidManifest.xml \
- $(BASE_DIR)/dialer/backup/AndroidManifest.xml \
- $(BASE_DIR)/dialer/blocking/AndroidManifest.xml \
- $(BASE_DIR)/dialer/callcomposer/AndroidManifest.xml \
- $(BASE_DIR)/dialer/callcomposer/camera/AndroidManifest.xml \
- $(BASE_DIR)/dialer/callcomposer/camera/camerafocus/AndroidManifest.xml \
- $(BASE_DIR)/dialer/callcomposer/cameraui/AndroidManifest.xml \
- $(BASE_DIR)/dialer/calldetails/AndroidManifest.xml \
- $(BASE_DIR)/dialer/calllog/ui/AndroidManifest.xml \
- $(BASE_DIR)/dialer/calllogutils/AndroidManifest.xml \
- $(BASE_DIR)/dialer/common/AndroidManifest.xml \
- $(BASE_DIR)/dialer/contactactions/AndroidManifest.xml \
- $(BASE_DIR)/dialer/contactsfragment/AndroidManifest.xml \
- $(BASE_DIR)/dialer/dialpadview/AndroidManifest.xml \
- $(BASE_DIR)/dialer/enrichedcall/simulator/AndroidManifest.xml \
- $(BASE_DIR)/dialer/interactions/AndroidManifest.xml \
- $(BASE_DIR)/dialer/main/impl/AndroidManifest.xml \
- $(BASE_DIR)/dialer/notification/AndroidManifest.xml \
- $(BASE_DIR)/dialer/oem/AndroidManifest.xml \
- $(BASE_DIR)/dialer/phonenumberutil/AndroidManifest.xml \
- $(BASE_DIR)/dialer/postcall/AndroidManifest.xml \
- $(BASE_DIR)/dialer/searchfragment/common/AndroidManifest.xml \
- $(BASE_DIR)/dialer/searchfragment/list/AndroidManifest.xml \
- $(BASE_DIR)/dialer/searchfragment/nearbyplaces/AndroidManifest.xml \
- $(BASE_DIR)/dialershared/bubble/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 \
- $(BASE_DIR)/dialer/widget/AndroidManifest.xml \
- $(BASE_DIR)/incallui/AndroidManifest.xml \
- $(BASE_DIR)/incallui/answer/impl/affordance/AndroidManifest.xml \
- $(BASE_DIR)/incallui/answer/impl/AndroidManifest.xml \
- $(BASE_DIR)/incallui/answer/impl/answermethod/AndroidManifest.xml \
- $(BASE_DIR)/incallui/answer/impl/hint/AndroidManifest.xml \
- $(BASE_DIR)/incallui/audioroute/AndroidManifest.xml \
- $(BASE_DIR)/incallui/autoresizetext/AndroidManifest.xml \
- $(BASE_DIR)/incallui/commontheme/AndroidManifest.xml \
- $(BASE_DIR)/incallui/contactgrid/AndroidManifest.xml \
- $(BASE_DIR)/incallui/disconnectdialog/AndroidManifest.xml \
- $(BASE_DIR)/incallui/hold/AndroidManifest.xml \
- $(BASE_DIR)/incallui/incall/impl/AndroidManifest.xml \
- $(BASE_DIR)/incallui/sessiondata/AndroidManifest.xml \
- $(BASE_DIR)/incallui/speakerbuttonlogic/AndroidManifest.xml \
- $(BASE_DIR)/incallui/telecomeventui/AndroidManifest.xml \
- $(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 \
-
+DIALER_MANIFEST_FILES := $(call all-named-files-under,AndroidManifest.xml,.)
+DIALER_MANIFEST_FILES := $(filter-out $(EXCLUDE_MANIFESTS),$(DIALER_MANIFEST_FILES))
# Merge all manifest files.
LOCAL_FULL_LIBS_MANIFEST_FILES := \
$(addprefix $(LOCAL_PATH)/, $(DIALER_MANIFEST_FILES))
-LOCAL_SRC_FILES := $(call all-java-files-under, $(SRC_DIRS))
-LOCAL_SRC_FILES := $(filter-out $(EXCLUDE_FILES),$(LOCAL_SRC_FILES))
-LOCAL_SRC_FILES += $(call all-proto-files-under, $(SRC_DIRS))
-# Backup Library
-BACKUP_LIB_SRC_DIR := ../../../external/libbackup/src/com/google/android/libraries/backup
-EXCLUDE_BACKUP_LIB_SRCS := $(call all-java-files-under, $(BACKUP_LIB_SRC_DIR)/shadow)
-LOCAL_SRC_FILES += $(call all-java-files-under, $(BACKUP_LIB_SRC_DIR))
-LOCAL_SRC_FILES := $(filter-out $(EXCLUDE_BACKUP_LIB_SRCS),$(LOCAL_SRC_FILES))
+LOCAL_SRC_FILES := $(call all-java-files-under, $(SRC_DIRS))
+LOCAL_SRC_FILES += $(call all-proto-files-under, $(SRC_DIRS))
+LOCAL_SRC_FILES := $(filter-out $(EXCLUDE_FILES),$(LOCAL_SRC_FILES))
LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)
-LOCAL_RESOURCE_DIR := \
- $(addprefix $(LOCAL_PATH)/, $(RES_DIRS)) \
- $(support_library_root_dir)/design/res \
- $(support_library_root_dir)/transition/res \
- $(support_library_root_dir)/v7/appcompat/res \
- $(support_library_root_dir)/v7/cardview/res \
- $(support_library_root_dir)/v7/recyclerview/res
+LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(RES_DIRS))
+
+EXCLUDE_EXTRA_PACKAGES := \
+ com.android.dialer.binary.aosp.testing \
+ com.android.dialer.binary.google \
+ com.android.incallui.calllocation.impl \
+ com.android.incallui.maps.impl \
# We specify each package explicitly to glob resource files.
+# find . -type f -name "AndroidManifest.xml" | uniq | sort | cut -c 8- | rev | cut -c 21- | rev | sed 's/\//./g' | sed 's/$/ \\/'
LOCAL_AAPT_FLAGS := \
- --auto-add-overlay \
- --extra-packages com.android.contacts.common \
- --extra-packages com.android.dialer.about \
- --extra-packages com.android.dialer.app \
- --extra-packages com.android.dialer.app.voicemail.error \
- --extra-packages com.android.dialer.blocking \
- --extra-packages com.android.dialer.callcomposer \
- --extra-packages com.android.dialer.callcomposer \
- --extra-packages com.android.dialer.callcomposer.camera \
- --extra-packages com.android.dialer.callcomposer.camera.camerafocus \
- --extra-packages com.android.dialer.callcomposer.cameraui \
- --extra-packages com.android.dialer.calldetails \
- --extra-packages com.android.dialer.calllog.ui \
- --extra-packages com.android.dialer.calllogutils \
- --extra-packages com.android.dialer.common \
- --extra-packages com.android.dialer.contactactions \
- --extra-packages com.android.dialer.contactsfragment \
- --extra-packages com.android.dialer.dialpadview \
- --extra-packages com.android.dialer.enrichedcall.simulator \
- --extra-packages com.android.dialer.interactions \
- --extra-packages com.android.dialer.main.impl \
- --extra-packages com.android.dialer.notification \
- --extra-packages com.android.dialer.oem \
- --extra-packages com.android.dialer.phonenumberutil \
- --extra-packages com.android.dialer.postcall \
- --extra-packages com.android.dialer.searchfragment.common \
- --extra-packages com.android.dialer.searchfragment.list \
- --extra-packages com.android.dialer.searchfragment.nearbyplaces \
- --extra-packages com.android.dialershared.bubble \
- --extra-packages com.android.dialer.shortcuts \
- --extra-packages com.android.dialer.speeddial \
- --extra-packages com.android.dialer.theme \
- --extra-packages com.android.dialer.util \
- --extra-packages com.android.dialer.voicemailstatus \
- --extra-packages com.android.dialer.widget \
- --extra-packages com.android.incallui \
- --extra-packages com.android.incallui.answer.impl \
- --extra-packages com.android.incallui.answer.impl.affordance \
- --extra-packages com.android.incallui.answer.impl.affordance \
- --extra-packages com.android.incallui.answer.impl.answermethod \
- --extra-packages com.android.incallui.answer.impl.hint \
- --extra-packages com.android.incallui.audioroute \
- --extra-packages com.android.incallui.autoresizetext \
- --extra-packages com.android.incallui.calllocation \
- --extra-packages com.android.incallui.calllocation.impl \
- --extra-packages com.android.incallui.commontheme \
- --extra-packages com.android.incallui.contactgrid \
- --extra-packages com.android.incallui.disconnectdialog \
- --extra-packages com.android.incallui.hold \
- --extra-packages com.android.incallui.incall.impl \
- --extra-packages com.android.incallui.maps.impl \
- --extra-packages com.android.incallui.sessiondata \
- --extra-packages com.android.incallui.speakerbuttonlogic \
- --extra-packages com.android.incallui.telecomeventui \
- --extra-packages com.android.incallui.video \
- --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 \
- --extra-packages com.android.voicemail.settings \
- --extra-packages me.leolin.shortcutbadger \
+ com.android.contacts.common \
+ com.android.dialer.about \
+ com.android.dialer.app \
+ com.android.dialer.app.manifests.activities \
+ com.android.dialer.app.voicemail.error \
+ com.android.dialer.backup \
+ com.android.dialer.binary.aosp.testing \
+ com.android.dialer.binary.google \
+ com.android.dialer.blocking \
+ com.android.dialer.callcomposer \
+ com.android.dialer.callcomposer.camera \
+ com.android.dialer.callcomposer.camera.camerafocus \
+ com.android.dialer.callcomposer.cameraui \
+ com.android.dialer.calldetails \
+ com.android.dialer.calllog.database \
+ com.android.dialer.calllog.ui \
+ com.android.dialer.calllogutils \
+ com.android.dialer.common \
+ com.android.dialer.configprovider \
+ com.android.dialer.contactactions \
+ com.android.dialer.contactphoto \
+ com.android.dialer.contactsfragment \
+ com.android.dialer.databasepopulator \
+ com.android.dialer.dialpadview \
+ com.android.dialer.enrichedcall.simulator \
+ com.android.dialer.interactions \
+ com.android.dialer.lettertile \
+ com.android.dialer.location \
+ com.android.dialer.main.impl \
+ com.android.dialer.notification \
+ com.android.dialer.oem \
+ com.android.dialer.phonenumberutil \
+ com.android.dialer.postcall \
+ com.android.dialer.searchfragment.common \
+ com.android.dialer.searchfragment.cp2 \
+ com.android.dialer.searchfragment.list \
+ com.android.dialer.searchfragment.nearbyplaces \
+ com.android.dialer.searchfragment.remote \
+ com.android.dialershared.bubble \
+ com.android.dialer.shortcuts \
+ com.android.dialer.simulator.impl \
+ com.android.dialer.speeddial \
+ com.android.dialer.theme \
+ com.android.dialer.util \
+ com.android.dialer.voicemail.listui \
+ com.android.dialer.voicemailstatus \
+ com.android.dialer.widget \
+ com.android.incallui \
+ com.android.incallui.answer.impl.affordance \
+ com.android.incallui.answer.impl \
+ com.android.incallui.answer.impl.answermethod \
+ com.android.incallui.answer.impl.hint \
+ com.android.incallui.audioroute \
+ com.android.incallui.autoresizetext \
+ com.android.incallui.calllocation.impl \
+ com.android.incallui.callpending \
+ com.android.incallui.commontheme \
+ com.android.incallui.contactgrid \
+ com.android.incallui.disconnectdialog \
+ com.android.incallui.hold \
+ com.android.incallui.incall.impl \
+ com.android.incallui.maps.impl \
+ com.android.incallui.sessiondata \
+ com.android.incallui.spam \
+ com.android.incallui.speakerbuttonlogic \
+ com.android.incallui.telecomeventui \
+ com.android.incallui.video.impl \
+ com.android.incallui.video.protocol \
+ com.android.voicemail \
+ com.android.voicemail.impl \
+ com.android.voicemail.impl.configui \
+LOCAL_AAPT_FLAGS := $(filter-out $(EXCLUDE_EXTRA_PACKAGES),$(LOCAL_AAPT_FLAGS))
+LOCAL_AAPT_FLAGS := $(addprefix --extra-packages , $(LOCAL_AAPT_FLAGS))
+LOCAL_AAPT_FLAGS += \
+ --auto-add-overlay \
+ --extra-packages me.leolin.shortcutbadger \
LOCAL_STATIC_JAVA_LIBRARIES := \
android-common \
@@ -283,12 +180,12 @@
dialer-disklrucache-target \
dialer-gifdecoder-target \
dialer-glide-target \
- dialer-grpc-all-target \
- dialer-grpc-context-target \
- dialer-grpc-core-target \
+ dialer-grpc-all-target \
+ dialer-grpc-context-target \
+ dialer-grpc-core-target \
dialer-grpc-okhttp-target \
dialer-grpc-protobuf-lite-target \
- dialer-grpc-stub-target \
+ dialer-grpc-stub-target \
dialer-guava-target \
dialer-javax-annotation-api-target \
dialer-javax-inject-target \
@@ -297,10 +194,11 @@
dialer-mime4j-dom-target \
jsr305 \
libphonenumber \
- okhttp \
volley \
+ libbackup \
LOCAL_STATIC_ANDROID_LIBRARIES := \
+ android-support-core-ui \
android-support-design \
android-support-transition \
android-support-v13 \
@@ -338,13 +236,10 @@
LOCAL_PROGUARD_ENABLED := disabled
ifdef LOCAL_JACK_ENABLED
+
+
# Proguard includes
-LOCAL_PROGUARD_FLAG_FILES := \
- java/com/android/dialer/common/proguard.flags \
- java/com/android/dialer/proguard/proguard_base.flags \
- java/com/android/dialer/proguard/proguard.flags \
- java/com/android/dialer/proguard/proguard_release.flags \
- java/com/android/incallui/answer/impl/proguard.flags
+LOCAL_PROGUARD_FLAG_FILES := $(call all-named-files-under,proguard.*flags,$(SRC_DIRS))
LOCAL_PROGUARD_ENABLED := custom
LOCAL_PROGUARD_ENABLED += optimization
@@ -372,8 +267,8 @@
DIALER_MANIFEST_FILES :=
PROCESSOR_LIBRARIES_TARGET :=
PROCESSOR_JARS :=
-BACKUP_LIB_SRC_DIR :=
-EXCLUDE_BACKUP_LIB_SRCS :=
+EXCLUDE_MANIFESTS :=
+EXCLUDE_EXTRA_PACKAGES :=
# Create references to prebuilt libraries.
include $(CLEAR_VARS)
@@ -566,4 +461,4 @@
include $(BUILD_PREBUILT)
-include $(CLEAR_VARS)
\ No newline at end of file
+include $(CLEAR_VARS)