Merge "autofill save: do not focus on custom sub title for TV" into pi-dev
diff --git a/core/res/res/layout-television/autofill_save.xml b/core/res/res/layout-television/autofill_save.xml
index ebd2dec..e221008 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"