Merge "Refactored the layout of a notifications" (d0b12fe4) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/status_bar_notification_keyguard_overflow.xml

+1 −2

Original line number	Original line	Diff line number	Diff line
	@@ -18,10 +18,9 @@
	<com.android.systemui.statusbar.NotificationOverflowContainer		<com.android.systemui.statusbar.NotificationOverflowContainer
	xmlns:android="http://schemas.android.com/apk/res/android"		xmlns:android="http://schemas.android.com/apk/res/android"
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content"		android:layout_height="32dp"
	android:focusable="true"		android:focusable="true"
	android:clickable="true"		android:clickable="true"
	android:background="@*android:drawable/notification_quantum_bg_dim"
	>		>
	<TextView		<TextView
	android:id="@+id/more_text"		android:id="@+id/more_text"

packages/SystemUI/res/layout/status_bar_notification_row.xml

+2 −3

Original line number	Original line	Diff line number	Diff line
	@@ -4,14 +4,13 @@
	android:layout_height="wrap_content"		android:layout_height="wrap_content"
	android:focusable="true"		android:focusable="true"
	android:clickable="true"		android:clickable="true"
	android:background="@*android:drawable/notification_quantum_bg"
	>		>

	<com.android.internal.widget.SizeAdaptiveLayout android:id="@+id/expanded"		<com.android.systemui.statusbar.NotificationContentView android:id="@+id/expanded"
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content" />		android:layout_height="wrap_content" />

	<com.android.internal.widget.SizeAdaptiveLayout android:id="@+id/expandedPublic"		<com.android.systemui.statusbar.NotificationContentView android:id="@+id/expandedPublic"
	android:layout_width="match_parent"		android:layout_width="match_parent"
	android:layout_height="wrap_content" />		android:layout_height="wrap_content" />

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

+30 −45

Original line number	Original line	Diff line number	Diff line
	@@ -31,8 +31,9 @@ import android.view.ScaleGestureDetector.OnScaleGestureListener;
	import android.view.View;		import android.view.View;
	import android.view.View.OnClickListener;		import android.view.View.OnClickListener;
	import android.view.ViewConfiguration;		import android.view.ViewConfiguration;
	import android.view.ViewGroup;

			import com.android.systemui.statusbar.ExpandableView;
			import com.android.systemui.statusbar.ExpandableNotificationRow;
	import com.android.systemui.statusbar.policy.ScrollAdapter;		import com.android.systemui.statusbar.policy.ScrollAdapter;

	public class ExpandHelper implements Gefingerpoken, OnClickListener {		public class ExpandHelper implements Gefingerpoken, OnClickListener {
	@@ -115,9 +116,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener {
	float focusY = detector.getFocusY();		float focusY = detector.getFocusY();

	final View underFocus = findView(focusX, focusY);		final View underFocus = findView(focusX, focusY);
	if (underFocus != null) {
	startExpanding(underFocus, STRETCH);		startExpanding(underFocus, STRETCH);
	}
	return mExpanding;		return mExpanding;
	}		}

	@@ -133,41 +132,21 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener {
	};		};

	private class ViewScaler {		private class ViewScaler {
	View mView;		ExpandableView mView;

	public ViewScaler() {}		public ViewScaler() {}
	public void setView(View v) {		public void setView(ExpandableView v) {
	mView = v;		mView = v;
	}		}
	public void setHeight(float h) {		public void setHeight(float h) {
	if (DEBUG_SCALE) Log.v(TAG, "SetHeight: setting to " + h);		if (DEBUG_SCALE) Log.v(TAG, "SetHeight: setting to " + h);
	ViewGroup.LayoutParams lp = mView.getLayoutParams();		mView.setActualHeight((int) h);
	lp.height = (int)h;
	mView.setLayoutParams(lp);
	mView.requestLayout();
	}		}
	public float getHeight() {		public float getHeight() {
	int height = mView.getLayoutParams().height;		return mView.getActualHeight();
	if (height < 0) {
	height = mView.getMeasuredHeight();
	}
	return height;
	}		}
	public int getNaturalHeight(int maximum) {		public int getNaturalHeight(int maximum) {
	ViewGroup.LayoutParams lp = mView.getLayoutParams();		return Math.min(maximum, mView.getMaxHeight());
	if (DEBUG_SCALE) Log.v(TAG, "Inspecting a child of type: " +
	mView.getClass().getName());
	int oldHeight = lp.height;
	lp.height = ViewGroup.LayoutParams.WRAP_CONTENT;
	mView.setLayoutParams(lp);
	mView.measure(
	View.MeasureSpec.makeMeasureSpec(mView.getMeasuredWidth(),
	View.MeasureSpec.EXACTLY),
	View.MeasureSpec.makeMeasureSpec(maximum,
	View.MeasureSpec.AT_MOST));
	lp.height = oldHeight;
	mView.setLayoutParams(lp);
	return mView.getMeasuredHeight();
	}		}
	}		}

	@@ -189,12 +168,6 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener {
	mGravity = Gravity.TOP;		mGravity = Gravity.TOP;
	mScaleAnimation = ObjectAnimator.ofFloat(mScaler, "height", 0f);		mScaleAnimation = ObjectAnimator.ofFloat(mScaler, "height", 0f);
	mScaleAnimation.setDuration(EXPAND_DURATION);		mScaleAnimation.setDuration(EXPAND_DURATION);
	mScaleAnimation.addListener(new AnimatorListenerAdapter() {
	@Override
	public void onAnimationEnd(Animator animation) {
	mCallback.setUserLockedChild(mCurrView, false);
	}
	});
	mPopLimit = mContext.getResources().getDimension(R.dimen.blinds_pop_threshold);		mPopLimit = mContext.getResources().getDimension(R.dimen.blinds_pop_threshold);
	mPopDuration = mContext.getResources().getInteger(R.integer.blinds_pop_duration_ms);		mPopDuration = mContext.getResources().getInteger(R.integer.blinds_pop_duration_ms);
	mPullGestureMinXSpan = mContext.getResources().getDimension(R.dimen.pull_span_min);		mPullGestureMinXSpan = mContext.getResources().getDimension(R.dimen.pull_span_min);
	@@ -341,9 +314,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener {
	if (DEBUG_SCALE) Log.v(TAG, "got pull gesture (xspan=" + xspan + "px)");		if (DEBUG_SCALE) Log.v(TAG, "got pull gesture (xspan=" + xspan + "px)");

	final View underFocus = findView(x, y);		final View underFocus = findView(x, y);
	if (underFocus != null) {
	startExpanding(underFocus, PULL);		startExpanding(underFocus, PULL);
	}
	return true;		return true;
	}		}
	if (mScrollAdapter != null && !mScrollAdapter.isScrolledToTop()) {		if (mScrollAdapter != null && !mScrollAdapter.isScrolledToTop()) {
	@@ -358,8 +329,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener {
	if (DEBUG) Log.v(TAG, "got venetian gesture (dy=" + yDiff + "px)");		if (DEBUG) Log.v(TAG, "got venetian gesture (dy=" + yDiff + "px)");
	mLastMotionY = y;		mLastMotionY = y;
	final View underFocus = findView(x, y);		final View underFocus = findView(x, y);
	if (underFocus != null) {		if (startExpanding(underFocus, BLINDS)) {
	startExpanding(underFocus, BLINDS);
	mInitialTouchY = mLastMotionY;		mInitialTouchY = mLastMotionY;
	mHasPopped = false;		mHasPopped = false;
	}		}
	@@ -459,16 +429,22 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener {
	return true;		return true;
	}		}

	private void startExpanding(View v, int expandType) {		/**
			* @return True if the view is expandable, false otherwise.
			*/
			private boolean startExpanding(View v, int expandType) {
			if (!(v instanceof ExpandableNotificationRow)) {
			return false;
			}
	mExpansionStyle = expandType;		mExpansionStyle = expandType;
	if (mExpanding && v == mCurrView) {		if (mExpanding && v == mCurrView) {
	return;		return true;
	}		}
	mExpanding = true;		mExpanding = true;
	if (DEBUG) Log.d(TAG, "scale type " + expandType + " beginning on view: " + v);		if (DEBUG) Log.d(TAG, "scale type " + expandType + " beginning on view: " + v);
	mCallback.setUserLockedChild(v, true);		mCallback.setUserLockedChild(v, true);
	setView(v);		setView(v);
	mScaler.setView(v);		mScaler.setView((ExpandableView) v);
	mOldHeight = mScaler.getHeight();		mOldHeight = mScaler.getHeight();
	if (mCallback.canChildBeExpanded(v)) {		if (mCallback.canChildBeExpanded(v)) {
	if (DEBUG) Log.d(TAG, "working on an expandable child");		if (DEBUG) Log.d(TAG, "working on an expandable child");
	@@ -480,6 +456,7 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener {
	if (DEBUG) Log.d(TAG, "got mOldHeight: " + mOldHeight +		if (DEBUG) Log.d(TAG, "got mOldHeight: " + mOldHeight +
	" mNaturalHeight: " + mNaturalHeight);		" mNaturalHeight: " + mNaturalHeight);
	v.getParent().requestDisallowInterceptTouchEvent(true);		v.getParent().requestDisallowInterceptTouchEvent(true);
			return true;
	}		}

	private void finishExpanding(boolean force) {		private void finishExpanding(boolean force) {
	@@ -499,10 +476,18 @@ public class ExpandHelper implements Gefingerpoken, OnClickListener {
	if (mScaleAnimation.isRunning()) {		if (mScaleAnimation.isRunning()) {
	mScaleAnimation.cancel();		mScaleAnimation.cancel();
	}		}
	mCallback.setUserExpandedChild(mCurrView, h == mNaturalHeight);		mCallback.setUserExpandedChild(mCurrView, targetHeight == mNaturalHeight);
	if (targetHeight != currentHeight) {		if (targetHeight != currentHeight) {
	mScaleAnimation.setFloatValues(targetHeight);		mScaleAnimation.setFloatValues(targetHeight);
	mScaleAnimation.setupStartValues();		mScaleAnimation.setupStartValues();
			final View scaledView = mCurrView;
			mScaleAnimation.addListener(new AnimatorListenerAdapter() {
			@Override
			public void onAnimationEnd(Animator animation) {
			mCallback.setUserLockedChild(scaledView, false);
			mScaleAnimation.removeListener(this);
			}
			});
	mScaleAnimation.start();		mScaleAnimation.start();
	} else {		} else {
	mCallback.setUserLockedChild(mCurrView, false);		mCallback.setUserLockedChild(mCurrView, false);

packages/SystemUI/src/com/android/systemui/statusbar/ActivatableNotificationView.java

+21 −5

Original line number	Original line	Diff line number	Diff line
	@@ -29,7 +29,7 @@ import com.android.internal.R;
	* Base class for both {@link ExpandableNotificationRow} and {@link NotificationOverflowContainer}		* Base class for both {@link ExpandableNotificationRow} and {@link NotificationOverflowContainer}
	* to implement dimming/activating on Keyguard for the double-tap gesture		* to implement dimming/activating on Keyguard for the double-tap gesture
	*/		*/
	public class ActivatableNotificationView extends FrameLayout {		public abstract class ActivatableNotificationView extends ExpandableOutlineView {

	private static final long DOUBLETAP_TIMEOUT_MS = 1000;		private static final long DOUBLETAP_TIMEOUT_MS = 1000;

	@@ -54,6 +54,7 @@ public class ActivatableNotificationView extends FrameLayout {
	public ActivatableNotificationView(Context context, AttributeSet attrs) {		public ActivatableNotificationView(Context context, AttributeSet attrs) {
	super(context, attrs);		super(context, attrs);
	mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();		mTouchSlop = ViewConfiguration.get(context).getScaledTouchSlop();
			updateBackgroundResource();
	}		}


	@@ -84,6 +85,9 @@ public class ActivatableNotificationView extends FrameLayout {
	case MotionEvent.ACTION_DOWN:		case MotionEvent.ACTION_DOWN:
	mDownX = event.getX();		mDownX = event.getX();
	mDownY = event.getY();		mDownY = event.getY();
			if (mDownY > getActualHeight()) {
			return false;
			}

	// Call the listener tentatively directly, even if we don't know whether the user		// Call the listener tentatively directly, even if we don't know whether the user
	// will stay within the touch slop, as the listener is implemented as a scale		// will stay within the touch slop, as the listener is implemented as a scale
	@@ -122,7 +126,7 @@ public class ActivatableNotificationView extends FrameLayout {
	}		}

	private void makeActive(float x, float y) {		private void makeActive(float x, float y) {
	getBackground().setHotspot(0, x, y);		mCustomBackground.setHotspot(0, x, y);
	mActivated = true;		mActivated = true;
	}		}

	@@ -132,8 +136,8 @@ public class ActivatableNotificationView extends FrameLayout {
	private void makeInactive() {		private void makeInactive() {
	if (mActivated) {		if (mActivated) {
	// Make sure that we clear the hotspot from the center.		// Make sure that we clear the hotspot from the center.
	getBackground().setHotspot(0, getWidth() / 2, getHeight() / 2);		mCustomBackground.setHotspot(0, getWidth() / 2, getActualHeight() / 2);
	getBackground().removeHotspot(0);		mCustomBackground.removeHotspot(0);
	mActivated = false;		mActivated = false;
	}		}
	if (mOnActivatedListener != null) {		if (mOnActivatedListener != null) {
	@@ -178,7 +182,19 @@ public class ActivatableNotificationView extends FrameLayout {
	}		}

	private void updateBackgroundResource() {		private void updateBackgroundResource() {
	setBackgroundResource(mDimmed ? mDimmedBgResId : mBgResId);		setCustomBackgroundResource(mDimmed ? mDimmedBgResId : mBgResId);
			}

			@Override
			protected void onLayout(boolean changed, int left, int top, int right, int bottom) {
			super.onLayout(changed, left, top, right, bottom);
			setPivotX(getWidth()/2);
			}

			@Override
			public void setActualHeight(int actualHeight) {
			super.setActualHeight(actualHeight);
			setPivotY(actualHeight/2);
	}		}

	public void setOnActivatedListener(OnActivatedListener onActivatedListener) {		public void setOnActivatedListener(OnActivatedListener onActivatedListener) {

packages/SystemUI/src/com/android/systemui/statusbar/BaseStatusBar.java

+8 −18

Original line number	Original line	Diff line number	Diff line
	@@ -760,9 +760,10 @@ public abstract class BaseStatusBar extends SystemUI implements
	// NB: the large icon is now handled entirely by the template		// NB: the large icon is now handled entirely by the template

	// bind the click event to the content area		// bind the click event to the content area
	SizeAdaptiveLayout expanded = (SizeAdaptiveLayout)row.findViewById(R.id.expanded);		NotificationContentView expanded =
	SizeAdaptiveLayout expandedPublic		(NotificationContentView) row.findViewById(R.id.expanded);
	= (SizeAdaptiveLayout)row.findViewById(R.id.expandedPublic);		NotificationContentView expandedPublic =
			(NotificationContentView) row.findViewById(R.id.expandedPublic);

	row.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);		row.setDescendantFocusability(ViewGroup.FOCUS_BLOCK_DESCENDANTS);

	@@ -794,19 +795,11 @@ public abstract class BaseStatusBar extends SystemUI implements

	if (contentViewLocal != null) {		if (contentViewLocal != null) {
	contentViewLocal.setIsRootNamespace(true);		contentViewLocal.setIsRootNamespace(true);
	SizeAdaptiveLayout.LayoutParams params =		expanded.setContractedChild(contentViewLocal);
	new SizeAdaptiveLayout.LayoutParams(contentViewLocal.getLayoutParams());
	params.minHeight = minHeight;
	params.maxHeight = minHeight;
	expanded.addView(contentViewLocal, params);
	}		}
	if (bigContentViewLocal != null) {		if (bigContentViewLocal != null) {
	bigContentViewLocal.setIsRootNamespace(true);		bigContentViewLocal.setIsRootNamespace(true);
	SizeAdaptiveLayout.LayoutParams params =		expanded.setExpandedChild(bigContentViewLocal);
	new SizeAdaptiveLayout.LayoutParams(bigContentViewLocal.getLayoutParams());
	params.minHeight = minHeight+1;
	params.maxHeight = maxHeight;
	expanded.addView(bigContentViewLocal, params);
	}		}

	PackageManager pm = mContext.getPackageManager();		PackageManager pm = mContext.getPackageManager();
	@@ -820,11 +813,7 @@ public abstract class BaseStatusBar extends SystemUI implements

	if (publicViewLocal != null) {		if (publicViewLocal != null) {
	publicViewLocal.setIsRootNamespace(true);		publicViewLocal.setIsRootNamespace(true);
	SizeAdaptiveLayout.LayoutParams params =		expandedPublic.setContractedChild(publicViewLocal);
	new SizeAdaptiveLayout.LayoutParams(publicViewLocal.getLayoutParams());
	params.minHeight = minHeight;
	params.maxHeight = minHeight;
	expandedPublic.addView(publicViewLocal, params);
	}		}
	}		}
	catch (RuntimeException e) {		catch (RuntimeException e) {
	@@ -1352,6 +1341,7 @@ public abstract class BaseStatusBar extends SystemUI implements
	} else {		} else {
	entry.row.setOnClickListener(null);		entry.row.setOnClickListener(null);
	}		}
			entry.row.notifyContentUpdated();
	}		}

	protected void notifyHeadsUpScreenOn(boolean screenOn) {		protected void notifyHeadsUpScreenOn(boolean screenOn) {