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

Merge "Fix marquee animating in QuickSettings when invisible to user." into qt-dev

Browse Source
This commit is contained in:
Aran Ink
2019-05-31 20:11:21 +00:00
committed by Android (Google) Code Review
parent be8a41a604 7dd05dc1c7
commit c70d1dc2a5
3 changed files with 11 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
packages/SystemUI/res/layout/quick_settings_header_info.xml
View File

@@ -21,6 +21,7 @@
android:layout_below="@id/quick_status_bar_system_icons" android:layout_below="@id/quick_status_bar_system_icons"
android:paddingStart="@dimen/status_bar_padding_start" android:paddingStart="@dimen/status_bar_padding_start"
android:paddingEnd="@dimen/status_bar_padding_end" android:paddingEnd="@dimen/status_bar_padding_end"
android:visibility="invisible"
android:theme="@style/QSHeaderTheme"> android:theme="@style/QSHeaderTheme">
<com.android.systemui.qs.QSHeaderInfoLayout <com.android.systemui.qs.QSHeaderInfoLayout

5
packages/SystemUI/src/com/android/systemui/qs/QuickStatusBarHeader.java
View File

@@ -461,6 +461,11 @@ public class QuickStatusBarHeader extends RelativeLayout implements
if (mHeaderTextContainerAlphaAnimator != null) { if (mHeaderTextContainerAlphaAnimator != null) {
mHeaderTextContainerAlphaAnimator.setPosition(keyguardExpansionFraction); mHeaderTextContainerAlphaAnimator.setPosition(keyguardExpansionFraction);
if (keyguardExpansionFraction > 0) {
mHeaderTextContainerView.setVisibility(VISIBLE);
} else {
mHeaderTextContainerView.setVisibility(INVISIBLE);
}
} }
if (mPrivacyChipAlphaAnimator != null) { if (mPrivacyChipAlphaAnimator != null) {
mPrivacyChip.setExpanded(expansionFraction > 0.5); mPrivacyChip.setExpanded(expansionFraction > 0.5);

5
packages/SystemUI/src/com/android/systemui/util/AutoMarqueeTextView.java
View File

@@ -48,6 +48,11 @@ public class AutoMarqueeTextView extends TextView {
super(context, attrs, defStyleAttr, defStyleRes); super(context, attrs, defStyleAttr, defStyleRes);
} }
@Override
protected void onFinishInflate() {
onVisibilityAggregated(isVisibleToUser());
}
@Override @Override
protected void onAttachedToWindow() { protected void onAttachedToWindow() {
super.onAttachedToWindow(); super.onAttachedToWindow();