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

Commit b5abaf6b authored by Noah Wang's avatar Noah Wang Committed by Android (Google) Code Review
Browse files

Merge "Add instruction video to Screen Magnification a.k.a. Tap to Zoom screen."

parents 41b761ad c14ed744

res/drawable/accessibility_screen_magnification_background.xml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2016 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="360dp"

        android:height="184dp"

        android:viewportWidth="360"

        android:viewportHeight="184">



    <path

        android:fillColor="#E9F0F9"

        android:pathData="M 0 0 H 360 V 184 H 0 V 0 Z" />

    <path

        android:fillColor="#444445"

        android:pathData="M217.6,179h-75.1c-5,0-9-4-9-9V14c0-5,4-9,9-9h75.1c5,0,9,4,9,9V170C226.6,174.9,222.5,179,217.6,179z" />

    <path

        android:fillColor="#000000"

        android:pathData="M 180 9.6 C 181.1045695 9.6 182 10.4954305003 182 11.6 C 182 12.7045694997 181.1045695 13.6 180 13.6 C 178.8954305 13.6 178 12.7045694997 178 11.6 C 178 10.4954305003 178.8954305 9.6 180 9.6 Z" />

</vector>

res/layout/text_description_preference.xml

+1 −2
Original line number Diff line number Diff line
@@ -13,11 +13,10 @@ 
     See the License for the specific language governing permissions and

     limitations under the License.

-->



<TextView

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@android:id/summary"

    android:layout_width="fill_parent"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:textAppearance="@android:style/TextAppearance.Material.Body1"

    android:padding="16dip" />

res/layout/video_preference.xml

0 → 100644
+27 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2016 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.

-->

<RelativeLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/video_background"

    android:layout_width="match_parent"

    android:layout_height="wrap_content">



    <VideoView

        android:id="@+id/video"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content" />



</RelativeLayout>
 
 No newline at end of file

res/raw/accessibility_screen_magnification.mp4

0 → 100644
+92.8 KiB

File added.

No diff preview for this file type.

View file

res/values/dimens.xml

+7 −0
Original line number Diff line number Diff line
@@ -268,4 +268,11 @@ 


    <!-- Accessibility, Font size -->

    <dimen name="font_size_preview_height">240dp</dimen>



    <!-- Accessibility, Screen magnification. These values are meant to be relative values and the actual layout value will be set programmatically. -->

    <dimen name="screen_magnification_video_background_width">750dp</dimen>

    <dimen name="screen_magnification_video_background_height">383dp</dimen>

    <dimen name="screen_magnification_video_width">170dp</dimen>

    <dimen name="screen_magnification_video_height">311dp</dimen>

    <dimen name="screen_magnification_video_margin_top">40dp</dimen>

</resources>