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

Commit 5d6e0c92 authored by Kholoud Mohamed's avatar Kholoud Mohamed Committed by Android (Google) Code Review
Browse files

Merge "Allow updating enteprise strings in Telecomm"

parents d79dc5d7 b3977d43
Loading
Loading
Loading
Loading
+30 −30
Original line number Diff line number Diff line
@@ -17,37 +17,21 @@
package com.android.server.telecom.ui;

import static android.Manifest.permission.READ_PHONE_STATE;
import static android.app.admin.DevicePolicyResources.Strings.Dialer.NOTIFICATION_MISSED_WORK_CALL_TITLE;

import android.annotation.NonNull;
import android.app.BroadcastOptions;
import android.content.ContentProvider;
import android.content.pm.PackageManager.NameNotFoundException;
import android.os.Bundle;
import android.telecom.Logging.Runnable;
import android.telecom.PhoneAccountHandle;
import android.telecom.TelecomManager;

import com.android.server.telecom.CallerInfoLookupHelper;
import com.android.server.telecom.CallsManagerListenerBase;
import com.android.server.telecom.Constants;
import com.android.server.telecom.DefaultDialerCache;
import com.android.server.telecom.DeviceIdleControllerAdapter;
import com.android.server.telecom.MissedCallNotifier;
import com.android.server.telecom.PhoneAccountRegistrar;
import com.android.server.telecom.R;
import com.android.server.telecom.TelecomBroadcastIntentProcessor;
import com.android.server.telecom.TelecomSystem;
import com.android.server.telecom.Timeouts;
import com.android.server.telecom.components.TelecomBroadcastReceiver;

import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.app.TaskStackBuilder;
import android.app.admin.DevicePolicyManager;
import android.content.AsyncQueryHandler;
import android.content.ContentProvider;
import android.content.ContentValues;
import android.content.Context;
import android.content.Intent;
import android.content.pm.PackageManager.NameNotFoundException;
import android.content.pm.ResolveInfo;
import android.database.Cursor;
import android.graphics.Bitmap;
@@ -56,22 +40,36 @@ import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.os.AsyncTask;
import android.os.Binder;
import android.os.Bundle;
import android.os.UserHandle;
import android.provider.CallLog.Calls;
import android.telecom.CallerInfo;
import android.telecom.Log;
import android.telecom.Logging.Runnable;
import android.telecom.PhoneAccount;
import android.telecom.PhoneAccountHandle;
import android.telecom.TelecomManager;
import android.telephony.PhoneNumberUtils;
import android.telephony.TelephonyManager;
import android.text.BidiFormatter;
import android.text.TextDirectionHeuristics;
import android.text.TextUtils;

import android.telecom.CallerInfo;
import android.util.ArrayMap;
import android.util.ArraySet;

import java.lang.Override;
import java.lang.String;
import com.android.server.telecom.CallerInfoLookupHelper;
import com.android.server.telecom.CallsManagerListenerBase;
import com.android.server.telecom.Constants;
import com.android.server.telecom.DefaultDialerCache;
import com.android.server.telecom.DeviceIdleControllerAdapter;
import com.android.server.telecom.MissedCallNotifier;
import com.android.server.telecom.PhoneAccountRegistrar;
import com.android.server.telecom.R;
import com.android.server.telecom.TelecomBroadcastIntentProcessor;
import com.android.server.telecom.TelecomSystem;
import com.android.server.telecom.Timeouts;
import com.android.server.telecom.components.TelecomBroadcastReceiver;

import java.util.List;
import java.util.Locale;
import java.util.Map;
@@ -328,7 +326,7 @@ public class MissedCallNotifierImpl extends CallsManagerListenerBase implements
            return;
        }

        final int titleResId;
        final String titleText;
        final String expandedText;  // The text in the notification's line 1 and 2.

        // Display the first line of the notification:
@@ -339,12 +337,14 @@ public class MissedCallNotifierImpl extends CallsManagerListenerBase implements

            CallerInfo ci = callInfo.getCallerInfo();
            if (ci != null && ci.userType == CallerInfo.USER_TYPE_WORK) {
                titleResId = R.string.notification_missedWorkCallTitle;
                titleText = mContext.getSystemService(DevicePolicyManager.class).getString(
                        NOTIFICATION_MISSED_WORK_CALL_TITLE,
                        () -> mContext.getString(R.string.notification_missedWorkCallTitle));
            } else {
                titleResId = R.string.notification_missedCallTitle;
                titleText = mContext.getString(R.string.notification_missedCallTitle);
            }
        } else {
            titleResId = R.string.notification_missedCallsTitle;
            titleText = mContext.getString(R.string.notification_missedCallsTitle);
            expandedText =
                    mContext.getString(R.string.notification_missedCallsMsg, missedCallCounts);
        }
@@ -362,7 +362,7 @@ public class MissedCallNotifierImpl extends CallsManagerListenerBase implements
                .setContentTitle(mContext.getText(R.string.userCallActivityLabel))
                // Notification details shows that there are missed call(s), but does not reveal
                // the missed caller information.
                .setContentText(mContext.getText(titleResId))
                .setContentText(titleText)
                .setContentIntent(createCallLogPendingIntent(userHandle))
                .setAutoCancel(true)
                .setDeleteIntent(createClearMissedCallsPendingIntent(userHandle));
@@ -373,7 +373,7 @@ public class MissedCallNotifierImpl extends CallsManagerListenerBase implements
                .setColor(mContext.getResources().getColor(R.color.theme_color))
                .setWhen(callInfo.getCreationTimeMillis())
                .setShowWhen(true)
                .setContentTitle(mContext.getText(titleResId))
                .setContentTitle(titleText)
                .setContentText(expandedText)
                .setContentIntent(createCallLogPendingIntent(userHandle))
                .setAutoCancel(true)