diff options
| author | Santos Cordon <santoscordon@google.com> | 2013-09-04 21:27:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2013-09-04 21:27:37 +0000 |
| commit | 9b6c525d249e4092b9cabad573e4b37fa7aec946 (patch) | |
| tree | feebce1c9bbcc55006e6020da8094efc4a04b48c | |
| parent | 6bd2f2eef4a6882f43decbe481082a4f289f26eb (diff) | |
| parent | c286ae2cf471a7ddad4ec1e9a00e7bc9c30fdd91 (diff) | |
Merge "Combine InCallUI & Dialer (part 3)" into klp-dev
| -rw-r--r-- | Android.mk | 11 | ||||
| -rw-r--r-- | AndroidManifest.xml | 32 |
2 files changed, 39 insertions, 4 deletions
diff --git a/Android.mk b/Android.mk index e0f5310e5..899d58917 100644 --- a/Android.mk +++ b/Android.mk @@ -4,20 +4,23 @@ include $(CLEAR_VARS) LOCAL_MODULE_TAGS := optional contacts_common_dir := ../ContactsCommon +incallui_dir := ../InCallUI -src_dirs := src $(contacts_common_dir)/src -res_dirs := res $(contacts_common_dir)/res +src_dirs := src $(contacts_common_dir)/src $(incallui_dir)/src +res_dirs := res $(contacts_common_dir)/res $(incallui_dir)/res LOCAL_SRC_FILES := $(call all-java-files-under, $(src_dirs)) LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs)) LOCAL_AAPT_FLAGS := \ --auto-add-overlay \ - --extra-packages com.android.contacts.common + --extra-packages com.android.contacts.common \ + --extra-packages com.android.incallui LOCAL_JAVA_LIBRARIES := telephony-common LOCAL_STATIC_JAVA_LIBRARIES := \ com.android.phone.shared \ + com.android.services.telephony.common \ com.android.vcard \ android-common \ guava \ @@ -31,7 +34,7 @@ LOCAL_PACKAGE_NAME := Dialer LOCAL_CERTIFICATE := shared LOCAL_PRIVILEGED_MODULE := true -LOCAL_PROGUARD_FLAG_FILES := proguard.flags +LOCAL_PROGUARD_FLAG_FILES := proguard.flags $(incallui_dir)/proguard.flags include $(BUILD_PACKAGE) diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 6f3784112..6f3450f32 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -255,5 +255,37 @@ <service android:name=".contact.ContactUpdateService" android:exported="false" /> + + <!-- Main in-call UI activity. This is never launched directly + from outside the phone app; instead, it's either launched by + the OutgoingCallBroadcaster (for outgoing calls), or as the + fullScreenIntent of a notification (for incoming calls.) --> + <activity android:name="com.android.incallui.InCallActivity" + android:theme="@style/Theme.InCallScreen" + android:label="@string/inCallLabel" + android:excludeFromRecents="true" + android:launchMode="singleInstance" + android:screenOrientation="nosensor" + android:configChanges="keyboardHidden" + android:exported="false" + android:process="com.android.incallui"> + </activity> + + <service android:name="com.android.incallui.CallHandlerService" + android:process="com.android.incallui"> + <intent-filter> + <action android:name="com.android.services.telephony.common.ICallHandlerService" /> + </intent-filter> + </service> + + <!-- BroadcastReceiver for receiving Intents from Notification mechanism. --> + <receiver android:name="com.android.incallui.InCallApp$NotificationBroadcastReceiver" + android:exported="false" + android:process="com.android.incallui"> + <intent-filter> + <action android:name="com.android.incallui.ACTION_HANG_UP_ONGOING_CALL" /> + </intent-filter> + </receiver> + </application> </manifest> |