diff options
author | Tobias Thierer <tobiast@google.com> | 2017-06-09 14:16:05 +0000 |
---|---|---|
committer | Tobias Thierer <tobiast@google.com> | 2017-06-09 14:16:05 +0000 |
commit | cded3beaf28a703e1ef8f71bbc6836e6806c3736 (patch) | |
tree | c1b5e8199b5996fc848e7455d04126b9cdbb3c39 /java/com/android/incallui/AndroidManifest.xml | |
parent | c67d658e7daa453fe9ad9fd1a37f81eaf2048c44 (diff) |
Revert "Update AOSP Dialer source from internal google3 repository at cl/158012278. am: 91ce7d2a47"
This reverts commit c67d658e7daa453fe9ad9fd1a37f81eaf2048c44.
Reason for revert: This CL broke the sailfish-userdebug_javac-all target on master.
Change-Id: I9b54333a654c00154ca84f4ece84bea4f07cc19b
Diffstat (limited to 'java/com/android/incallui/AndroidManifest.xml')
-rw-r--r-- | java/com/android/incallui/AndroidManifest.xml | 110 |
1 files changed, 48 insertions, 62 deletions
diff --git a/java/com/android/incallui/AndroidManifest.xml b/java/com/android/incallui/AndroidManifest.xml index 703e5b509..8539bd0cf 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,49 +43,47 @@ 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:launchMode="singleInstance" - android:name="com.android.incallui.InCallActivity" - android:resizeableActivity="true" - android:screenOrientation="nosensor" - android:taskAffinity="com.android.incallui" - android:theme="@style/Theme.InCallScreen"> + 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"> </activity> <activity - 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"/> + 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"/> <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"/> @@ -99,35 +97,23 @@ 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"/> - - <receiver - android:exported="false" - android:name=".ReturnToCallActionReceiver"/> + android:directBootAware="true" + android:exported="false" + android:name="com.android.incallui.NotificationBroadcastReceiver"/> </application> |