diff options
Diffstat (limited to 'packages/SystemUI/src/com/android/systemui/OverviewProxyService.java')
| -rw-r--r-- | packages/SystemUI/src/com/android/systemui/OverviewProxyService.java | 27 |
1 files changed, 18 insertions, 9 deletions
diff --git a/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java b/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java index 9fc71c813d74..d21465c53bdf 100644 --- a/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java +++ b/packages/SystemUI/src/com/android/systemui/OverviewProxyService.java @@ -30,6 +30,7 @@ import android.os.Looper; import android.os.PatternMatcher; import android.os.RemoteException; import android.os.UserHandle; +import android.provider.Settings; import android.util.Log; import android.view.SurfaceControl; @@ -65,7 +66,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis public static final String TAG_OPS = "OverviewProxyService"; public static final boolean DEBUG_OVERVIEW_PROXY = false; - private static final long BACKOFF_MILLIS = 5000; + private static final long BACKOFF_MILLIS = 1000; private static final long DEFERRED_CALLBACK_MILLIS = 5000; private final Context mContext; @@ -99,7 +100,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis long token = Binder.clearCallingIdentity(); try { mHandler.post(() -> { - StatusBar statusBar = ((SystemUIApplication) mContext).getComponent( + StatusBar statusBar = SysUiServiceProvider.getComponent(mContext, StatusBar.class); if (statusBar != null) { statusBar.showScreenPinningRequest(taskId, false /* allowCancel */); @@ -152,7 +153,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis public Rect getNonMinimizedSplitScreenSecondaryBounds() { long token = Binder.clearCallingIdentity(); try { - Divider divider = ((SystemUIApplication) mContext).getComponent(Divider.class); + Divider divider = SysUiServiceProvider.getComponent(mContext, Divider.class); if (divider != null) { return divider.getView().getNonMinimizedSplitScreenSecondaryBounds(); } @@ -391,14 +392,22 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis @Override public void dump(FileDescriptor fd, PrintWriter pw, String[] args) { pw.println(TAG_OPS + " state:"); - pw.print(" mConnectionBackoffAttempts="); pw.println(mConnectionBackoffAttempts); + pw.print(" recentsComponentName="); pw.println(mRecentsComponentName); + pw.print(" isConnected="); pw.println(mOverviewProxy != null); pw.print(" isCurrentUserSetup="); pw.println(mDeviceProvisionedController .isCurrentUserSetup()); - pw.print(" isConnected="); pw.println(mOverviewProxy != null); - pw.print(" mRecentsComponentName="); pw.println(mRecentsComponentName); - pw.print(" mIsEnabled="); pw.println(isEnabled()); - pw.print(" mInteractionFlags="); pw.println(mInteractionFlags); - pw.print(" mQuickStepIntent="); pw.println(mQuickStepIntent); + pw.print(" connectionBackoffAttempts="); pw.println(mConnectionBackoffAttempts); + pw.print(" interactionFlags="); pw.println(mInteractionFlags); + + pw.print(" quickStepIntent="); pw.println(mQuickStepIntent); + pw.print(" quickStepIntentResolved="); pw.println(isEnabled()); + + final int swipeUpDefaultValue = mContext.getResources() + .getBoolean(com.android.internal.R.bool.config_swipe_up_gesture_default) ? 1 : 0; + final int swipeUpEnabled = Settings.Secure.getInt(mContext.getContentResolver(), + Settings.Secure.SWIPE_UP_TO_SWITCH_APPS_ENABLED, swipeUpDefaultValue); + pw.print(" swipeUpSetting="); pw.println(swipeUpEnabled != 0); + pw.print(" swipeUpSettingDefault="); pw.println(swipeUpDefaultValue != 0); } public interface OverviewProxyListener { |