Merge remote-tracking branch 'origin/lineage-20.0' into v1-t-redesign (2509c944) · Commits · e / os / android_packages_apps_Dialer

Android.mk

+3 −216

Original line number	Diff line number	Diff line
		@@ -15,24 +15,6 @@ include $(CLEAR_VARS)
		# The base directory for Dialer sources.
		BASE_DIR := java/com/android

		# Exclude files incompatible with AOSP.
		EXCLUDE_FILES := \
		$(BASE_DIR)/incallui/calllocation/impl/AuthException.java \
		$(BASE_DIR)/incallui/calllocation/impl/CallLocationImpl.java \
		$(BASE_DIR)/incallui/calllocation/impl/CallLocationModule.java \
		$(BASE_DIR)/incallui/calllocation/impl/DownloadMapImageTask.java \
		$(BASE_DIR)/incallui/calllocation/impl/GoogleLocationSettingHelper.java \
		$(BASE_DIR)/incallui/calllocation/impl/HttpFetcher.java \
		$(BASE_DIR)/incallui/calllocation/impl/LocationFragment.java \
		$(BASE_DIR)/incallui/calllocation/impl/LocationHelper.java \
		$(BASE_DIR)/incallui/calllocation/impl/LocationPresenter.java \
		$(BASE_DIR)/incallui/calllocation/impl/LocationUrlBuilder.java \
		$(BASE_DIR)/incallui/calllocation/impl/ReverseGeocodeTask.java \
		$(BASE_DIR)/incallui/calllocation/impl/TrafficStatsTags.java \
		$(BASE_DIR)/incallui/maps/impl/MapsImpl.java \
		$(BASE_DIR)/incallui/maps/impl/MapsModule.java \
		$(BASE_DIR)/incallui/maps/impl/StaticMapFragment.java \

		# Exclude testing only class, not used anywhere here
		EXCLUDE_FILES += \
		$(BASE_DIR)/contacts/common/format/testing/SpannedTestUtils.java
		@@ -40,35 +22,12 @@ EXCLUDE_FILES += \
		# Exclude rootcomponentgenerator
		EXCLUDE_FILES += \
		$(call all-java-files-under, $(BASE_DIR)/dialer/rootcomponentgenerator) \
		$(call all-java-files-under, $(BASE_DIR)/dialer/inject/demo)

		# Exclude build variants for now
		EXCLUDE_FILES += \
		$(BASE_DIR)/dialer/constants/googledialer/ConstantsImpl.java \
		$(BASE_DIR)/dialer/binary/google/GoogleStubDialerRootComponent.java \
		$(BASE_DIR)/dialer/binary/google/GoogleStubDialerApplication.java \

		# * b/62875795
		ifneq ($(wildcard packages/apps/Dialer/java/com/android/voicemail/impl/com/google/internal/communications/voicemailtranscription/v1/VoicemailTranscriptionServiceGrpc.java),)
		$(error Please remove file packages/apps/Dialer/java/com/android/voicemail/impl/com/google/internal/communications/voicemailtranscription/v1/VoicemailTranscriptionServiceGrpc.java )
		endif

		EXCLUDE_RESOURCE_DIRECTORIES := \
		java/com/android/incallui/maps/impl/res \

		# All Dialers resources.
		# All Dialer resources.
		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.
		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 := \
		@@ -85,55 +44,35 @@ LOCAL_PROTOC_FLAGS := --proto_path=$(LOCAL_PATH)

		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.
		include ${LOCAL_PATH}/packages.mk

		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 \
		android-support-dynamic-animation \
		com.android.vcard \
		dialer-animal-sniffer-annotations-target \
		dialer-commons-io-target \
		dialer-dagger2-target \
		dialer-disklrucache-target \
		dialer-gifdecoder-target \
		dialer-glide-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-j2objc-annotations-target \
		dialer-javax-annotation-api-target \
		dialer-javax-inject-target \
		dialer-libshortcutbadger-target \
		dialer-mime4j-core-target \
		dialer-mime4j-dom-target \
		dialer-okhttp-target \
		dialer-okio-target \
		dialer-guava-target \
		dialer-glide-target \
		dialer-glide-annotation-target \
		dialer-zxing-target \
		error_prone_annotations \
		jsr305 \
		libbackup \
		libphonenumber \
		volley \
		org.lineageos.lib.phone
		org.lineageos.lib.phone \
		androidx.annotation_annotation \

		LOCAL_STATIC_ANDROID_LIBRARIES := \
		android-support-core-ui \
		@@ -213,11 +152,6 @@ LOCAL_PREBUILT_STATIC_JAVA_LIBRARIES := \
		dialer-dagger2-producers:../../../prebuilts/tools/common/m2/repository/com/google/dagger/dagger-producers/2.7/dagger-producers-2.7.jar \
		dialer-glide-annotation:../../../prebuilts/maven_repo/bumptech/com/github/bumptech/glide/annotation/SNAPSHOT/annotation-SNAPSHOT.jar \
		dialer-glide-compiler:../../../prebuilts/maven_repo/bumptech/com/github/bumptech/glide/compiler/SNAPSHOT/compiler-SNAPSHOT.jar \
		dialer-grpc-all:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-all/1.0.3/grpc-all-1.0.3.jar \
		dialer-grpc-core:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-core/1.0.3/grpc-core-1.0.3.jar \
		dialer-grpc-okhttp:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-okhttp/1.0.3/grpc-okhttp-1.0.3.jar \
		dialer-grpc-protobuf-lite:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-protobuf-lite/1.0.3/grpc-protobuf-lite-1.0.3.jar \
		dialer-grpc-stub:../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-stub/1.0.3/grpc-stub-1.0.3.jar \
		dialer-guava:../../../prebuilts/tools/common/m2/repository/com/google/guava/guava/23.0/guava-23.0.jar \
		dialer-javax-annotation-api:../../../prebuilts/tools/common/m2/repository/javax/annotation/javax.annotation-api/1.2/javax.annotation-api-1.2.jar \
		dialer-javax-inject:../../../prebuilts/tools/common/m2/repository/javax/inject/javax.inject/1/javax.inject-1.jar \
		@@ -319,19 +253,6 @@ include $(BUILD_PREBUILT)

		include $(CLEAR_VARS)

		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-libshortcutbadger-target
		LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
		LOCAL_LICENSE_CONDITIONS := notice
		LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/me/leolin/ShortcutBadger/1.1.13/ShortcutBadger-1.1.13.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)

		include $(CLEAR_VARS)

		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-javax-inject-target
		LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
		@@ -384,124 +305,6 @@ include $(BUILD_PREBUILT)

		include $(CLEAR_VARS)

		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-grpc-core-target
		LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
		LOCAL_LICENSE_CONDITIONS := notice
		LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-core/1.0.3/grpc-core-1.0.3.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)

		include $(CLEAR_VARS)

		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-grpc-okhttp-target
		LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
		LOCAL_LICENSE_CONDITIONS := notice
		LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-okhttp/1.0.3/grpc-okhttp-1.0.3.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)

		include $(CLEAR_VARS)

		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-grpc-protobuf-lite-target
		LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
		LOCAL_LICENSE_CONDITIONS := notice
		LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-protobuf-lite/1.0.3/grpc-protobuf-lite-1.0.3.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)

		include $(CLEAR_VARS)

		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-grpc-stub-target
		LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
		LOCAL_LICENSE_CONDITIONS := notice
		LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-stub/1.0.3/grpc-stub-1.0.3.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)

		include $(CLEAR_VARS)

		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-grpc-all-target
		LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
		LOCAL_LICENSE_CONDITIONS := notice
		LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-all/1.0.3/grpc-all-1.0.3.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)

		include $(CLEAR_VARS)

		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-grpc-context-target
		LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
		LOCAL_LICENSE_CONDITIONS := notice
		LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/io/grpc/grpc-context/1.0.3/grpc-context-1.0.3.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)


		include $(CLEAR_VARS)

		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-zxing-target
		LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
		LOCAL_LICENSE_CONDITIONS := notice
		LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../external/zxing/core/core.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)

		include $(CLEAR_VARS)

		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-okhttp-target
		LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
		LOCAL_LICENSE_CONDITIONS := notice
		LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/squareup/okhttp/okhttp/2.7.4/okhttp-2.7.4.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)

		include $(CLEAR_VARS)

		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-okio-target
		LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
		LOCAL_LICENSE_CONDITIONS := notice
		LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/com/squareup/okio/okio/1.9.0/okio-1.9.0.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)

		include $(CLEAR_VARS)

		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-j2objc-annotations-target
		LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
		@@ -515,19 +318,6 @@ include $(BUILD_PREBUILT)

		include $(CLEAR_VARS)

		LOCAL_MODULE_CLASS := JAVA_LIBRARIES
		LOCAL_MODULE := dialer-animal-sniffer-annotations-target
		LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
		LOCAL_LICENSE_CONDITIONS := notice
		LOCAL_NOTICE_FILE := $(LOCAL_PATH)/LICENSE
		LOCAL_SDK_VERSION := current
		LOCAL_SRC_FILES := ../../../prebuilts/tools/common/m2/repository/org/codehaus/mojo/animal-sniffer-annotations/1.14/animal-sniffer-annotations-1.14.jar
		LOCAL_UNINSTALLABLE_MODULE := true

		include $(BUILD_PREBUILT)

		include $(CLEAR_VARS)

		LOCAL_MODULE := dialer-rootcomponentprocessor
		LOCAL_LICENSE_KINDS := SPDX-license-identifier-Apache-2.0
		LOCAL_LICENSE_CONDITIONS := notice
		@@ -538,11 +328,8 @@ BASE_DIR := java/com/android

		LOCAL_SRC_FILES := \
		$(call all-java-files-under, $(BASE_DIR)/dialer/rootcomponentgenerator) \
		$(BASE_DIR)/dialer/inject/DialerRootComponent.java \
		$(BASE_DIR)/dialer/inject/DialerVariant.java \
		$(BASE_DIR)/dialer/inject/HasRootComponent.java \
		$(BASE_DIR)/dialer/inject/IncludeInDialerRoot.java \
		$(BASE_DIR)/dialer/inject/InstallIn.java \
		$(BASE_DIR)/dialer/inject/RootComponentGeneratorMetadata.java

		LOCAL_STATIC_JAVA_LIBRARIES := \

AndroidManifest.xml

+18 −33

Original line number	Diff line number	Diff line
		@@ -20,10 +20,11 @@
		android:versionName="23.0">

		<uses-sdk
		android:minSdkVersion="24"
		android:minSdkVersion="30"
		android:targetSdkVersion="30"/>


		<uses-permission android:name="android.permission.BLUETOOTH" />
		<uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>
		<uses-permission android:name="android.permission.CALL_PHONE"/>
		<uses-permission android:name="android.permission.READ_CONTACTS"/>
		@@ -62,7 +63,6 @@
		<uses-permission android:name="android.permission.CONNECTIVITY_USE_RESTRICTED_NETWORKS"/>
		<uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>
		<uses-permission android:name="android.permission.READ_PRIVILEGED_PHONE_STATE"/>
		<uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
		<uses-permission android:name="android.permission.DIALER_ORIGIN"/>

		<uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
		@@ -83,37 +83,8 @@
		android:protectionLevel="signature" />
		<uses-permission android:name="com.android.dialer.permission.DIALER_ORIGIN"/>

		<!-- Permissions needed for badger count showing on launch icon. -->

		<!--for Samsung-->
		<uses-permission android:name="com.sec.android.provider.badge.permission.READ"/>
		<uses-permission android:name="com.sec.android.provider.badge.permission.WRITE"/>

		<!--for htc-->
		<uses-permission android:name="com.htc.launcher.permission.READ_SETTINGS"/>
		<uses-permission android:name="com.htc.launcher.permission.UPDATE_SHORTCUT"/>

		<!--for sony-->
		<uses-permission android:name="com.sonyericsson.home.permission.BROADCAST_BADGE"/>
		<uses-permission android:name="com.sonymobile.home.permission.PROVIDER_INSERT_BADGE"/>

		<!--for apex-->
		<uses-permission android:name="com.anddoes.launcher.permission.UPDATE_COUNT"/>

		<!--for solid-->
		<uses-permission android:name="com.majeur.launcher.permission.UPDATE_BADGE"/>

		<!--for huawei-->
		<uses-permission android:name="com.huawei.android.launcher.permission.CHANGE_BADGE"/>
		<uses-permission android:name="com.huawei.android.launcher.permission.READ_SETTINGS"/>
		<uses-permission android:name="com.huawei.android.launcher.permission.WRITE_SETTINGS"/>

		<!--for ZUK-->
		<uses-permission android:name="android.permission.READ_APP_BADGE"/>

		<!--for OPPO-->
		<uses-permission android:name="com.oppo.launcher.permission.READ_SETTINGS"/>
		<uses-permission android:name="com.oppo.launcher.permission.WRITE_SETTINGS"/>
		<uses-permission android:name="android.permission.RECORD_AUDIO" />
		<uses-permission android:name="android.permission.CAPTURE_AUDIO_OUTPUT" />

		<application
		android:hardwareAccelerated="true"
		@@ -125,6 +96,20 @@
		android:usesCleartextTraffic="false"
		android:extractNativeLibs="false"
		android:requestLegacyExternalStorage="true">

		<activity android:name=".callstats.CallStatsDetailActivity"
		android:label="@string/call_stats_detail_title"
		android:theme="@style/Dialer.ThemeBase.NoActionBar"
		android:exported="true"
		android:screenOrientation="portrait">
		<intent-filter>
		<action android:name="android.intent.action.VIEW" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		</activity>

		<service android:name="com.android.dialer.callrecord.impl.CallRecorderService"
		android:process="com.android.incallui" />
		</application>

		</manifest>

CleanSpec.mk

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,5 +38,5 @@
		# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
		# ************************************************

		$(call add-clean-step, (cd packages/apps/Dialer; git clean -f java/com/android/voicemail/impl/com/google/internal/communications/voicemailtranscription/v1/VoicemailTranscriptionServiceGrpc.java >&2) \|\| true)
		$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/priv-app/Dialer)
		$(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS/Dialer_intermediates)

assets/product/AndroidManifest.xml

deleted100644 → 0

+0 −20

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		~ Copyright (C) 2017 The Android Open Source Project
		~
		~ Licensed under the Apache License, Version 2.0 (the "License");
		~ you may not use this file except in compliance with the License.
		~ You may obtain a copy of the License at
		~
		~ http://www.apache.org/licenses/LICENSE-2.0
		~
		~ Unless required by applicable law or agreed to in writing, software
		~ distributed under the License is distributed on an "AS IS" BASIS,
		~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		~ See the License for the specific language governing permissions and
		~ limitations under the License
		-->
		<manifest
		package="com.google.android.assets.product">
		<application/>
		</manifest>

assets/product/res/drawable-hdpi/product_logo_avatar_anonymous_color_120.png

deleted100644 → 0

−2.47 KiB

Loading image diff...