Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 00c2fb2a authored by PETER LIANG's avatar PETER LIANG Committed by Android (Google) Code Review
Browse files

Merge "Update the preview image of caption preference fragment." into sc-v2-dev

parents 04ab26b2 53bae52e

res/drawable-night/accessibility_captions_banner.xml

0 → 100644
+52 −0
Original line number Diff line number Diff line 
<?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>

res/drawable/accessibility_captions.png

deleted100644 → 0
−1.39 KiB
Loading image diff...

res/drawable/accessibility_captions_banner.xml

0 → 100644
+52 −0
Original line number Diff line number Diff line 
<?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>

res/layout/accessibility_captions_preview.xml

deleted100644 → 0
+0 −30
Original line number Diff line number Diff line 
<?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>

res/xml/captioning_settings.xml

+2 −3
Original line number Diff line number Diff line
@@ -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