Merge \\"QS: Layout and animation refinement\\" into nyc-mr1-dev am: 536a1a2ae7 (738d0b8f) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout-sw410dp/status_bar_alarm_group.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		android:id="@+id/date_time_alarm_group"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="8dp"
		android:layout_marginTop="16dp"
		android:layout_marginStart="16dp"
		android:gravity="start"
		android:orientation="vertical">

packages/SystemUI/res/layout/quick_status_bar_expanded_header.xml

+0 −1

Original line number	Diff line number	Diff line
		@@ -121,7 +121,6 @@
		<include
		android:id="@+id/date_time_alarm_group"
		layout="@layout/status_bar_alarm_group"
		android:layout_marginTop="16dp"
		android:layout_alignParentStart="true"
		android:layout_alignParentTop="true" />

packages/SystemUI/res/layout/status_bar_alarm_group.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -20,7 +20,7 @@
		android:id="@+id/date_time_alarm_group"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="8dp"
		android:layout_marginTop="16dp"
		android:layout_marginStart="16dp"
		android:gravity="start"
		android:orientation="vertical">

packages/SystemUI/res/values/dimens.xml

+0 −2

Original line number	Diff line number	Diff line
		@@ -178,8 +178,6 @@
		<dimen name="qs_tile_margin_top">16dp</dimen>
		<dimen name="qs_quick_tile_size">48dp</dimen>
		<dimen name="qs_quick_tile_padding">12dp</dimen>
		<dimen name="qs_date_collapsed_text_size">14sp</dimen>
		<dimen name="qs_date_text_size">16sp</dimen>
		<dimen name="qs_header_gear_translation">16dp</dimen>
		<dimen name="qs_page_indicator_width">16dp</dimen>
		<dimen name="qs_page_indicator_height">8dp</dimen>

packages/SystemUI/src/com/android/systemui/qs/QSAnimator.java

+18 −11

Original line number	Diff line number	Diff line
		@@ -41,8 +41,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
		private static final String ALLOW_FANCY_ANIMATION = "sysui_qs_fancy_anim";
		private static final String MOVE_FULL_ROWS = "sysui_qs_move_whole_rows";

		public static final float EXPANDED_TILE_DELAY = .7f;
		private static final float LAST_ROW_EXPANDED_DELAY = .86f;
		public static final float EXPANDED_TILE_DELAY = .86f;

		private final ArrayList<View> mAllViews = new ArrayList<>();
		private final ArrayList<View> mTopFiveQs = new ArrayList<>();
		@@ -58,7 +57,7 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
		private TouchAnimator mTranslationXAnimator;
		private TouchAnimator mTranslationYAnimator;
		private TouchAnimator mNonfirstPageAnimator;
		private TouchAnimator mLastRowAnimator;
		private TouchAnimator mBrightnessAnimator;

		private boolean mOnKeyguard;

		@@ -144,7 +143,6 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
		TouchAnimator.Builder firstPageBuilder = new Builder();
		TouchAnimator.Builder translationXBuilder = new Builder();
		TouchAnimator.Builder translationYBuilder = new Builder();
		TouchAnimator.Builder lastRowBuilder = new Builder();

		if (mQsPanel.getHost() == null) return;
		Collection<QSTile<?>> tiles = mQsPanel.getHost().getTiles();
		@@ -152,7 +150,6 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
		int[] loc1 = new int[2];
		int[] loc2 = new int[2];
		int lastXDiff = 0;
		int lastYDiff = 0;
		int lastX = 0;

		clearAnimationState();
		@@ -175,7 +172,6 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
		final int xDiff = loc2[0] - loc1[0];
		final int yDiff = loc2[1] - loc1[1];
		lastXDiff = loc1[0] - lastX;
		lastYDiff = yDiff;
		// Move the quick tile right from its location to the new one.
		translationXBuilder.addFloat(quickTileView, "translationX", 0, xDiff);
		translationYBuilder.addFloat(quickTileView, "translationY", 0, yDiff);
		@@ -209,13 +205,25 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha

		mAllViews.add(tileIcon);
		} else {
		lastRowBuilder.addFloat(tileView, "alpha", 0, 1);
		firstPageBuilder.addFloat(tileView, "alpha", 0, 1);
		}
		mAllViews.add(tileView);
		mAllViews.add(label);
		count++;
		}
		if (mAllowFancy) {
		// Make brightness appear static position and alpha in through second half.
		View brightness = mQsPanel.getBrightnessView();
		if (brightness != null) {
		firstPageBuilder.addFloat(brightness, "translationY", mQsPanel.getHeight(), 0);
		mBrightnessAnimator = new TouchAnimator.Builder()
		.addFloat(brightness, "alpha", 0, 1)
		.setStartDelay(.5f)
		.build();
		mAllViews.add(brightness);
		} else {
		mBrightnessAnimator = null;
		}
		mFirstPageAnimator = firstPageBuilder
		.setListener(this)
		.build();
		@@ -223,9 +231,6 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
		mFirstPageDelayedAnimator = new TouchAnimator.Builder()
		.setStartDelay(EXPANDED_TILE_DELAY)
		.addFloat(mQsPanel.getTileLayout(), "alpha", 0, 1).build();
		mLastRowAnimator = lastRowBuilder
		.setStartDelay(LAST_ROW_EXPANDED_DELAY)
		.build();
		Path path = new Path();
		path.moveTo(0, 0);
		path.cubicTo(0, 0, 0, 1, 1, 1);
		@@ -279,7 +284,9 @@ public class QSAnimator implements Callback, PageListener, Listener, OnLayoutCha
		mFirstPageDelayedAnimator.setPosition(position);
		mTranslationXAnimator.setPosition(position);
		mTranslationYAnimator.setPosition(position);
		mLastRowAnimator.setPosition(position);
		if (mBrightnessAnimator != null) {
		mBrightnessAnimator.setPosition(position);
		}
		} else {
		mNonfirstPageAnimator.setPosition(position);
		}