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

am 693b7507: am de1e281b: Merge "Fixed a bug where the AssistComponent was outdated" into mnc-dev

Browse Source 
* commit '693b7507e63f3397b10881404728cf97eeead640':
  Fixed a bug where the AssistComponent was outdated
This commit is contained in:
Selim Cinek
2015-06-23 18:07:24 +00:00
committed by Android Git Automerger
parent 6dcee7ffc3 693b7507e6
commit d5f1548337
2 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -311,4 +311,12 @@ public class AssistManager {
public void showDisclosure() {
mAssistDisclosure.postShow();
}
public void onUserSwitched(int newUserId) {
updateAssistInfo();
}
public void prepareBeforeInvocation() {
updateAssistInfo();
}
}

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

@@ -1049,6 +1049,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
private int mShowSearchHoldoff = 0;
private Runnable mInvokeAssist = new Runnable() {
public void run() {
mAssistManager.prepareBeforeInvocation();
invokeAssistGesture(true /* vibrate */);
awakenDreams();
if (mNavigationBarView != null) {
@@ -2938,6 +2939,7 @@ public class PhoneStatusBar extends BaseStatusBar implements DemoMode,
updateNotifications();
resetUserSetupObserver();
setControllerUsers();
mAssistManager.onUserSwitched(newUserId);
}
private void setControllerUsers() {