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

Commit 9791fa18 authored by Tony Mak's avatar Tony Mak Committed by android-build-merger
Browse files

Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review 

am: f75eb1ac

* commit 'f75eb1ac':
  Rename PROPERTY_WORK_CALL to PROPERTY_ENTERPRISE_CALL based on API review

Change-Id: I5ad7d6c4ea3eeac5b829beb1c984d25abdb059c2
parents b15db3f1 f75eb1ac

InCallUI/src/com/android/incallui/CallCardPresenter.java

+3 −3
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ import com.android.incalluibind.ObjectFactory; 


import java.lang.ref.WeakReference;



import static com.android.contacts.common.compat.CallSdkCompat.Details.PROPERTY_WORK_CALL;

import static com.android.contacts.common.compat.CallSdkCompat.Details.PROPERTY_ENTERPRISE_CALL;

/**

 * Presenter for the Call Card Fragment.

 * <p>
@@ -427,7 +427,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> 


    private void updatePrimaryCallState() {

        if (getUi() != null && mPrimary != null) {

            boolean isWorkCall = mPrimary.hasProperty(PROPERTY_WORK_CALL)

            boolean isWorkCall = mPrimary.hasProperty(PROPERTY_ENTERPRISE_CALL)

                    || (mPrimaryContactInfo == null ? false

                            : mPrimaryContactInfo.userType == ContactsUtils.USER_TYPE_WORK);

            getUi().setCallState(
@@ -759,7 +759,7 @@ public class CallCardPresenter extends Presenter<CallCardPresenter.CallCardUi> 
                .showIncomingVideo(mPrimary.getVideoState(), mPrimary.getState());



        // Call placed through a work phone account.

        boolean hasWorkCallProperty = mPrimary.hasProperty(PROPERTY_WORK_CALL);

        boolean hasWorkCallProperty = mPrimary.hasProperty(PROPERTY_ENTERPRISE_CALL);



        if (mPrimary.isConferenceCall()) {

            Log.d(TAG, "Update primary display info for conference call.");

InCallUI/src/com/android/incallui/StatusBarNotifier.java

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.incallui;



import static com.android.contacts.common.compat.CallSdkCompat.Details.PROPERTY_WORK_CALL;

import static com.android.contacts.common.compat.CallSdkCompat.Details.PROPERTY_ENTERPRISE_CALL;

import static com.android.incallui.NotificationBroadcastReceiver.ACTION_ACCEPT_VIDEO_UPGRADE_REQUEST;

import static com.android.incallui.NotificationBroadcastReceiver.ACTION_ANSWER_VIDEO_INCOMING_CALL;

import static com.android.incallui.NotificationBroadcastReceiver.ACTION_ANSWER_VOICE_INCOMING_CALL;
@@ -537,7 +537,7 @@ public class StatusBarNotifier implements InCallPresenter.InCallStateListener, 
        }



        // Is the call placed through work connection service.

        boolean isWorkCall = call.hasProperty(PROPERTY_WORK_CALL);

        boolean isWorkCall = call.hasProperty(PROPERTY_ENTERPRISE_CALL);

        if(userType == ContactsUtils.USER_TYPE_WORK || isWorkCall) {

            resId = getWorkStringFromPersonalString(resId);

        }