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

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

Merge "Make A11y SUW launchable from SUW and small UX changes based on last round of UX studies."

parents a6420cdb b1795f55
Loading
Loading
Loading
Loading
+17 −0
Original line number Diff line number Diff line
@@ -1407,6 +1407,23 @@
                android:value="true" />
        </activity>

        <activity android:name=".accessibility.AccessibilitySettingsForSetupWizardActivity"
                android:label="@string/vision_settings_title"
                android:theme="@style/SetupWizardAccessibilityTheme"
                android:taskAffinity="com.android.wizard"
                android:configChanges="orientation|keyboardHidden|screenSize" >
            <intent-filter android:priority="1">
                <action android:name="android.settings.ACCESSIBILITY_SETTINGS_FOR_SUW" />
                <category android:name="android.intent.category.DEFAULT" />
            </intent-filter>
            <meta-data android:name="com.android.settings.category"
                android:value="com.android.settings.category.system" />
            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
                android:value="com.android.settings.accessibility.AccessibilitySettingsForSetupWizard" />
            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"
                android:value="true" />
        </activity>

        <activity android:name="Settings$AccessibilityDaltonizerSettingsActivity"
                android:label="@string/accessibility_display_daltonizer_preference_title"
                android:taskAffinity="com.android.settings"
+56 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2015 The Android Open Source Project
<!-- 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.
@@ -14,35 +14,43 @@
     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:minHeight="?android:attr/listPreferredItemHeightSmall"
    android:gravity="center_vertical"
    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
    android:background="?android:attr/selectableItemBackground">

    <RelativeLayout
        android:layout_width="wrap_content"
        android:layout_height="wrap_content"
        android:layout_weight="1"
        android:paddingTop="16dip"
        android:paddingBottom="16dip">

        <TextView
            android:id="@+android:id/title"
            android:layout_width="match_parent"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:textAppearance="?android:attr/textAppearanceLarge"
            android:selectable="true"
            android:persistent="false"
            android:gravity="left|center" />
            android:textAppearance="@android:style/TextAppearance.Material.Subhead"
            android:textColor="?android:attr/textColorPrimary"
            android:ellipsize="marquee"
            android:fadingEdge="horizontal" />

        <TextView xmlns:android="http://schemas.android.com/apk/res/android"
            android:id="@+android:id/summary"
            android:layout_width="match_parent"
        <TextView
            android:id="@android:id/summary"
            android:layout_width="wrap_content"
            android:layout_height="wrap_content"
            android:textAppearance="?android:attr/textAppearanceSmall"
            android:selectable="true"
            android:persistent="false"
            android:gravity="left|center" />
            android:layout_below="@android:id/title"
            android:layout_alignStart="@android:id/title"
            android:visibility="gone"
            android:textAlignment="viewStart"
            android:textAppearance="@android:style/TextAppearance.Material.Body1"
            android:textColor="?android:attr/textColorSecondary"
            android:maxLines="10" />

    </RelativeLayout>

</LinearLayout>
+4 −0
Original line number Diff line number Diff line
@@ -104,4 +104,8 @@
    <color name="summary_default_start">#ff009587</color>
    <color name="summary_default_end">#ffced7db</color>

    <!-- Accessibility SUW colors -->
    <color name="material_blue_500">#4285F4</color>
    <color name="material_blue_700">#3367D6</color>

</resources>
+7 −3
Original line number Diff line number Diff line
@@ -3671,10 +3671,14 @@
    <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>
    <!-- Settings title for a brief version of Vision-Related Accessibility Settings. Displayed in Setup Wizard only. [CHAR LIMIT=35] -->
    <string name="vision_settings_title">Vision Settings</string>
    <!-- Settings description for a brief version of Vision-Related Accessibility Settings. Tells the user that they can adjust these settings now to help them through the remainder of the Setup Wizard and that they can later be changed in Settings. Displayed in Setup Wizard only. [CHAR LIMIT=none] -->
    <string name="vision_settings_description">Adjust these settings now to assist you through the remainder of the set up process. You can adjust them any time in device settings.</string>
    <!-- Title for the accessibility preference category of accessibility services. [CHAR LIMIT=25] -->
    <string name="accessibility_services_title">Services</string>
    <!-- Summary for the Talkback Accessibility Service. Lets the user know that Talkback is a screenreader and that it is usually most helpful to blind and low vision users. [CHAR_LIMIT=none] -->
    <string name="talkback_summary">Screenreader tool primarily for people with blindness and low vision</string>
    <!-- Title for the accessibility preference category of system related preferences. [CHAR LIMIT=25] -->
    <string name="accessibility_system_title">System</string>
    <!-- Title for the accessibility preference category of display related preferences. [CHAR LIMIT=25] -->
@@ -6701,7 +6705,7 @@
    <string name="camera_double_tap_power_gesture_desc">Quickly open camera without unlocking your screen</string>
    <!-- Title of setting that controls screen zoom (e.g. how large interface elements appear). [CHAR LIMIT=40] -->
    <string name="screen_zoom_title">Screen zoom</string>
    <string name="screen_zoom_title">Magnify display</string>
    <!-- Keywords for setting that controls screen zoom (e.g. how large interface elements appear). [CHAR LIMIT=NONE] -->
    <string name="screen_zoom_keywords">display density, screen zoom, scale, scaling</string>
    <!-- Summary of screen zoom setting screen. [CHAR LIMIT=NONE] -->
+8 −1
Original line number Diff line number Diff line
@@ -103,7 +103,6 @@
        <item name="@android:preferenceStyle">@style/Preference</item>
        <item name="@dropdownPreferenceStyle">@style/Preference.DropDown.Material</item>
        <item name="@android:preferenceFragmentStyle">@style/PreferenceFragmentStyle</item>

        <item name="apnPreferenceStyle">@style/ApnPreference</item>
    </style>

@@ -115,6 +114,14 @@
        <item name="android:layout">@layout/setup_preference</item>
    </style>

    <!-- Accessibility portion of Setup Wizard -->
    <style name="SetupWizardAccessibilityTheme" parent="Theme.SettingsBase">
        <item name="android:colorPrimary">@color/material_blue_700</item>
        <item name="android:colorPrimaryDark">@color/material_blue_700</item>
        <item name="preferenceTheme">@style/PreferenceTheme</item>
        <item name="switchBarTheme">@style/ThemeOverlay.SwitchBar.Settings</item>
    </style>

    <!-- Theme with no local references, used by AccountPreferenceBase where we have to inflate
         layouts against a remote context using our local theme colors. Due to the implementation
         details of Theme, we can't reference any local resources and MUST instead use the values
Loading