Hide phone/camera affordance when unlocking. (282a6152) · Commits · e / os / android_frameworks_base

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

+7 −2

Original line number	Diff line number	Diff line
		@@ -281,7 +281,7 @@ public class KeyguardPageSwipeHelper {
		private void setTranslation(float translation, boolean isReset) {
		translation = rightSwipePossible() ? translation : Math.max(0, translation);
		translation = leftSwipePossible() ? translation : Math.min(0, translation);
		if (translation != mTranslation) {
		if (translation != mTranslation \|\| isReset) {
		ArrayList<View> translatedViews = mCallback.getTranslationViews();
		for (View view : translatedViews) {
		view.setTranslationX(translation);
		@@ -307,7 +307,7 @@ public class KeyguardPageSwipeHelper {
		}
		}

		private void showAllIcons(boolean animate) {
		public void showAllIcons(boolean animate) {
		float scale = 1.0f;
		float alpha = SWIPE_RESTING_ALPHA_AMOUNT;
		updateIcon(mRightIcon, scale, alpha, animate);
		@@ -315,6 +315,11 @@ public class KeyguardPageSwipeHelper {
		updateIcon(mLeftIcon, scale, alpha, animate);
		}

		public void animateHideLeftRightIcon() {
		updateIcon(mRightIcon, 0f, 0f, true);
		updateIcon(mLeftIcon, 0f, 0f, true);
		}

		private void hideInactiveIcons(boolean animate){
		View otherView = mTranslation < 0 ? mLeftIcon : mRightIcon;
		updateIcon(otherView, 0, 0, animate);

+13 −1

Original line number	Diff line number	Diff line
		@@ -783,14 +783,26 @@ public class NotificationPanelView extends PanelView implements
		super.onOverExpansionChanged(overExpansion);
		}

		@Override
		protected void onTrackingStarted() {
		super.onTrackingStarted();
		if (mStatusBar.getBarState() == StatusBarState.KEYGUARD
		\|\| mStatusBar.getBarState() == StatusBarState.SHADE_LOCKED) {
		mPageSwiper.animateHideLeftRightIcon();
		}
		}

		@Override
		protected void onTrackingStopped(boolean expand) {
		super.onTrackingStopped(expand);
		mOverExpansion = 0.0f;
		mNotificationStackScroller.setOverScrolledPixels(0.0f, true /* onTop */,
		true /* animate */);
		if (expand && (mStatusBar.getBarState() == StatusBarState.KEYGUARD
		\|\| mStatusBar.getBarState() == StatusBarState.SHADE_LOCKED)) {
		mPageSwiper.showAllIcons(true);
		}
		}


		@Override
		public void onHeightChanged(ExpandableView view) {