diff options
| author | Jorim Jaggi <jjaggi@google.com> | 2015-06-30 11:41:32 -0700 |
|---|---|---|
| committer | Jorim Jaggi <jjaggi@google.com> | 2015-06-30 22:30:34 +0000 |
| commit | 6ef5898793ea5cda3767c219bd8a2c564991747c (patch) | |
| tree | d94053dda8108ca4d66a575aeb551ec63f27f7c0 /packages/SystemUI/src/com/android/systemui/assist | |
| parent | 3b866bee86f742f51a0042985ec7666283dc4406 (diff) | |
| download | frameworks_base-6ef5898793ea5cda3767c219bd8a2c564991747c.zip frameworks_base-6ef5898793ea5cda3767c219bd8a2c564991747c.tar.gz frameworks_base-6ef5898793ea5cda3767c219bd8a2c564991747c.tar.bz2 | |
Don't show orb when voice session is already running
Bug: 22195186
Change-Id: I7839536d2f6362889a924b65011d80556f0176b8
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/assist')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/assist/AssistManager.java | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java index 6ba5626..51d0bf1 100644 --- a/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java +++ b/packages/SystemUI/src/com/android/systemui/assist/AssistManager.java @@ -131,7 +131,7 @@ public class AssistManager { } final boolean isService = isAssistantService(); - if (isService || !isVoiceSessionRunning()) { + if (!isService || !isVoiceSessionRunning()) { showOrb(); mView.postDelayed(mHideRunnable, isService ? TIMEOUT_SERVICE @@ -227,10 +227,6 @@ public class AssistManager { mAssistUtils.launchVoiceAssistFromKeyguard(); } - private boolean getVoiceInteractorSupportsAssistGesture() { - return mAssistUtils.activeServiceSupportsAssistGesture(); - } - public boolean canVoiceAssistBeLaunchedFromKeyguard() { return mAssistUtils.activeServiceSupportsLaunchFromKeyguard(); } |