Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix touch target on QS date" into oc-dev

Browse Source 
am: aae6023996

Change-Id: I1ebc276b9017265c37cebe40ddd73dbcdf2ba715
This commit is contained in:
Jason Monk
2017-04-20 16:55:21 +00:00
committed by android-build-merger
parent c55b5f9e28 aae6023996
commit ae8dec401d
3 changed files with 27 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
packages/SystemUI/res/layout/qs_footer.xml
View File

@@ -34,8 +34,12 @@
<include <include
android:id="@+id/date_time_alarm_group" android:id="@+id/date_time_alarm_group"
layout="@layout/status_bar_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_width="0dp"
android:layout_height="match_parent" android:layout_height="0dp"
android:layout_weight="1" /> android:layout_weight="1" />
<com.android.systemui.statusbar.phone.MultiUserSwitch <com.android.systemui.statusbar.phone.MultiUserSwitch

12
packages/SystemUI/res/layout/status_bar_alarm_group.xml
View File

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

19
packages/SystemUI/src/com/android/systemui/qs/QSFooter.java
View File

@@ -48,6 +48,8 @@ import com.android.systemui.R.dimen;
import com.android.systemui.R.id; import com.android.systemui.R.id;
import com.android.systemui.plugins.ActivityStarter; import com.android.systemui.plugins.ActivityStarter;
import com.android.systemui.qs.TouchAnimator.Builder; 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.ExpandableIndicator;
import com.android.systemui.statusbar.phone.MultiUserSwitch; import com.android.systemui.statusbar.phone.MultiUserSwitch;
import com.android.systemui.statusbar.phone.SettingsButton; import com.android.systemui.statusbar.phone.SettingsButton;
@@ -166,8 +168,20 @@ public class QSFooter extends LinearLayout implements
.addFloat(mAlarmStatus, "alpha", 0, 1); .addFloat(mAlarmStatus, "alpha", 0, 1);
if (mAlarmShowing) { if (mAlarmShowing) {
builder.addFloat(mDate, "alpha", 1, 0) 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 { } else {
mAlarmStatus.setVisibility(View.GONE);
mDate.setAlpha(1); mDate.setAlpha(1);
mDateTimeGroup.setTranslationX(0); mDateTimeGroup.setTranslationX(0);
} }
@@ -277,8 +291,7 @@ public class QSFooter extends LinearLayout implements
} }
private void updateAlarmVisibilities() { private void updateAlarmVisibilities() {
mAlarmStatus.setVisibility(mAlarmShowing ? View.VISIBLE : View.INVISIBLE); mAlarmStatusCollapsed.setVisibility(mAlarmShowing ? View.VISIBLE : View.GONE);
mAlarmStatusCollapsed.setVisibility(mAlarmShowing ? View.VISIBLE : View.INVISIBLE);
} }
public void setListening(boolean listening) { public void setListening(boolean listening) {