From 3da7eee106e3a746eeec5c954025d0cf6329b1bb Mon Sep 17 00:00:00 2001
From: Dake Gu <dake@google.com>
Date: Fri, 11 May 2018 16:46:30 -0700
Subject: [PATCH] autofill save: do not focus on custom sub title for TV

Custom sub title is put in a ScrollView, which steals the
initial focus from Yes/No button when lauching save dialog.

The ScrollView is focusable so it can scroll large views.
But it's quite useless at this point because layout use
"wrap_content" in height, unless the custom subtitle is
higher than fullscreen, we never uses the ScrollView's scroll
feature.

The problem for using ScrollView is:
- TV UX does not allow custom sub title to be focusable or
  scrollable.
- If changes TV UX to allow scrollable custom title view,
  focus indicator of ScrollView is missing, needs to be fixed.

Based on these reasons, disable scrollable feature for TV.

Bug: 79591730
Test: manually tested on AndroidTV
Change-Id: Ib6022daf822b8b977e9a2d4a831a8ba714fb321c
---
 core/res/res/layout-television/autofill_save.xml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/core/res/res/layout-television/autofill_save.xml b/core/res/res/layout-television/autofill_save.xml
index ebd2dec3fc0f6..e22100829d5ba 100644
--- a/core/res/res/layout-television/autofill_save.xml
+++ b/core/res/res/layout-television/autofill_save.xml
@@ -62,8 +62,9 @@
                     android:textSize="24sp" />
             </LinearLayout>
 
-            <com.android.server.autofill.ui.CustomScrollView
+            <LinearLayout
                 android:id="@+id/autofill_save_custom_subtitle"
+                android:orientation="vertical"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="4dp"