Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add createAssistManager() method to SystemUIFactory" into nyc-mr1-dev

Browse Source
This commit is contained in:
Annie Chin
2016-06-01 23:13:59 +00:00
committed by Android (Google) Code Review
parent 4137a97b30 937a991be4
commit a48f9cb72f
3 changed files with 13 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/src/com/android/systemui/SystemUIFactory.java
View File

@@ -24,6 +24,8 @@ import android.view.ViewGroup;
import com.android.internal.widget.LockPatternUtils;
import com.android.keyguard.ViewMediatorCallback;
import com.android.systemui.R;
import com.android.systemui.assist.AssistManager;
import com.android.systemui.statusbar.BaseStatusBar;
import com.android.systemui.statusbar.ScrimView;
import com.android.systemui.statusbar.phone.KeyguardBouncer;
import com.android.systemui.statusbar.phone.NotificationIconAreaController;
@@ -123,4 +125,8 @@ public class SystemUIFactory {
public int getHomeLayoutId() {
return R.layout.home;
}
public AssistManager createAssistManager(BaseStatusBar bar, Context context) {
return new AssistManager(bar, context);
}
}

7
packages/SystemUI/src/com/android/systemui/assist/AssistManager.java
View File

@@ -30,6 +30,7 @@ import android.widget.ImageView;
import com.android.internal.app.AssistUtils;
import com.android.internal.app.IVoiceInteractionSessionShowCallback;
import com.android.systemui.R;
import com.android.systemui.SystemUIFactory;
import com.android.systemui.statusbar.BaseStatusBar;
import com.android.systemui.statusbar.CommandQueue;
@@ -103,6 +104,10 @@ public class AssistManager {
}
}
protected boolean shouldShowOrb() {
return true;
}
public void startAssist(Bundle args) {
final ComponentName assistComponent = getAssistInfo();
if (assistComponent == null) {
@@ -110,7 +115,7 @@ public class AssistManager {
}
final boolean isService = assistComponent.equals(getVoiceInteractorComponentName());
if (!isService || !isVoiceSessionRunning()) {
if (!isService || (!isVoiceSessionRunning() && shouldShowOrb())) {
showOrb(assistComponent, isService);
mView.postDelayed(mHideRunnable, isService
? TIMEOUT_SERVICE

2
packages/SystemUI/src/com/android/systemui/statusbar/phone/PhoneStatusBar.java
View File

@@ -765,7 +765,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
// no window manager? good luck with that
}
mAssistManager = new AssistManager(this, context);
mAssistManager = SystemUIFactory.getInstance().createAssistManager(this, context);
// figure out which pixel-format to use for the status bar.
mPixelFormat = PixelFormat.OPAQUE;