Merge "Global accessibility action to open recent apps shows the old dialog style." into jb-dev

1 files changed, 16 insertions, 1 deletions

diff --git a/services/java/com/android/server/accessibility/AccessibilityManagerService.java b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
index 617a7f31e7eb..5c814d2068e4 100644
--- a/services/java/com/android/server/accessibility/AccessibilityManagerService.java
+++ b/services/java/com/android/server/accessibility/AccessibilityManagerService.java
@@ -73,6 +73,7 @@ import android.view.accessibility.IAccessibilityManagerClient;
 
 import com.android.internal.R;
 import com.android.internal.content.PackageMonitor;
+import com.android.internal.statusbar.IStatusBarService;
 import com.android.server.wm.WindowManagerService;
 
 import org.xmlpull.v1.XmlPullParserException;
@@ -1537,7 +1538,7 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
                     sendDownAndUpKeyEvents(KeyEvent.KEYCODE_HOME);
                 } return true;
                 case AccessibilityService.GLOBAL_ACTION_RECENTS: {
-                    sendDownAndUpKeyEvents(KeyEvent.KEYCODE_APP_SWITCH);
+                    openRecents();
                 } return true;
                 case AccessibilityService.GLOBAL_ACTION_NOTIFICATIONS: {
                     expandStatusBar();
@@ -1730,6 +1731,20 @@ public class AccessibilityManagerService extends IAccessibilityManager.Stub {
             Binder.restoreCallingIdentity(token);
         }
 
+        private void openRecents() {
+            final long token = Binder.clearCallingIdentity();
+
+            IStatusBarService statusBarService = IStatusBarService.Stub.asInterface(
+                    ServiceManager.getService("statusbar"));
+            try {
+                statusBarService.toggleRecentApps();
+            } catch (RemoteException e) {
+                Slog.e(LOG_TAG, "Error toggling recent apps.");
+            }
+
+            Binder.restoreCallingIdentity(token);
+        }
+
         private IAccessibilityInteractionConnection getConnectionLocked(int windowId) {
             if (DEBUG) {
                 Slog.i(LOG_TAG, "Trying to get interaction connection to windowId: " + windowId);