Merge "Fix touch target on QS date" into oc-dev (aae60239) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/qs_footer.xml

+5 −1

Original line number	Diff line number	Diff line
		@@ -34,8 +34,12 @@
		<include
		android:id="@+id/date_time_alarm_group"
		layout="@layout/status_bar_alarm_group"
		android:layout_width="wrap_content"
		android:layout_height="match_parent" />

		<Space
		android:layout_width="0dp"
		android:layout_height="match_parent"
		android:layout_height="0dp"
		android:layout_weight="1" />

		<com.android.systemui.statusbar.phone.MultiUserSwitch

packages/SystemUI/res/layout/status_bar_alarm_group.xml

+6 −6

Original line number	Diff line number	Diff line
		@@ -18,9 +18,9 @@
		xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:systemui="http://schemas.android.com/apk/res-auto"
		android:id="@+id/date_time_alarm_group"
		android:layout_width="0dp"
		android:layout_height="48dp"
		android:layout_weight="1"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:padding="4dp"
		android:gravity="center_vertical"
		android:orientation="horizontal"
		android:background="?android:attr/selectableItemBackground">
		@@ -28,7 +28,7 @@
		<com.android.systemui.statusbar.policy.DateView
		android:id="@+id/date"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_height="wrap_content"
		android:singleLine="true"
		android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Clock"
		android:textSize="@dimen/qs_time_collapsed_size"
		@@ -38,7 +38,7 @@
		<com.android.systemui.statusbar.AlphaOptimizedImageView
		android:id="@+id/alarm_status_collapsed"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_height="wrap_content"
		android:src="@drawable/ic_access_alarms_small"
		android:tint="?android:attr/textColorPrimary"
		android:paddingStart="6dp"
		@@ -49,7 +49,7 @@
		<com.android.systemui.statusbar.AlphaOptimizedButton
		android:id="@+id/alarm_status"
		android:layout_width="wrap_content"
		android:layout_height="match_parent"
		android:layout_height="wrap_content"
		android:textAppearance="@style/TextAppearance.StatusBar.Expanded.Clock"
		android:gravity="center_vertical"
		android:background="@null"

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

+16 −3

Original line number	Diff line number	Diff line
		@@ -48,6 +48,8 @@ import com.android.systemui.R.dimen;
		import com.android.systemui.R.id;
		import com.android.systemui.plugins.ActivityStarter;
		import com.android.systemui.qs.TouchAnimator.Builder;
		import com.android.systemui.qs.TouchAnimator.Listener;
		import com.android.systemui.qs.TouchAnimator.ListenerAdapter;
		import com.android.systemui.statusbar.phone.ExpandableIndicator;
		import com.android.systemui.statusbar.phone.MultiUserSwitch;
		import com.android.systemui.statusbar.phone.SettingsButton;
		@@ -166,8 +168,20 @@ public class QSFooter extends LinearLayout implements
		.addFloat(mAlarmStatus, "alpha", 0, 1);
		if (mAlarmShowing) {
		builder.addFloat(mDate, "alpha", 1, 0)
		.addFloat(mDateTimeGroup, "translationX", 0, -mDate.getWidth());
		.addFloat(mDateTimeGroup, "translationX", 0, -mDate.getWidth())
		.setListener(new ListenerAdapter() {
		@Override
		public void onAnimationAtStart() {
		mAlarmStatus.setVisibility(View.GONE);
		}

		@Override
		public void onAnimationStarted() {
		mAlarmStatus.setVisibility(View.VISIBLE);
		}
		});
		} else {
		mAlarmStatus.setVisibility(View.GONE);
		mDate.setAlpha(1);
		mDateTimeGroup.setTranslationX(0);
		}
		@@ -277,8 +291,7 @@ public class QSFooter extends LinearLayout implements
		}

		private void updateAlarmVisibilities() {
		mAlarmStatus.setVisibility(mAlarmShowing ? View.VISIBLE : View.INVISIBLE);
		mAlarmStatusCollapsed.setVisibility(mAlarmShowing ? View.VISIBLE : View.INVISIBLE);
		mAlarmStatusCollapsed.setVisibility(mAlarmShowing ? View.VISIBLE : View.GONE);
		}

		public void setListening(boolean listening) {