Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 40adde2d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Implement call streaming notification." into udc-dev am: b62913ef 

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/services/Telecomm/+/23077737



Change-Id: I4c058d6b0c7f4716b08beedd5e99a9856c42a2f3
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 07d04736 b62913ef

Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -27,6 +27,7 @@ android_app { 
    ],

    static_libs: [

        "androidx.annotation_annotation",

        "androidx.core_core",

    ],

    libs: [

        "services",

AndroidManifest.xml

+2 −0
Original line number Diff line number Diff line
@@ -63,6 +63,8 @@ 
    <uses-permission android:name="android.permission.WRITE_BLOCKED_NUMBERS"/>

    <uses-permission android:name="android.permission.SUBSTITUTE_NOTIFICATION_APP_NAME"/>

    <uses-permission android:name="android.permission.POST_NOTIFICATIONS"/>

    <uses-permission android:name="android.permission.USE_COLORIZED_NOTIFICATIONS"/>

    <uses-permission android:name="android.permission.USE_FULL_SCREEN_INTENT"/>

    <uses-permission android:name="com.android.phone.permission.ACCESS_LAST_KNOWN_CELL_ID"/>

    <uses-permission android:name="android.permission.STATUS_BAR_SERVICE" />

res/drawable/gm_phonelink.xml

0 → 100644
+11 −0
Original line number Diff line number Diff line 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

    android:width="20dp"

    android:height="20dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?android:attr/colorControlNormal"

    android:autoMirrored="true">

  <path

      android:fillColor="#FF000000"

      android:pathData="M5,6h16L21,4L5,4c-1.1,0 -2,0.9 -2,2v11L1,17v3h11v-3L5,17L5,6zM21,8h-6c-0.55,0 -1,0.45 -1,1v10c0,0.55 0.45,1 1,1h6c0.55,0 1,-0.45 1,-1L22,9c0,-0.55 -0.45,-1 -1,-1zM20,17h-4v-7h4v7z"/>

</vector>

res/values/strings.xml

+20 −0
Original line number Diff line number Diff line
@@ -321,6 +321,10 @@ 
    <string name="notification_channel_disconnected_calls">Disconnected calls</string>

    <!-- Notification channel name for a channel containing crashed phone apps service notifications. -->

    <string name="notification_channel_in_call_service_crash">Crashed phone apps</string>

    <!-- Notification channel name for a channel containing notifications related to call streaming.

         Call streaming is a feature where an app can use another device like a tablet to see and

         control a call taking place on their phone. -->

    <string name="notification_channel_call_streaming">Call streaming</string>



    <!-- Alert dialog content used to inform the user that placing a new outgoing call will end the

         ongoing call in the app "other_app". -->
@@ -395,4 +399,20 @@ 
    <string name="callendpoint_name_streaming">External</string>

    <!-- The user-visible name of the unknown new type CallEndpoint -->

    <string name="callendpoint_name_unknown">Unknown</string>



    <!-- The content of a notification shown when a call is being streamed to another device.

         Call streaming is a feature where a user can see and interact with a call from another

         device like a tablet while the call takes place on their phone. -->

    <string name="call_streaming_notification_body">Streaming audio to other device</string>

    <!-- A notification action which is shown when a call is being streamed to another device.

         Tapping the action will hang up the call.

         Call streaming is a feature where a user can see and interact with a call from another

         device like a tablet while the call takes place on their phone. -->

    <string name="call_streaming_notification_action_hang_up">Hang up</string>

    <!-- A notification action which is shown when a call is being streamed to another device.

         Tapping the action will move the call back to the phone from the device it is being

         streamed to.

         Call streaming is a feature where a user can see and interact with a call from another

         device like a tablet while the call takes place on their phone. -->

    <string name="call_streaming_notification_action_switch_here">Switch here</string>

</resources>

src/com/android/server/telecom/Call.java

+3 −0
Original line number Diff line number Diff line
@@ -999,6 +999,9 @@ public class Call implements CreateConnectionResponse, EventManager.Loggable, 
        s.append(SimpleDateFormat.getDateTimeInstance().format(new Date(getCreationTimeMillis())));

        s.append("]");

        s.append(isIncoming() ? "(MT - incoming)" : "(MO - outgoing)");

        s.append("(User=");

        s.append(getInitiatingUser());

        s.append(")");

        s.append("\n\t");



        PhoneAccountHandle targetPhoneAccountHandle = getTargetPhoneAccount();