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

Commit 75610441 authored by menghanli's avatar menghanli
Browse files

Create settings for window magnification (2/n) 

Provide a setting for new Magnify area feature and joystick controller

Bug: 146019459
Bug: 146473544
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MagnificationModePreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=MagnificationWindowControlPreferenceControllerTest
Test: make RunSettingsRoboTests2
Change-Id: Ia32fa073c59ad304e9ef9eb530ba37dd24c2f2f6
parent 44aa082c

res/drawable/accessibility_magnification_full_screen.png

0 → 100644
+2.41 KiB
Loading image diff...

res/drawable/accessibility_magnification_window_screen.png

0 → 100644
+1.98 KiB
Loading image diff...

res/layout/accessibility_edit_magnification_mode.xml

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

<!--

  Copyright (C) 2019 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

  -->



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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:scrollbarStyle="outsideOverlay">



    <LinearLayout

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:orientation="vertical"

        android:paddingEnd="24dp"

        android:paddingStart="24dp">



        <TextView

            style="@style/AccessibilityDialogDescription"

            android:text="@string/accessibility_magnification_area_settings_message" />



        <include

            android:id="@+id/magnify_full_screen"

            layout="@layout/accessibility_edit_shortcut_component" />



        <include

            android:id="@+id/magnify_window_screen"

            layout="@layout/accessibility_edit_shortcut_component" />



    </LinearLayout>



</ScrollView>

res/layout/accessibility_edit_shortcut_component.xml

+4 −2
Original line number Diff line number Diff line
@@ -19,12 +19,14 @@ 
    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical">

    android:orientation="vertical"

    android:paddingBottom="16dp">



    <CheckBox

        android:id="@+id/checkbox"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"/>

        android:layout_height="wrap_content"

        android:saveEnabled="false"/>



    <TextView

        android:id="@+id/summary"

res/values/arrays.xml

+18 −1
Original line number Diff line number Diff line
@@ -1014,8 +1014,25 @@ 
        <item>\?</item>

    </string-array>



    <!-- Summary for magnification adjustment modes for accessibility -->

    <string-array name="magnification_mode_summaries" translatable="false">

        <item>@string/accessibility_magnification_area_settings_full_screen_summary</item>

        <item>@string/accessibility_magnification_area_settings_window_screen_summary</item>

        <item>@string/accessibility_magnification_area_settings_all_summary</item>

    </string-array>



    <!-- Values for magnification adjustment modes for accessibility -->

    <integer-array name="magnification_mode_values" translatable="false">

        <!-- Full screen -->

        <item>1</item>

        <!-- Window screen -->

        <item>2</item>

        <!-- Full screen and window screen. -->

        <item>3</item>

    </integer-array>



    <!-- Summary for color space adjustment modes for accessibility -->

    <string-array name="daltonizer_mode_summary" translatable="false">

    <string-array name="daltonizer_mode_summaries" translatable="false">

        <item>@string/daltonizer_mode_deuteranomaly</item>

        <item>@string/daltonizer_mode_protanomaly</item>

        <item>@string/daltonizer_mode_tritanomaly</item>