| commit | b7de34434b21868bef5de5242b923367e5237eb1 | [log] [tgz] |
|---|---|---|
| author | Aran Ink <nesciosquid@google.com> | Fri May 31 13:30:43 2019 -0700 |
| committer | android-build-merger <android-build-merger@google.com> | Fri May 31 13:30:43 2019 -0700 |
| tree | 5bfa5bdde9d730a81ca67b69fdb427905eec398f | |
| parent | 287d0a02154efdfb5bd32b97438aa477ef58344b [diff] | |
| parent | c70d1dc2a548ccc7793da34ef165182f53b73b52 [diff] |
Merge "Fix marquee animating in QuickSettings when invisible to user." into qt-dev am: c70d1dc2a5 Change-Id: I0cf60e4099d8ecfb2c899f3fa7bca99bfe185b75
diff --git a/packages/SystemUI/res/layout/quick_settings_header_info.xml b/packages/SystemUI/res/layout/quick_settings_header_info.xml index c812489..683e867 100644 --- a/packages/SystemUI/res/layout/quick_settings_header_info.xml +++ b/packages/SystemUI/res/layout/quick_settings_header_info.xml
@@ -21,6 +21,7 @@ android:layout_below="@id/quick_status_bar_system_icons" android:paddingStart="@dimen/status_bar_padding_start" android:paddingEnd="@dimen/status_bar_padding_end" + android:visibility="invisible" android:theme="@style/QSHeaderTheme"> <com.android.systemui.qs.QSHeaderInfoLayout
diff --git a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java index 9842748..410a13e 100644 --- a/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java +++ b/packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
@@ -461,6 +461,11 @@ if (mHeaderTextContainerAlphaAnimator != null) { mHeaderTextContainerAlphaAnimator.setPosition(keyguardExpansionFraction); + if (keyguardExpansionFraction > 0) { + mHeaderTextContainerView.setVisibility(VISIBLE); + } else { + mHeaderTextContainerView.setVisibility(INVISIBLE); + } } if (mPrivacyChipAlphaAnimator != null) { mPrivacyChip.setExpanded(expansionFraction > 0.5);
diff --git a/packages/SystemUI/src/com/android/systemui/util/AutoMarqueeTextView.java b/packages/SystemUI/src/com/android/systemui/util/AutoMarqueeTextView.java index d9d410d..09dbfee 100644 --- a/packages/SystemUI/src/com/android/systemui/util/AutoMarqueeTextView.java +++ b/packages/SystemUI/src/com/android/systemui/util/AutoMarqueeTextView.java
@@ -49,6 +49,11 @@ } @Override + protected void onFinishInflate() { + onVisibilityAggregated(isVisibleToUser()); + } + + @Override protected void onAttachedToWindow() { super.onAttachedToWindow(); setSelected(true);