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

Commit c4f8dfe4 authored by Anna Galusza's avatar Anna Galusza Committed by Android (Google) Code Review
Browse files

Merge "Add A11y SUW hub page. Minor alterations of Magnification screen to be... 

Merge "Add A11y SUW hub page. Minor alterations of Magnification screen to be consistent wtih most recent desigs."
parents e526cf20 bf95133f

res/layout/preference_button.xml

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

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

-->



<!-- Layout for a ButtonPreference. -->

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:orientation="vertical"

    android:paddingBottom="@dimen/accessibility_button_preference_padding_top_bottom"

    android:paddingTop="@dimen/accessibility_button_preference_padding_top_bottom"

    android:paddingStart="@dimen/accessibility_layout_margin_start_end"

    android:paddingEnd="@dimen/accessibility_layout_margin_start_end"

    android:focusable="true"

    android:selectable="false"

    android:persistent="false" >



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

            android:id="@+android:id/title"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textAppearance="?android:attr/textAppearanceLarge"

            android:selectable="true"

            android:persistent="false"

            android:gravity="left|center" />



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

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

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:textAppearance="?android:attr/textAppearanceSmall"

            android:selectable="true"

            android:persistent="false"

            android:gravity="left|center" />



</LinearLayout>

res/values/dimens.xml

+4 −0
Original line number Diff line number Diff line
@@ -264,4 +264,8 @@ 


    <!-- Display, Screen zoom -->

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



    <!-- Accessibility Settings -->

    <dimen name="accessibility_layout_margin_start_end">24dp</dimen>

    <dimen name="accessibility_button_preference_padding_top_bottom">18dp</dimen>

</resources>

res/values/strings.xml

+3 −1
Original line number Diff line number Diff line
@@ -3623,6 +3623,8 @@ 
    <string name="accessibility_settings">Accessibility</string>

    <!-- Settings title for accessibility settings screen -->

    <string name="accessibility_settings_title">Accessibility settings</string>

    <!-- Settings title for a brief version of Accessibility Settings, as displayed in Setup Wizard -->

    <string name="accessibility_settings_for_setup_wizard_title">Guide me</string>

    <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->

    <string name="accessibility_services_title">Services</string>

    <!-- Title for the accessibility preference category of system related preferences. [CHAR LIMIT=25] -->
@@ -3634,7 +3636,7 @@ 
    <!-- Title for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=35] -->

    <string name="accessibility_screen_magnification_title">Magnification gestures</string>

    <!-- Summary for the accessibility preference screen to enable screen magnification. [CHAR LIMIT=none] -->

    <string name="accessibility_screen_magnification_summary">When this feature is turned on, you can zoom in and out by triple-tapping the screen.\n\nWhile zoomed in, you can:\n<ul><li>Pan: Drag two or more fingers across the screen.</li>\n<li>Adjust zoom level: Pinch two or more fingers together or spread them apart.</li></ul>\n\nYou can also temporarily magnify what\u2019s under your finger by triple-tapping and holding. In this magnified state, you can drag your finger to explore different parts of the screen. Lift your finger to return to your previous state.\n\nNote: Triple-tap for magnification works everywhere except the keyboard and navigation bar.</string>

    <string name="accessibility_screen_magnification_summary">Zoom in and out by triple-tapping the screen with one finger.\n\nWhile zoomed in, you can:\n<ul><li>Pan: Drag two or more fingers across the screen.</li>\n<li>Adjust zoom level: Pinch two or more fingers together or spread them apart.</li>\n<li>Temporariliy magnify: Triple-tap, hold, and drag your finger to explore different parts of the screen. Lift your finger to return to our previous state.</li></ul>\n\nTriple-tap for magnification works everywhere except the keyboard and navigation bar.</string>

    <!-- Title for the preference to enable the global geture that turns on accessibility. [CHAR LIMIT=35] -->

    <string name="accessibility_global_gesture_preference_title">Accessibility shortcut</string>

    <!-- Summary for the preference to enable the global geture that turns on accessibility (on state). [CHAR LIMIT=60] -->

res/xml/accessibility_settings.xml

+7 −1
Original line number Diff line number Diff line
@@ -16,7 +16,13 @@ 


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

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

        android:title="@string/accessibility_settings">

        android:title="@string/accessibility_settings"

        android:persistent="true">



    <PreferenceScreen

        android:key="accessibility_settings_for_setup_wizard"

        android:title="@string/accessibility_settings_for_setup_wizard_title"

        android:fragment="com.android.settings.accessibility.AccessibilitySettingsForSetupWizard" />



    <PreferenceCategory

            android:key="services_category"

res/xml/accessibility_settings_for_setup_wizard.xml

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

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

-->



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

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

        android:title="@string/accessibility_settings_title"

        android:persistent="true" >



    <Preference

        android:fragment="com.android.settings.accessibility.ToggleScreenMagnificationPreferenceFragment"

        android:key="screen_magnification_preference"

        android:layout="@layout/preference_button"

        android:title="@string/accessibility_screen_magnification_title" />



    <Preference

        android:key="font_size_preference"

        android:layout="@layout/preference_button"

        android:title="@string/title_font_size" />



    <com.android.settings.DisplayDensityPreference

        android:key="force_density_preference"

        android:layout="@layout/preference_button"

        settings:keywords="@string/force_density_keywords"

        android:title="@string/force_density_preference_title"

        android:summary="%s" />



    <Preference

        android:fragment="com.android.settings.accessibility.ToggleDaltonizerPreferenceFragment"

        android:key="daltonizer_preference"

        android:layout="@layout/preference_button"

        android:title="@string/accessibility_display_daltonizer_preference_title" />



    <Preference

        android:key="talkback_preference"

        android:layout="@layout/preference_button" />



</PreferenceScreen>