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

Commit 3bb96412 authored by Eric Erfanian's avatar Eric Erfanian
Browse files

Manually integrate upstream oc-dr1-dev changes. 

https://googleplex-android-review.git.corp.google.com/#/c/2446830/

Test: TH, make
Change-Id: I39aba7e972bac6e5864e70ed693849d90ecd7e08
parent ecc09571

Android.mk

+44 −19
Original line number Diff line number Diff line
@@ -4,13 +4,13 @@ 
# * 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 removed translation string variant:

#      $ find java/com/android/incallui/res/*mcc262*/strings.xml | xargs rm

# * 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:

#      $ 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/62787062 / b/37077388 temporarily disable proguard with javac

# * b/37077388 temporarily disable proguard with javac

LOCAL_PATH:= $(call my-dir)

include $(CLEAR_VARS)
@@ -33,7 +33,6 @@ SRC_DIRS := \ 


# Exclude files incompatible with AOSP.

EXCLUDE_FILES := \

	$(BASE_DIR)/dialer/calllog/testing/FakeCallLogApplication.java \

	$(BASE_DIR)/incallui/calllocation/impl/AuthException.java \

	$(BASE_DIR)/incallui/calllocation/impl/CallLocationImpl.java \

	$(BASE_DIR)/incallui/calllocation/impl/CallLocationModule.java \
@@ -54,6 +53,16 @@ EXCLUDE_FILES := \ 
EXCLUDE_FILES += \

	$(BASE_DIR)/contacts/common/format/testing/SpannedTestUtils.java



# Exclude build variants for now

EXCLUDE_FILES += \

	$(BASE_DIR)/dialer/buildtype/bugfood/BuildTypeAccessorImpl.java \

	$(BASE_DIR)/dialer/buildtype/dogfood/BuildTypeAccessorImpl.java \

	$(BASE_DIR)/dialer/buildtype/fishfood/BuildTypeAccessorImpl.java \

	$(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



# All Dialers resources.

# find . -type d -name "res" | uniq | sort

RES_DIRS := \
@@ -74,22 +83,23 @@ RES_DIRS := \ 
	$(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)/dialer/searchfragment/common/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)/dialershared/bubble/res \

	$(BASE_DIR)/incallui/answer/impl/affordance/res \

	$(BASE_DIR)/incallui/answer/impl/answermethod/res \

	$(BASE_DIR)/incallui/answer/impl/hint/res \
@@ -132,15 +142,17 @@ DIALER_MANIFEST_FILES += \ 
	$(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)/dialer/searchfragment/common/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 \
@@ -148,7 +160,6 @@ DIALER_MANIFEST_FILES += \ 
	$(BASE_DIR)/dialer/util/AndroidManifest.xml \

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

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

	$(BASE_DIR)/dialershared/bubble/AndroidManifest.xml \

	$(BASE_DIR)/incallui/AndroidManifest.xml \

	$(BASE_DIR)/incallui/answer/impl/affordance/AndroidManifest.xml \

	$(BASE_DIR)/incallui/answer/impl/AndroidManifest.xml \
@@ -166,8 +177,8 @@ DIALER_MANIFEST_FILES += \ 
	$(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 \

	$(BASE_DIR)/voicemail/AndroidManifest.xml \

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





# Merge all manifest files.
@@ -206,22 +217,23 @@ LOCAL_AAPT_FLAGS := \ 
        --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.dialer.searchfragment.common \

	--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.dialershared.bubble \

	--extra-packages com.android.incallui \

	--extra-packages com.android.incallui.answer.impl \

	--extra-packages com.android.incallui.answer.impl.affordance \
@@ -249,7 +261,8 @@ LOCAL_AAPT_FLAGS := \ 
	--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

	--extra-packages me.leolin.shortcutbadger \





LOCAL_STATIC_JAVA_LIBRARIES := \

	android-common \
@@ -260,12 +273,13 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
	dialer-disklrucache-target \

	dialer-gifdecoder-target \

	dialer-glide-target \

	dialer-guava-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-guava-target \

	dialer-javax-annotation-api-target \

	dialer-javax-inject-target \

	dialer-libshortcutbadger-target \
@@ -273,6 +287,7 @@ LOCAL_STATIC_JAVA_LIBRARIES := \ 
	dialer-mime4j-dom-target \

	jsr305 \

	libphonenumber \

	okhttp \

	volley \



LOCAL_STATIC_ANDROID_LIBRARIES := \
@@ -285,18 +300,18 @@ LOCAL_STATIC_ANDROID_LIBRARIES := \ 
	android-support-v7-recyclerview \



LOCAL_JAVA_LIBRARIES := \

	org.apache.http.legacy \

	dialer-auto-value \

	org.apache.http.legacy \



# Libraries needed by the compiler (JACK) to generate code.

PROCESSOR_LIBRARIES_TARGET := \

	dialer-dagger2-compiler \

	dialer-auto-value \

	dialer-dagger2 \

	dialer-dagger2-compiler \

	dialer-dagger2-producers \

	dialer-guava \

	dialer-javax-annotation-api \

	dialer-javax-inject \

	dialer-auto-value \



# Resolve the jar paths.

PROCESSOR_JARS := $(call java-lib-deps, $(PROCESSOR_LIBRARIES_TARGET))
@@ -308,7 +323,7 @@ LOCAL_JAVACFLAGS += -processorpath $(call normalize-path-list,$(PROCESSOR_JARS)) 




# Begin Bug: 37077388

LOCAL_DX_FLAGS := --core-library --multi-dex

LOCAL_DX_FLAGS := --multi-dex

LOCAL_JACK_FLAGS := --multi-dex native



LOCAL_PROGUARD_ENABLED := disabled
@@ -352,16 +367,16 @@ PROCESSOR_JARS := 
include $(CLEAR_VARS)



LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \

    dialer-dagger2-compiler:../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger-compiler/2.7/dagger-compiler-2.7$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-auto-value:../../../prebuilts/tools/common/m2/repository/com/google/auto/value/auto-value/1.3/auto-value-1.3$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-dagger2-compiler:../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger-compiler/2.7/dagger-compiler-2.7$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-dagger2:../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger/2.7/dagger-2.7$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-dagger2-producers:../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger-producers/2.7/dagger-producers-2.7$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-guava:../../../prebuilts/tools/common/m2/repository/com/google/guava/guava/20.0/guava-20.0$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-grpc-all:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-all/1.0.3/grpc-all-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-grpc-core:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-core/1.0.3/grpc-core-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-grpc-okhttp:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-okhttp/1.0.3/grpc-okhttp-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-grpc-protobuf-lite:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-protobuf-lite/1.0.3/grpc-protobuf-lite-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-grpc-stub:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-stub/1.0.3/grpc-stub-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-guava:../../../prebuilts/tools/common/m2/repository/com/google/guava/guava/20.0/guava-20.0$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-javax-annotation-api:../../../prebuilts/tools/common/m2/repository/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2$(COMMON_JAVA_PACKAGE_SUFFIX) \

    dialer-javax-inject:../../../prebuilts/tools/common/m2/repository/javax/inject/javax.inject/1/javax.inject-1$(COMMON_JAVA_PACKAGE_SUFFIX)
@@ -530,3 +545,13 @@ LOCAL_UNINSTALLABLE_MODULE := true 
include $(BUILD_PREBUILT)



include $(CLEAR_VARS)



LOCAL_MODULE_CLASS := JAVA_LIBRARIES

LOCAL_MODULE := dialer-grpc-context-target

LOCAL_SDK_VERSION := current

LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-context/1.0.3/grpc-context-1.0.3$(COMMON_JAVA_PACKAGE_SUFFIX)

LOCAL_UNINSTALLABLE_MODULE := true



include $(BUILD_PREBUILT)



include $(CLEAR_VARS)
 
 No newline at end of file

java/com/android/contacts/common/res/values-uz/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
    <string name="call_fax_work" msgid="5260192771364592922">"Ish faks raqamiga qo‘ng‘iroq qilish"</string>

    <string name="call_fax_home" msgid="5174311195081144124">"Uy faks raqamiga qo‘ng‘iroq qilish"</string>

    <string name="call_pager" msgid="6814149227741274161">"Peyjerga qo‘ng‘iroq qilish"</string>

    <string name="call_other" msgid="5536385588712587235">"Qo‘ng‘iroq qilish"</string>

    <string name="call_other" msgid="5536385588712587235">"Chaqiruv"</string>

    <string name="call_callback" msgid="6314019862718112786">"Qayta qo‘ng‘iroq raqamiga qo‘ng‘iroq qilish"</string>

    <string name="call_car" msgid="3197417098027764954">"Mashina telefon raqamiga qo‘ng‘iroq qilish"</string>

    <string name="call_company_main" msgid="2557663310028446397">"Kompaniya asosiy raqamiga qo‘ng‘iroq qilish"</string>
@@ -40,7 +40,7 @@ 
    <string name="call_work_pager" msgid="3791778749827366574">"Ish peyjeriga qo‘ng‘iroq qilish"</string>

    <string name="call_assistant" msgid="4177478845473789294">"Qo‘ng‘iroq: <xliff:g id="ASSISTANT">%s</xliff:g>"</string>

    <string name="call_mms" msgid="4958811711741872901">"MMS raqamga qo‘ng‘iroq qilish"</string>

    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Qo‘ng‘iroq qilish)"</string>

    <string name="call_by_shortcut" msgid="4623082183552111045">"<xliff:g id="CONTACT_NAME">%s</xliff:g> (Chaqiruv)"</string>

    <string name="sms_custom" msgid="8785368968605026317">"<xliff:g id="CUSTOM">%s</xliff:g>ga sms jo‘natish"</string>

    <string name="sms_home" msgid="3527719551060295243">"Uy telefoniga sms jo‘natish"</string>

    <string name="sms_mobile" msgid="8883045857887736518">"SMS: mobil"</string>

java/com/android/dialer/app/res/values-af/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -235,4 +235,7 @@ 
    <string name="spam_number_call_log_label" msgid="2678431398326811131">"Strooipos"</string>

    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> is vanlyn en kan nie bereik word nie"</string>

    <string name="about_phone_label" msgid="582991354677973731">"Meer oor"</string>

    <string name="view_conversation" msgid="7895904782094119702">"Bekyk"</string>

    <string name="ec_data_deleted" msgid="4794880345545827107">"Oproep geskrap. Bekyk en vee aanhegsels uit wat gedurende hierdie oproep in Boodskappe gedeel is."</string>

    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"Oproepe geskrap. Bekyk en vee aanhegsels uit wat gedurende oproepe in Boodskappe gedeel is."</string>

</resources>

java/com/android/dialer/app/res/values-am/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -235,4 +235,7 @@ 
    <string name="spam_number_call_log_label" msgid="2678431398326811131">"አይፈለጌ መልዕክት"</string>

    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> ከመስመር ውጭ ነው እና ሊደረስበት አይችልም"</string>

    <string name="about_phone_label" msgid="582991354677973731">"ስለ"</string>

    <string name="view_conversation" msgid="7895904782094119702">"አሳይ"</string>

    <string name="ec_data_deleted" msgid="4794880345545827107">"ጥሪ ተሰርዟል። በዚህ ጥሪ ወቅት በመልዕክቶች ውስጥ የተጋሩ አባሪዎችን ይመልከቱ እንዲሁም ይሰርዙ።"</string>

    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"ጥሪ ተሰርዟል። በዚህ ጥሪ ወቅት በመልዕክቶች ውስጥ የተጋሩ አባሪዎችን ይመልከቱ እንዲሁም ይሰርዙ።"</string>

</resources>

java/com/android/dialer/app/res/values-ar/strings.xml

+3 −0
Original line number Diff line number Diff line
@@ -247,4 +247,7 @@ 
    <string name="spam_number_call_log_label" msgid="2678431398326811131">"تعليق غير مرغوب فيه"</string>

    <string name="call_composer_connection_failed" msgid="6776461585447831242">"<xliff:g id="NAME">%1$s</xliff:g> غير متصل ولا يمكن الوصول إليه"</string>

    <string name="about_phone_label" msgid="582991354677973731">"حول"</string>

    <string name="view_conversation" msgid="7895904782094119702">"عرض"</string>

    <string name="ec_data_deleted" msgid="4794880345545827107">"‏تم حذف المكالمة. يمكنك عرض وحذف المرفقات التي تمت مشاركتها أثناء هذه المكالمة في Messages."</string>

    <string name="multiple_ec_data_deleted" msgid="2971579891973176316">"‏تم حذف المكالمة. يمكنك عرض وحذف المرفقات التي تمت مشاركتها أثناء إجراء المكالمات في Messages."</string>

</resources>