Merge "Show back button when launcher is disconnected from proxy service" into pi-dev (536c5bbb) · Commits · e / os / android_frameworks_base

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

+8 −3

Original line number	Diff line number	Diff line
		@@ -166,9 +166,7 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis
		long token = Binder.clearCallingIdentity();
		try {
		mHandler.post(() -> {
		for (int i = mConnectionCallbacks.size() - 1; i >= 0; --i) {
		mConnectionCallbacks.get(i).onBackButtonAlphaChanged(alpha, animate);
		}
		notifyBackButtonAlphaChanged(alpha, animate);
		});
		} finally {
		Binder.restoreCallingIdentity(token);
		@@ -355,10 +353,17 @@ public class OverviewProxyService implements CallbackController<OverviewProxyLis
		mOverviewProxy.asBinder().unlinkToDeath(mOverviewServiceDeathRcpt, 0);
		mContext.unbindService(mOverviewServiceConnection);
		mOverviewProxy = null;
		notifyBackButtonAlphaChanged(1f, false /* animate */);
		notifyConnectionChanged();
		}
		}

		private void notifyBackButtonAlphaChanged(float alpha, boolean animate) {
		for (int i = mConnectionCallbacks.size() - 1; i >= 0; --i) {
		mConnectionCallbacks.get(i).onBackButtonAlphaChanged(alpha, animate);
		}
		}

		private void notifyConnectionChanged() {
		for (int i = mConnectionCallbacks.size() - 1; i >= 0; --i) {
		mConnectionCallbacks.get(i).onConnectionChanged(mOverviewProxy != null);