Update AOSP Dialer source from internal google3 repository at
cl/158012278.
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/152373142 (4/06/2017) to cl/158012278 (6/05/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: I4d3f14b5140e2e51bead9497bc118a205b3ebe76
diff --git a/java/com/android/incallui/AndroidManifest.xml b/java/com/android/incallui/AndroidManifest.xml
index 8539bd0..703e5b5 100644
--- a/java/com/android/incallui/AndroidManifest.xml
+++ b/java/com/android/incallui/AndroidManifest.xml
@@ -15,11 +15,11 @@
-->
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.incallui">
+ package="com.android.incallui">
<uses-sdk
- android:minSdkVersion="23"
- android:targetSdkVersion="26"/>
+ android:minSdkVersion="23"
+ android:targetSdkVersion="26"/>
<uses-permission android:name="android.permission.CONTROL_INCALL_EXPERIENCE"/>
<!-- We use this to disable the status bar buttons of home, back and recent
@@ -31,8 +31,8 @@
<!-- Warning: setting the required boolean to true would prevent installation of Dialer on
devices which do not support a camera. -->
<uses-feature
- android:name="android.hardware.camera.any"
- android:required="false"/>
+ android:name="android.hardware.camera.any"
+ android:required="false"/>
<!-- Testing location -->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
@@ -43,47 +43,49 @@
Set taskAffinity for application is not working because it will be merged and the result is
that all activities here still have same taskAffinity as activities under dialer. -->
<application>
- <meta-data android:name="android.telephony.hide_voicemail_settings_menu"
- android:value="true"/>
+ <meta-data
+ android:name="android.telephony.hide_voicemail_settings_menu"
+ android:value="true"/>
+
<activity
- android:directBootAware="true"
- android:excludeFromRecents="true"
- android:exported="false"
- android:label="@string/phoneAppLabel"
- android:taskAffinity="com.android.incallui"
- android:launchMode="singleInstance"
- android:name="com.android.incallui.InCallActivity"
- android:resizeableActivity="true"
- android:screenOrientation="nosensor"
- android:theme="@style/Theme.InCallScreen">
+ android:directBootAware="true"
+ android:excludeFromRecents="true"
+ android:exported="false"
+ android:label="@string/phoneAppLabel"
+ android:launchMode="singleInstance"
+ android:name="com.android.incallui.InCallActivity"
+ android:resizeableActivity="true"
+ android:screenOrientation="nosensor"
+ android:taskAffinity="com.android.incallui"
+ android:theme="@style/Theme.InCallScreen">
</activity>
<activity
- android:directBootAware="true"
- android:excludeFromRecents="true"
- android:noHistory="true"
- android:exported="false"
- android:label="@string/manageConferenceLabel"
- android:taskAffinity="com.android.incallui"
- android:launchMode="singleTask"
- android:name="com.android.incallui.ManageConferenceActivity"
- android:resizeableActivity="true"
- android:theme="@style/Theme.InCallScreen.ManageConference"/>
+ android:directBootAware="true"
+ android:excludeFromRecents="true"
+ android:exported="false"
+ android:label="@string/manageConferenceLabel"
+ android:launchMode="singleTask"
+ android:name="com.android.incallui.ManageConferenceActivity"
+ android:noHistory="true"
+ android:resizeableActivity="true"
+ android:taskAffinity="com.android.incallui"
+ android:theme="@style/Theme.InCallScreen.ManageConference"/>
<service
- android:directBootAware="true"
- android:exported="true"
- android:name="com.android.incallui.InCallServiceImpl"
- android:permission="android.permission.BIND_INCALL_SERVICE">
+ android:directBootAware="true"
+ android:exported="true"
+ android:name="com.android.incallui.InCallServiceImpl"
+ android:permission="android.permission.BIND_INCALL_SERVICE">
<meta-data
- android:name="android.telecom.IN_CALL_SERVICE_UI"
- android:value="true"/>
+ android:name="android.telecom.IN_CALL_SERVICE_UI"
+ android:value="true"/>
<meta-data
- android:name="android.telecom.IN_CALL_SERVICE_RINGING"
- android:value="false"/>
+ android:name="android.telecom.IN_CALL_SERVICE_RINGING"
+ android:value="false"/>
<meta-data
- android:name="android.telecom.INCLUDE_EXTERNAL_CALLS"
- android:value="true"/>
+ android:name="android.telecom.INCLUDE_EXTERNAL_CALLS"
+ android:value="true"/>
<intent-filter>
<action android:name="android.telecom.InCallService"/>
@@ -97,23 +99,35 @@
excludeFromRecents="true" -> Don't show in "recent apps" screen
-->
<activity
- android:excludeFromRecents="true"
- android:exported="false"
- android:name="com.android.incallui.spam.SpamNotificationActivity"
- android:noHistory="true"
- android:taskAffinity=""
- android:theme="@style/AfterCallNotificationTheme">
+ android:excludeFromRecents="true"
+ android:exported="false"
+ android:name="com.android.incallui.spam.SpamNotificationActivity"
+ android:noHistory="true"
+ android:taskAffinity=""
+ android:theme="@style/AfterCallNotificationTheme">
</activity>
+ <activity
+ android:excludeFromRecents="true"
+ android:exported="false"
+ android:name=".AudioRouteSelectorActivity"
+ android:noHistory="true"
+ android:theme="@style/Theme.Incall.DialogHolder"
+ />
+
<service
- android:exported="false"
- android:name="com.android.incallui.spam.SpamNotificationService"/>
+ android:exported="false"
+ android:name="com.android.incallui.spam.SpamNotificationService"/>
<!-- BroadcastReceiver for receiving Intents from Notification mechanism. -->
<receiver
- android:directBootAware="true"
- android:exported="false"
- android:name="com.android.incallui.NotificationBroadcastReceiver"/>
+ android:directBootAware="true"
+ android:exported="false"
+ android:name="com.android.incallui.NotificationBroadcastReceiver"/>
+
+ <receiver
+ android:exported="false"
+ android:name=".ReturnToCallActionReceiver"/>
</application>