Merge "Added logging for OverviewProxyService" (366ac0a8) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/OverviewProxyService.java

+5 −4

Original line number	Diff line number	Diff line
		@@ -51,7 +51,8 @@ import java.util.List;
		*/
		public class OverviewProxyService implements CallbackController<OverviewProxyListener>, Dumpable {

		private static final String TAG = "OverviewProxyService";
		public static final String TAG_OPS = "OverviewProxyService";
		public static final boolean DEBUG_OVERVIEW_PROXY = false;
		private static final long BACKOFF_MILLIS = 5000;

		private final Context mContext;
		@@ -96,12 +97,12 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis
		try {
		service.linkToDeath(mOverviewServiceDeathRcpt, 0);
		} catch (RemoteException e) {
		Log.e(TAG, "Lost connection to launcher service", e);
		Log.e(TAG_OPS, "Lost connection to launcher service", e);
		}
		try {
		mOverviewProxy.onBind(mSysUiProxy);
		} catch (RemoteException e) {
		Log.e(TAG, "Failed to call onBind()", e);
		Log.e(TAG_OPS, "Failed to call onBind()", e);
		}
		notifyConnectionChanged();
		}
		@@ -211,7 +212,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis

		@Override
		public void dump(FileDescriptor fd, PrintWriter pw, String[] args) {
		pw.println(TAG + " state:");
		pw.println(TAG_OPS + " state:");
		pw.print(" mConnectionBackoffAttempts="); pw.println(mConnectionBackoffAttempts);
		pw.print(" isCurrentUserSetup="); pw.println(mDeviceProvisionedController
		.isCurrentUserSetup());

packages/SystemUI/src/com/android/systemui/statusbar/phone/NavigationBarGestureHelper.java

+5 −0

Original line number	Diff line number	Diff line
		@@ -43,6 +43,8 @@ import com.android.systemui.tuner.TunerService;
		import static android.view.WindowManager.DOCKED_INVALID;
		import static android.view.WindowManager.DOCKED_LEFT;
		import static android.view.WindowManager.DOCKED_TOP;
		import static com.android.systemui.OverviewProxyService.DEBUG_OVERVIEW_PROXY;
		import static com.android.systemui.OverviewProxyService.TAG_OPS;

		/**
		* Class to detect gestures on the navigation bar.
		@@ -118,6 +120,9 @@ public class NavigationBarGestureHelper implements TunerService.Tunable, Gesture
		event.transform(mTransformGlobalMatrix);
		try {
		overviewProxy.onMotionEvent(event);
		if (DEBUG_OVERVIEW_PROXY) {
		Log.d(TAG_OPS, "Send MotionEvent: " + event.toString());
		}
		return true;
		} catch (RemoteException e) {
		Log.e(TAG, "Callback failed", e);

packages/SystemUI/src/com/android/systemui/statusbar/phone/QuickScrubController.java

+14 −0

Original line number	Diff line number	Diff line
		@@ -49,6 +49,8 @@ import com.android.systemui.shared.recents.utilities.Utilities;

		import static android.view.WindowManagerPolicyConstants.NAV_BAR_LEFT;
		import static android.view.WindowManagerPolicyConstants.NAV_BAR_BOTTOM;
		import static com.android.systemui.OverviewProxyService.DEBUG_OVERVIEW_PROXY;
		import static com.android.systemui.OverviewProxyService.TAG_OPS;

		/**
		* Class to detect gestures on the navigation bar and implement quick scrub and switch.
		@@ -144,6 +146,9 @@ public class QuickScrubController extends GestureDetector.SimpleOnGestureListene
		try {
		final IOverviewProxy overviewProxy = mOverviewEventSender.getProxy();
		overviewProxy.onQuickSwitch();
		if (DEBUG_OVERVIEW_PROXY) {
		Log.d(TAG_OPS, "Quick Switch");
		}
		} catch (RemoteException e) {
		Log.e(TAG, "Failed to send start of quick switch.", e);
		}
		@@ -256,6 +261,9 @@ public class QuickScrubController extends GestureDetector.SimpleOnGestureListene
		if (mQuickScrubActive) {
		try {
		overviewProxy.onQuickScrubProgress(scrubFraction);
		if (DEBUG_OVERVIEW_PROXY) {
		Log.d(TAG_OPS, "Quick Scrub Progress:" + scrubFraction);
		}
		} catch (RemoteException e) {
		Log.e(TAG, "Failed to send progress of quick scrub.", e);
		}
		@@ -355,6 +363,9 @@ public class QuickScrubController extends GestureDetector.SimpleOnGestureListene
		mTrackAnimator.start();
		try {
		mOverviewEventSender.getProxy().onQuickScrubStart();
		if (DEBUG_OVERVIEW_PROXY) {
		Log.d(TAG_OPS, "Quick Scrub Start");
		}
		} catch (RemoteException e) {
		Log.e(TAG, "Failed to send start of quick scrub.", e);
		}
		@@ -369,6 +380,9 @@ public class QuickScrubController extends GestureDetector.SimpleOnGestureListene
		mQuickScrubEndAnimator.start();
		try {
		mOverviewEventSender.getProxy().onQuickScrubEnd();
		if (DEBUG_OVERVIEW_PROXY) {
		Log.d(TAG_OPS, "Quick Scrub End");
		}
		} catch (RemoteException e) {
		Log.e(TAG, "Failed to send end of quick scrub.", e);
		}