am 961c26c5: am 6ef58987: Don\'t show orb when voice session is already running

* commit '961c26c581e261c6769214d7dfb1326e47c19e17':
  Don't show orb when voice session is already running
This commit is contained in:
Jorim Jaggi
2015-06-30 22:53:20 +00:00
committed by Android Git Automerger

View File

@@ -131,7 +131,7 @@ public class AssistManager {
} }
final boolean isService = isAssistantService(); final boolean isService = isAssistantService();
if (isService || !isVoiceSessionRunning()) { if (!isService || !isVoiceSessionRunning()) {
showOrb(); showOrb();
mView.postDelayed(mHideRunnable, isService mView.postDelayed(mHideRunnable, isService
? TIMEOUT_SERVICE ? TIMEOUT_SERVICE
@@ -227,10 +227,6 @@ public class AssistManager {
mAssistUtils.launchVoiceAssistFromKeyguard(); mAssistUtils.launchVoiceAssistFromKeyguard();
} }
private boolean getVoiceInteractorSupportsAssistGesture() {
return mAssistUtils.activeServiceSupportsAssistGesture();
}
public boolean canVoiceAssistBeLaunchedFromKeyguard() { public boolean canVoiceAssistBeLaunchedFromKeyguard() {
return mAssistUtils.activeServiceSupportsLaunchFromKeyguard(); return mAssistUtils.activeServiceSupportsLaunchFromKeyguard();
} }