Merge "Fix Marquees in QSHeader animating when invisible" into qt-dev am: 4ec18d46f6 (027fdc97) · Commits · e / os / android_frameworks_base

packages/SystemUI/res/layout/qs_carrier.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -35,7 +35,7 @@
		android:layout_marginEnd="@dimen/qs_carrier_margin_width"
		android:visibility="gone" />

		<view class="com.android.systemui.qs.QSCarrier$QSCarrierText"
		<com.android.systemui.util.AutoMarqueeTextView
		android:id="@+id/qs_carrier_text"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"

packages/SystemUI/res/layout/quick_settings_header_info.xml

+2 −2

Original line number	Diff line number	Diff line
		@@ -45,7 +45,7 @@
		android:contentDescription="@string/accessibility_quick_settings_alarm_set"
		android:visibility="gone"/>

		<TextView
		<com.android.systemui.util.AutoMarqueeTextView
		android:id="@+id/next_alarm_text"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		@@ -77,7 +77,7 @@
		android:layout_height="@dimen/qs_header_alarm_icon_size"
		android:visibility="gone"/>

		<TextView
		<com.android.systemui.util.AutoMarqueeTextView
		android:id="@+id/ringer_mode_text"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"

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

+1 −40

Original line number	Diff line number	Diff line
		@@ -33,7 +33,7 @@ import com.android.systemui.R;
		public class QSCarrier extends LinearLayout {

		private View mMobileGroup;
		private QSCarrierText mCarrierText;
		private TextView mCarrierText;
		private ImageView mMobileSignal;
		private ImageView mMobileRoaming;
		private DualToneHandler mDualToneHandler;
		@@ -111,43 +111,4 @@ public class QSCarrier extends LinearLayout {
		public void setCarrierText(CharSequence text) {
		mCarrierText.setText(text);
		}

		/**
		* TextView that changes its ellipsize value with its visibility.
		*/
		public static class QSCarrierText extends TextView {

		public QSCarrierText(Context context) {
		super(context);
		}

		public QSCarrierText(Context context, AttributeSet attrs) {
		super(context, attrs);
		}

		public QSCarrierText(Context context, AttributeSet attrs, int defStyleAttr) {
		super(context, attrs, defStyleAttr);
		}

		public QSCarrierText(Context context, AttributeSet attrs, int defStyleAttr,
		int defStyleRes) {
		super(context, attrs, defStyleAttr, defStyleRes);
		}

		@Override
		protected void onFinishInflate() {
		setSelected(true);
		}

		@Override
		protected void onVisibilityChanged(View changedView, int visibility) {
		super.onVisibilityChanged(changedView, visibility);
		// Only show marquee when visible
		if (visibility == VISIBLE) {
		setEllipsize(TextUtils.TruncateAt.MARQUEE);
		} else {
		setEllipsize(TextUtils.TruncateAt.END);
		}
		}
		}
		}

packages/SystemUI/src/com/android/systemui/util/AutoMarqueeTextView.java

0 → 100644

+75 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2019 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.systemui.util;

		import android.content.Context;
		import android.text.TextUtils;
		import android.util.AttributeSet;
		import android.widget.TextView;

		/**
		* TextView that changes its ellipsize value with its visibility.
		*
		* The View responds to changes in user-visibility to change its ellipsize from MARQUEE to END
		* and back. Useful for TextView that need to marquee forever.
		*/
		public class AutoMarqueeTextView extends TextView {

		private boolean mAggregatedVisible = false;

		public AutoMarqueeTextView(Context context) {
		super(context);
		}

		public AutoMarqueeTextView(Context context, AttributeSet attrs) {
		super(context, attrs);
		}

		public AutoMarqueeTextView(Context context, AttributeSet attrs, int defStyleAttr) {
		super(context, attrs, defStyleAttr);
		}

		public AutoMarqueeTextView(Context context, AttributeSet attrs, int defStyleAttr,
		int defStyleRes) {
		super(context, attrs, defStyleAttr, defStyleRes);
		}

		@Override
		protected void onAttachedToWindow() {
		super.onAttachedToWindow();
		setSelected(true);
		}

		@Override
		protected void onDetachedFromWindow() {
		super.onDetachedFromWindow();
		setSelected(false);
		}

		@Override
		public void onVisibilityAggregated(boolean isVisible) {
		super.onVisibilityAggregated(isVisible);
		if (isVisible == mAggregatedVisible) return;

		mAggregatedVisible = isVisible;
		if (mAggregatedVisible) {
		setEllipsize(TextUtils.TruncateAt.MARQUEE);
		} else {
		setEllipsize(TextUtils.TruncateAt.END);
		}
		}
		}