From 9f3ee9e71e4508d4b323c435111bc123fe0d4ec0 Mon Sep 17 00:00:00 2001
From: Fabian Kozynski <kozynski@google.com>
Date: Mon, 22 Apr 2019 11:02:40 -0400
Subject: [PATCH] Make QSCarrierText always selected

We were changing selected value with visibility and that was making the
Carrier text become selected when QS expanded, capturing focus when it
shouldn't. This had also the effect of selecting it on HUN.

This change makes QSCarrierText always selected=true and only changes
its ellipsize with visibility

Test: manual, start expanding QS
Test: manual, send Hangouts message
Fixes: 129661790
Change-Id: I6c60ce288a1875cfd7854ad888170fdd77b2c65a
---
 .../SystemUI/src/com/android/systemui/qs/QSCarrier.java    | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/qs/QSCarrier.java b/packages/SystemUI/src/com/android/systemui/qs/QSCarrier.java
index f19445c1f33ba..a1a7566c87098 100644
--- a/packages/SystemUI/src/com/android/systemui/qs/QSCarrier.java
+++ b/packages/SystemUI/src/com/android/systemui/qs/QSCarrier.java
@@ -131,16 +131,19 @@ public class QSCarrier extends LinearLayout {
             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);
-                setSelected(true);
             } else {
                 setEllipsize(TextUtils.TruncateAt.END);
-                setSelected(false);
             }
         }
     }