Merge "Initial implementation of dismiss gesture + inline settings icon" into nyc-dev (15d6eafe) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/notification_settings_icon_row.xml

0 → 100644

+38 −0

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		Copyright 2016, The Android Open Source Project

		Licensed under the Apache License, Version 2.0 (the "License");
		you may not use this file except in compliance with the License.
		You may obtain a copy of the License at

		http://www.apache.org/licenses/LICENSE-2.0

		Unless required by applicable law or agreed to in writing, software
		distributed under the License is distributed on an "AS IS" BASIS,
		WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<com.android.systemui.statusbar.NotificationSettingsIconRow
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:systemui="http://schemas.android.com/apk/res-auto"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		>

		<com.android.systemui.statusbar.AlphaOptimizedImageView
		android:id="@+id/gear_icon"
		android:layout_width="@dimen/notification_gear_size"
		android:layout_height="@dimen/notification_gear_size"
		android:layout_marginTop="@dimen/notification_gear_top_margin"
		android:layout_marginStart="@dimen/notification_gear_side_margin"
		android:layout_marginEnd="@dimen/notification_gear_side_margin"
		android:src="@drawable/ic_settings"
		android:tint="@color/notification_gear_color"
		android:visibility="gone"
		android:alpha="0"
		android:background="?android:attr/selectableItemBackgroundBorderless"
		/>

		</com.android.systemui.statusbar.NotificationSettingsIconRow>
		No newline at end of file

packages/SystemUI/res/layout/status_bar_notification_row.xml

+8 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,14 @@
		android:clickable="true"
		>

		<ViewStub
		android:layout="@layout/notification_settings_icon_row"
		android:id="@+id/settings_icon_row_stub"
		android:inflatedId="@+id/notification_settings_icon_row"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		/>

		<com.android.systemui.statusbar.NotificationBackgroundView
		android:id="@+id/backgroundNormal"
		android:layout_width="match_parent"

packages/SystemUI/res/values/colors.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -102,6 +102,9 @@
		<!-- The color of the circle around the primary user in the user switcher -->
		<color name="current_user_border_color">@color/system_accent_color</color>

		<!-- The color of the gear shown behind a notification -->
		<color name="notification_gear_color">#ff757575</color>

		<!-- The "inside" of a notification, reached via longpress -->
		<color name="notification_guts_bg_color">#eeeeee</color>
		<color name="notification_guts_slider_color">@*android:color/material_deep_teal_500</color>

packages/SystemUI/res/values/dimens.xml

+9 −0

Original line number	Diff line number	Diff line
		@@ -78,6 +78,15 @@
		<!-- Minimum layouted height of a notification in the statusbar-->
		<dimen name="min_notification_layout_height">48dp</dimen>

		<!-- Size of gear icon displayed behind a notification -->
		<dimen name="notification_gear_size">24dp</dimen>

		<!-- The space above the gear icon displayed behind a notification -->
		<dimen name="notification_gear_top_margin">30dp</dimen>

		<!-- The space on either side of the gear icon displayed behind a notification -->
		<dimen name="notification_gear_side_margin">20dp</dimen>

		<!-- size at which Notification icons will be drawn in the status bar -->
		<dimen name="status_bar_icon_drawing_size">17dip</dimen>

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

+81 −44

Original line number	Diff line number	Diff line
		@@ -69,9 +69,9 @@ public class SwipeHelper implements Gefingerpoken {
		private float mPerpendicularInitialTouchPos;
		private boolean mDragging;
		private View mCurrView;
		private View mCurrAnimView;
		private boolean mCanCurrViewBeDimissed;
		private float mDensityScale;
		private float mTranslation = 0;

		private boolean mLongPressSent;
		private LongPressListener mLongPressListener;
		@@ -121,7 +121,7 @@ public class SwipeHelper implements Gefingerpoken {
		return mSwipeDirection == X ? ev.getY() : ev.getX();
		}

		private float getTranslation(View v) {
		protected float getTranslation(View v) {
		return mSwipeDirection == X ? v.getTranslationX() : v.getTranslationY();
		}

		@@ -130,7 +130,7 @@ public class SwipeHelper implements Gefingerpoken {
		vt.getYVelocity();
		}

		private ObjectAnimator createTranslationAnimation(View v, float newPos) {
		protected ObjectAnimator createTranslationAnimation(View v, float newPos) {
		ObjectAnimator anim = ObjectAnimator.ofFloat(v,
		mSwipeDirection == X ? View.TRANSLATION_X : View.TRANSLATION_Y, newPos);
		return anim;
		@@ -141,7 +141,17 @@ public class SwipeHelper implements Gefingerpoken {
		vt.getXVelocity();
		}

		private void setTranslation(View v, float translate) {
		protected Animator getViewTranslationAnimator(View v, float target,
		AnimatorUpdateListener listener) {
		ObjectAnimator anim = createTranslationAnimation(v, target);
		anim.addUpdateListener(listener);
		return anim;
		}

		protected void setTranslation(View v, float translate) {
		if (v == null) {
		return;
		}
		if (mSwipeDirection == X) {
		v.setTranslationX(translate);
		} else {
		@@ -237,15 +247,16 @@ public class SwipeHelper implements Gefingerpoken {
		mTouchAboveFalsingThreshold = false;
		mDragging = false;
		mLongPressSent = false;
		mCurrView = mCallback.getChildAtPosition(ev);
		mVelocityTracker.clear();
		mCurrView = mCallback.getChildAtPosition(ev);

		if (mCurrView != null) {
		mCurrAnimView = mCallback.getChildContentView(mCurrView);
		onDownUpdate(mCurrView);
		mCanCurrViewBeDimissed = mCallback.canChildBeDismissed(mCurrView);
		mVelocityTracker.addMovement(ev);
		mInitialTouchPos = getPos(ev);
		mPerpendicularInitialTouchPos = getPerpendicularPos(ev);

		mTranslation = getTranslation(mCurrView);
		if (mLongPressListener != null) {
		if (mWatchLongPress == null) {
		mWatchLongPress = new Runnable() {
		@@ -268,7 +279,6 @@ public class SwipeHelper implements Gefingerpoken {
		}
		mHandler.postDelayed(mWatchLongPress, mLongPressTimeout);
		}

		}
		break;

		@@ -283,8 +293,8 @@ public class SwipeHelper implements Gefingerpoken {
		&& Math.abs(delta) > Math.abs(deltaPerpendicular)) {
		mCallback.onBeginDrag(mCurrView);
		mDragging = true;
		mInitialTouchPos = getPos(ev) - getTranslation(mCurrAnimView);

		mInitialTouchPos = getPos(ev);
		mTranslation = getTranslation(mCurrView);
		removeLongPressCallback();
		}
		}
		@@ -295,7 +305,6 @@ public class SwipeHelper implements Gefingerpoken {
		final boolean captured = (mDragging \|\| mLongPressSent);
		mDragging = false;
		mCurrView = null;
		mCurrAnimView = null;
		mLongPressSent = false;
		removeLongPressCallback();
		if (captured) return true;
		@@ -320,12 +329,11 @@ public class SwipeHelper implements Gefingerpoken {
		* @param useAccelerateInterpolator Should an accelerating Interpolator be used
		* @param fixedDuration If not 0, this exact duration will be taken
		*/
		public void dismissChild(final View view, float velocity, final Runnable endAction,
		public void dismissChild(final View animView, float velocity, final Runnable endAction,
		long delay, boolean useAccelerateInterpolator, long fixedDuration) {
		final View animView = mCallback.getChildContentView(view);
		final boolean canAnimViewBeDismissed = mCallback.canChildBeDismissed(view);
		final boolean canBeDismissed = mCallback.canChildBeDismissed(animView);
		float newPos;
		boolean isLayoutRtl = view.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;
		boolean isLayoutRtl = animView.getLayoutDirection() == View.LAYOUT_DIRECTION_RTL;

		if (velocity < 0
		\|\| (velocity == 0 && getTranslation(animView) < 0)
		@@ -355,7 +363,13 @@ public class SwipeHelper implements Gefingerpoken {
		if (!mDisableHwLayers) {
		animView.setLayerType(View.LAYER_TYPE_HARDWARE, null);
		}
		ObjectAnimator anim = createTranslationAnimation(animView, newPos);
		AnimatorUpdateListener updateListener = new AnimatorUpdateListener() {
		public void onAnimationUpdate(ValueAnimator animation) {
		onTranslationUpdate(animView, (float) animation.getAnimatedValue(), canBeDismissed);
		}
		};

		Animator anim = getViewTranslationAnimator(animView, newPos, updateListener);
		if (useAccelerateInterpolator) {
		anim.setInterpolator(Interpolators.FAST_OUT_LINEAR_IN);
		} else {
		@@ -367,8 +381,8 @@ public class SwipeHelper implements Gefingerpoken {
		}
		anim.addListener(new AnimatorListenerAdapter() {
		public void onAnimationEnd(Animator animation) {
		updateSwipeProgressFromOffset(animView, canAnimViewBeDismissed);
		mCallback.onChildDismissed(view);
		updateSwipeProgressFromOffset(animView, canBeDismissed);
		mCallback.onChildDismissed(animView);
		if (endAction != null) {
		endAction.run();
		}
		@@ -377,11 +391,6 @@ public class SwipeHelper implements Gefingerpoken {
		}
		}
		});
		anim.addUpdateListener(new AnimatorUpdateListener() {
		public void onAnimationUpdate(ValueAnimator animation) {
		updateSwipeProgressFromOffset(animView, canAnimViewBeDismissed);
		}
		});
		prepareDismissAnimation(animView, anim);
		anim.start();
		}
		@@ -393,21 +402,21 @@ public class SwipeHelper implements Gefingerpoken {
		// Do nothing
		}

		public void snapChild(final View view, float velocity) {
		final View animView = mCallback.getChildContentView(view);
		final boolean canAnimViewBeDismissed = mCallback.canChildBeDismissed(animView);
		ObjectAnimator anim = createTranslationAnimation(animView, 0);
		int duration = SNAP_ANIM_LEN;
		anim.setDuration(duration);
		anim.addUpdateListener(new AnimatorUpdateListener() {
		public void snapChild(final View animView, final float targetLeft, float velocity) {
		final boolean canBeDismissed = mCallback.canChildBeDismissed(animView);
		AnimatorUpdateListener updateListener = new AnimatorUpdateListener() {
		public void onAnimationUpdate(ValueAnimator animation) {
		updateSwipeProgressFromOffset(animView, canAnimViewBeDismissed);
		onTranslationUpdate(animView, (float) animation.getAnimatedValue(), canBeDismissed);
		}
		});
		};

		Animator anim = getViewTranslationAnimator(animView, targetLeft, updateListener);
		int duration = SNAP_ANIM_LEN;
		anim.setDuration(duration);
		anim.addListener(new AnimatorListenerAdapter() {
		public void onAnimationEnd(Animator animator) {
		updateSwipeProgressFromOffset(animView, canAnimViewBeDismissed);
		mCallback.onChildSnappedBack(animView);
		updateSwipeProgressFromOffset(animView, canBeDismissed);
		mCallback.onChildSnappedBack(animView, targetLeft);
		}
		});
		prepareSnapBackAnimation(animView, anim);
		@@ -421,6 +430,28 @@ public class SwipeHelper implements Gefingerpoken {
		// Do nothing
		}

		/**
		* Called when there's a down event.
		*/
		public void onDownUpdate(View currView) {
		// Do nothing
		}

		/**
		* Called on a move event.
		*/
		protected void onMoveUpdate(View view, float totalTranslation, float delta) {
		// Do nothing
		}

		/**
		* Called in {@link AnimatorUpdateListener#onAnimationUpdate(ValueAnimator)} when the current
		* view is being animated to dismiss or snap.
		*/
		public void onTranslationUpdate(View animView, float value, boolean canBeDismissed) {
		updateSwipeProgressFromOffset(animView, canBeDismissed);
		}

		public boolean onTouchEvent(MotionEvent ev) {
		if (mLongPressSent) {
		return true;
		@@ -456,17 +487,18 @@ public class SwipeHelper implements Gefingerpoken {
		// don't let items that can't be dismissed be dragged more than
		// maxScrollDistance
		if (CONSTRAIN_SWIPE && !mCallback.canChildBeDismissed(mCurrView)) {
		float size = getSize(mCurrAnimView);
		float maxScrollDistance = 0.15f * size;
		float size = getSize(mCurrView);
		float maxScrollDistance = 0.25f * size;
		if (absDelta >= size) {
		delta = delta > 0 ? maxScrollDistance : -maxScrollDistance;
		} else {
		delta = maxScrollDistance * (float) Math.sin((delta/size)*(Math.PI/2));
		}
		}
		setTranslation(mCurrAnimView, delta);

		updateSwipeProgressFromOffset(mCurrAnimView, mCanCurrViewBeDimissed);
		setTranslation(mCurrView, mTranslation + delta);
		updateSwipeProgressFromOffset(mCurrView, mCanCurrViewBeDimissed);
		onMoveUpdate(mCurrView, mTranslation + delta, delta);
		}
		break;
		case MotionEvent.ACTION_UP:
		@@ -478,12 +510,13 @@ public class SwipeHelper implements Gefingerpoken {
		float velocity = getVelocity(mVelocityTracker);
		float perpendicularVelocity = getPerpendicularVelocity(mVelocityTracker);

		float translation = getTranslation(mCurrView);
		// Decide whether to dismiss the current view
		boolean childSwipedFarEnough = DISMISS_IF_SWIPED_FAR_ENOUGH &&
		Math.abs(getTranslation(mCurrAnimView)) > 0.4 * getSize(mCurrAnimView);
		Math.abs(translation) > 0.4 * getSize(mCurrView);
		boolean childSwipedFastEnough = (Math.abs(velocity) > escapeVelocity) &&
		(Math.abs(velocity) > Math.abs(perpendicularVelocity)) &&
		(velocity > 0) == (getTranslation(mCurrAnimView) > 0);
		(velocity > 0) == (translation > 0);
		boolean falsingDetected = mCallback.isAntiFalsingNeeded();

		if (mFalsingManager.isClassiferEnabled()) {
		@@ -502,7 +535,7 @@ public class SwipeHelper implements Gefingerpoken {
		} else {
		// snappity
		mCallback.onDragCancelled(mCurrView);
		snapChild(mCurrView, velocity);
		snapChild(mCurrView, 0 /* leftTarget */, velocity);
		}
		}
		break;
		@@ -518,8 +551,6 @@ public class SwipeHelper implements Gefingerpoken {
		public interface Callback {
		View getChildAtPosition(MotionEvent ev);

		View getChildContentView(View v);

		boolean canChildBeDismissed(View v);

		boolean isAntiFalsingNeeded();
		@@ -530,7 +561,13 @@ public class SwipeHelper implements Gefingerpoken {

		void onDragCancelled(View v);

		void onChildSnappedBack(View animView);
		/**
		* Called when the child is snapped to a position.
		*
		* @param animView the view that was snapped.
		* @param targetLeft the left position the view was snapped to.
		*/
		void onChildSnappedBack(View animView, float targetLeft);

		/**
		* Updates the swipe progress on a child.