diff options
author | Treehugger Robot <treehugger-gerrit@google.com> | 2017-08-31 16:17:04 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2017-08-31 16:17:04 +0000 |
commit | c39ea3c55fac807c0b98aabdf56c70dc8a49036c (patch) | |
tree | e282668a9587cf6c1ec7b604dea860400c75c6c7 /java/com/android/incallui/AndroidManifest.xml | |
parent | 68038172793ee0e2ab3e2e56ddfbeb82879d1f58 (diff) | |
parent | 2ca4318cc1ee57dda907ba2069bd61d162b1baef (diff) |
Merge "Update Dialer source to latest internal Google revision."
Diffstat (limited to 'java/com/android/incallui/AndroidManifest.xml')
-rw-r--r-- | java/com/android/incallui/AndroidManifest.xml | 109 |
1 files changed, 52 insertions, 57 deletions
diff --git a/java/com/android/incallui/AndroidManifest.xml b/java/com/android/incallui/AndroidManifest.xml index 8539bd0cf..d854a7fc8 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,77 +43,72 @@ 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"/> </intent-filter> </service> - <!-- - Comments for attributes in SpamNotificationActivity: - taskAffinity="" -> Open the dialog without opening the dialer app behind it - noHistory="true" -> Navigating away finishes activity - 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"> - </activity> - - <service - android:exported="false" - android:name="com.android.incallui.spam.SpamNotificationService"/> + android:excludeFromRecents="true" + android:exported="false" + android:name=".AudioRouteSelectorActivity" + android:noHistory="true" + android:theme="@style/Theme.Incall.DialogHolder" + /> <!-- 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> |