From 53bae52e652d35b44e0f9982289ba3dcd4cdc242 Mon Sep 17 00:00:00 2001
From: Peter_Liang <peterliang@google.com>
Date: Wed, 7 Jul 2021 15:16:34 +0800
Subject: [PATCH] Update the preview image of caption preference fragment.

Bug: 192432531
Test: manual test
Change-Id: I5d8960821d5411af39035da4b77fadd9a7b9c26d
---
 .../accessibility_captions_banner.xml         |  52 ++++++++++++++++++
 res/drawable/accessibility_captions.png       | Bin 1428 -> 0 bytes
 .../accessibility_captions_banner.xml         |  52 ++++++++++++++++++
 res/layout/accessibility_captions_preview.xml |  30 ----------
 res/xml/captioning_settings.xml               |   5 +-
 5 files changed, 106 insertions(+), 33 deletions(-)
 create mode 100644 res/drawable-night/accessibility_captions_banner.xml
 delete mode 100644 res/drawable/accessibility_captions.png
 create mode 100644 res/drawable/accessibility_captions_banner.xml
 delete mode 100644 res/layout/accessibility_captions_preview.xml

diff --git a/res/drawable-night/accessibility_captions_banner.xml b/res/drawable-night/accessibility_captions_banner.xml
new file mode 100644
index 00000000000..7ee30f23f48
--- /dev/null
+++ b/res/drawable-night/accessibility_captions_banner.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="412dp"
+    android:height="300dp"
+    android:viewportWidth="412"
+    android:viewportHeight="300">
+  <path
+      android:fillColor="#FF000000"
+      android:pathData="M383.9,300H28.1C12.6,300 0,287.4 0,271.9V28.1C0,12.6 12.6,0 28.1,0h355.8C399.4,0 412,12.6 412,28.1v243.8C412,287.4 399.4,300 383.9,300z"/>
+  <path
+      android:pathData="M79.2,179.6h53.6v8.5h-53.6z"
+      android:fillColor="#669DF6"/>
+  <path
+      android:pathData="M142.5,179.6h30.4v8.5h-30.4z"
+      android:fillColor="#669DF6"/>
+  <path
+      android:pathData="M79.2,195.5h79.2v8.5h-79.2z"
+      android:fillColor="#669DF6"/>
+  <path
+      android:pathData="M168.1,195.5h34.1v8.5h-34.1z"
+      android:fillColor="#669DF6"/>
+  <path
+      android:pathData="M211.9,195.5h34.1v8.5h-34.1z"
+      android:fillColor="#669DF6"/>
+  <path
+      android:pathData="M182.7,179.6h73.1v8.5h-73.1z"
+      android:fillColor="#669DF6"/>
+  <path
+      android:pathData="M265.5,179.6h26.8v8.5h-26.8z"
+      android:fillColor="#669DF6"/>
+  <path
+      android:pathData="M302.1,179.6h26.8v8.5h-26.8z"
+      android:fillColor="#669DF6"/>
+  <path
+      android:pathData="M142.7,67.9h-11.5c-1.6,0 -2.9,1.3 -2.9,2.9H67.8c-7.9,0 -14.4,6.5 -14.4,14.4v132.4c0,7.9 6.5,14.4 14.4,14.4h276.4c7.9,0 14.4,-6.5 14.4,-14.4V85.2c0,-7.9 -6.5,-14.4 -14.4,-14.4H203.1c0,-1.6 -1.3,-2.9 -2.9,-2.9h-28.8c-1.6,0 -2.9,1.3 -2.9,2.9h-23C145.5,69.2 144.3,67.9 142.7,67.9zM344.2,73.7c6.4,0 11.5,5.2 11.5,11.5v132.4c0,6.3 -5.2,11.5 -11.5,11.5H67.8c-6.4,0 -11.5,-5.2 -11.5,-11.5V85.2c0,-6.3 5.2,-11.5 11.5,-11.5H344.2z"
+      android:fillColor="#80868B"/>
+</vector>
diff --git a/res/drawable/accessibility_captions.png b/res/drawable/accessibility_captions.png
deleted file mode 100644
index 718f4ef6dd8e8f7c9ef0c87b01f586997a350eea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 1428
zcmeAS@N?(olHy`uVBq!ia0y~yV6k9eV3J{B28ukq%)AUpNd)+WxVjhk+`aek&fSN%
z@7}+4=l<Jw@Bjb*FID_vUqGk}Pz_5-kY6x^adM;M#choY46N#&E{-7;jBoF_7s;55
zG(2oq`~Gg>-tarxat9vXyTmB+-Or{WdzZe06X!Wg8z0;2-#wqSakl<?&e+2UG>rh5
zBc}UlYjiH}Kkr)mcmLZh^zyWoo&P_({i<+_`=t|?;@?cnT6v4@=j_``!M~MGe5vVo
z@y@&DxXL~I=E=hEX%k-m^1OJma9MB3>A%4~eByl9`#yVoF61ff_%Bi0|M1}D6PG@*
zA6Hz=yG_^b$19^rIxm|aD=p>a+y1CII#92#tbWTzH?CVN9_8qYAD?NKcC~PSluYtb
z?<DChvmX~m==5zaU1KMB+RE=kRH4kV;x?<>bL5Yo{qDJbV&}%g-fJzUU41a)k%5q=
zsQaGHZbr9u{0;AV9Dcd)%IDo7GT(XoJfmLyIe)=P#`tkY_Ckwk8{gFIdH*PF>&Zfn
zw4;HUMQbMZ{n6a}<l3D6uEH$|U0Y*hX2^WLcKVO|qea}UXZn+Qmt}MoHdquqKk@h+
z<0A)|4(37yz9Wqm0_;Ezf&~*sQ_#T-Q;Jgo&~UI>Fa-ka2o}UX3<ZxEklX-Pjb;L-
zf+Gaoj-h}Ex1)QG2)CnqPJxf0+tC#~m@kYi@G(44Aa_~z(fwQh-c`S@{<C21#3$F~
zRUc3F<rC^ejzdguKCoGK+wb?iUt+>vbaOq`Kz2b~jch}fBS`RpzpvV#lgC@O8(Dfl
z69Y~U)@K<x-hZ}t>d8h6g=xq!Xgeckz7)I8=jgO&bIR6i=x&~Te4#+B%CU{?!C#XK
zza(_+O^`WuT*mg)(Z=Mb{nvJ}zC333zV*=#xz-7}C54fhMLv5=ECTFSnOHi>1V6TL
zTWX<q{Grpf(}5lfE!NdsGCF$VQRzyHU++Fo)!er6w&t`encLZC9^;F5Uu)5~IQtX3
zdrh=X-|O$5-%lrK>^SYMQu+7rtCL2nc64PG_K3<~ow%(3@srY>7QZ4sO^azaTlcM~
z@QC5P*T;1|HuRc33QftJ_-yiT!!4#Ke*N|c_t!plaUaJg+xyzb1k>lU-rQF$tNOU(
zcs8hvxEjBtZX^53U#C5;C|&+kDe~lyq0UL?{Qgy21a*tHx@S*VoGyP`cT?=0Y3^<R
w&TgN$#&uuW>X(oAU;X}Ajz9qhm7a4*+JC{;ll-5~iGxHuUHx3vIVCg!05;b}JOBUy

diff --git a/res/drawable/accessibility_captions_banner.xml b/res/drawable/accessibility_captions_banner.xml
new file mode 100644
index 00000000000..6597ffb5768
--- /dev/null
+++ b/res/drawable/accessibility_captions_banner.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2021 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.
+-->
+
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="412dp"
+    android:height="300dp"
+    android:viewportWidth="412"
+    android:viewportHeight="300">
+  <path
+      android:pathData="M383.9,300H28.1C12.6,300 0,287.4 0,271.9V28.1C0,12.6 12.6,0 28.1,0h355.8C399.4,0 412,12.6 412,28.1v243.8C412,287.4 399.4,300 383.9,300z"
+      android:fillColor="#FFFFFF"/>
+  <path
+      android:pathData="M79.2,179.6h53.6v8.5h-53.6z"
+      android:fillColor="#1A73E8"/>
+  <path
+      android:pathData="M142.5,179.6h30.4v8.5h-30.4z"
+      android:fillColor="#1A73E8"/>
+  <path
+      android:pathData="M79.2,195.5h79.2v8.5h-79.2z"
+      android:fillColor="#1A73E8"/>
+  <path
+      android:pathData="M168.1,195.5h34.1v8.5h-34.1z"
+      android:fillColor="#1A73E8"/>
+  <path
+      android:pathData="M211.9,195.5h34.1v8.5h-34.1z"
+      android:fillColor="#1A73E8"/>
+  <path
+      android:pathData="M182.7,179.6h73.1v8.5h-73.1z"
+      android:fillColor="#1A73E8"/>
+  <path
+      android:pathData="M265.5,179.6h26.8v8.5h-26.8z"
+      android:fillColor="#1A73E8"/>
+  <path
+      android:pathData="M302.1,179.6h26.8v8.5h-26.8z"
+      android:fillColor="#1A73E8"/>
+  <path
+      android:pathData="M142.7,67.9h-11.5c-1.6,0 -2.9,1.3 -2.9,2.9H67.8c-7.9,0 -14.4,6.5 -14.4,14.4v132.4c0,7.9 6.5,14.4 14.4,14.4h276.4c7.9,0 14.4,-6.5 14.4,-14.4V85.2c0,-7.9 -6.5,-14.4 -14.4,-14.4H203.1c0,-1.6 -1.3,-2.9 -2.9,-2.9h-28.8c-1.6,0 -2.9,1.3 -2.9,2.9h-23C145.5,69.2 144.3,67.9 142.7,67.9zM344.2,73.7c6.4,0 11.5,5.2 11.5,11.5v132.4c0,6.3 -5.2,11.5 -11.5,11.5H67.8c-6.4,0 -11.5,-5.2 -11.5,-11.5V85.2c0,-6.3 5.2,-11.5 11.5,-11.5H344.2z"
+      android:fillColor="#DADCE0"/>
+</vector>
diff --git a/res/layout/accessibility_captions_preview.xml b/res/layout/accessibility_captions_preview.xml
deleted file mode 100644
index 1818e64eec0..00000000000
--- a/res/layout/accessibility_captions_preview.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright (C) 2020 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.
--->
-
-<FrameLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content">
-
-    <ImageView
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/captioning_preview_height"
-        android:contentDescription="@null"
-        android:scaleType="fitCenter"
-        android:src="@drawable/accessibility_captions" />
-
-</FrameLayout>
diff --git a/res/xml/captioning_settings.xml b/res/xml/captioning_settings.xml
index b39714632b3..f5059e595f2 100644
--- a/res/xml/captioning_settings.xml
+++ b/res/xml/captioning_settings.xml
@@ -21,12 +21,11 @@
     android:persistent="false"
     android:title="@string/accessibility_captioning_title">
 
-    <com.android.settingslib.widget.LayoutPreference
+    <com.android.settingslib.widget.IllustrationPreference
         android:key="captions_preview"
-        android:layout="@layout/accessibility_captions_preview"
         android:persistent="false"
         android:selectable="false"
-        android:title="@string/summary_placeholder"
+        settings:lottie_rawRes="@drawable/accessibility_captions_banner"
         settings:searchable="false" />
 
     <com.android.settings.widget.SettingsMainSwitchPreference