diff options
Diffstat (limited to 'java/com/android/incallui')
| -rw-r--r-- | java/com/android/incallui/NewReturnToCallController.java | 3 | ||||
| -rw-r--r-- | java/com/android/incallui/PhoneLookupHistoryRecorder.java | 4 |
2 files changed, 5 insertions, 2 deletions
diff --git a/java/com/android/incallui/NewReturnToCallController.java b/java/com/android/incallui/NewReturnToCallController.java index b8798b1b9..4c3c2a2eb 100644 --- a/java/com/android/incallui/NewReturnToCallController.java +++ b/java/com/android/incallui/NewReturnToCallController.java @@ -238,6 +238,7 @@ public class NewReturnToCallController implements InCallUiListener, Listener, Au .setIconDrawable(context.getDrawable(R.drawable.quantum_ic_exit_to_app_vd_theme_24)) .setIntent(fullScreen) .setName(context.getText(R.string.bubble_return_to_call)) + .setCheckable(false) .build()); // Mute/unmute actions.add( @@ -252,6 +253,7 @@ public class NewReturnToCallController implements InCallUiListener, Listener, Au Action.builder() .setIconDrawable(context.getDrawable(speakerButtonInfo.icon)) .setName(context.getText(speakerButtonInfo.label)) + .setCheckable(speakerButtonInfo.checkable) .setChecked(speakerButtonInfo.isChecked) .setIntent(speakerButtonInfo.checkable ? toggleSpeaker : showSpeakerSelect) .build()); @@ -261,6 +263,7 @@ public class NewReturnToCallController implements InCallUiListener, Listener, Au .setIconDrawable(context.getDrawable(R.drawable.quantum_ic_call_end_vd_theme_24)) .setIntent(endCall) .setName(context.getText(R.string.incall_label_end_call)) + .setCheckable(false) .build()); return actions; } diff --git a/java/com/android/incallui/PhoneLookupHistoryRecorder.java b/java/com/android/incallui/PhoneLookupHistoryRecorder.java index abbf934f0..017e6f43c 100644 --- a/java/com/android/incallui/PhoneLookupHistoryRecorder.java +++ b/java/com/android/incallui/PhoneLookupHistoryRecorder.java @@ -20,10 +20,10 @@ import android.content.Context; import android.support.annotation.Nullable; import android.telecom.Call; import com.android.dialer.DialerPhoneNumber; -import com.android.dialer.buildtype.BuildType; import com.android.dialer.common.Assert; import com.android.dialer.common.LogUtil; import com.android.dialer.common.concurrent.DialerExecutorComponent; +import com.android.dialer.configprovider.ConfigProviderBindings; import com.android.dialer.phonelookup.PhoneLookupComponent; import com.android.dialer.phonelookup.PhoneLookupInfo; import com.android.dialer.phonelookup.database.contract.PhoneLookupHistoryContract.PhoneLookupHistory; @@ -48,7 +48,7 @@ final class PhoneLookupHistoryRecorder { * writes it to the PhoneLookupHistory. Otherwise does nothing. */ static void recordPhoneLookupInfo(Context appContext, Call call) { - if (!(BuildType.get() == BuildType.BUGFOOD || LogUtil.isDebugEnabled())) { + if (!(ConfigProviderBindings.get(appContext).getBoolean("is_nui_shortcut_enabled", false))) { return; } |