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

Commit e6f0e3ff authored by Daniel Norman's avatar Daniel Norman
Browse files

Migrate A11yService warning resources from Settings to frameworks/base. 

This dialog is unnecessarily duplicated inside frameworks/base and
Settings, so this topic is consolidating the dialog to remove the
Settings version. However, the Settings version is more feature-full
so this change copies that version's resources to frameworks/base.

These resources are all not APIs so no Trunk Stable feature flag.

Test: Used in followup change & tested there
Bug: 303511250
Change-Id: I19e660baf47a8c25936b92df22b8ea536af8ddfc
parent 891fc7c2

core/res/res/drawable/ic_accessibility_generic.xml

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

  Copyright 2023 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="24dp"

        android:height="24dp"

        android:viewportWidth="24"

        android:viewportHeight="24">

    <path

        android:pathData="M5.6875,22.8235C4.9092,22.4776 4.8184,22.2615 2.8752,16.1257 1.8439,12.8691 1.0015,10.0882 1.0033,9.946 1.0137,9.1246 1.3166,8.8389 6.25,4.9976 9.2052,2.6966 11.2442,1.1943 11.5332,1.1049 11.8724,0.9999 12.1235,0.996 12.432,1.0907 12.9214,1.2408 22.3634,8.7104 22.6857,9.2024 23.1266,9.8752 23.0768,10.1907 22.0053,13.5155 19.0153,22.7935 19.1481,22.461 18.2853,22.8286 17.7053,23.0757 6.2446,23.0711 5.6875,22.8235Z"

        android:strokeWidth="0.31999999"

        android:fillColor="#ced6da"/>

    <path

        android:pathData="M10.0615,19.3507C10.028,19.2609 9.9864,17.362 9.9691,15.1308L9.9375,11.0741 8.5,10.853c-2.1981,-0.3381 -2.1924,-0.3355 -2.1619,-0.978 0.0141,-0.2963 0.074,-0.587 0.1331,-0.6462 0.06,-0.06 0.7667,0.0113 1.5994,0.1614 2.1217,0.3824 5.7371,0.3824 7.8588,0 0.8206,-0.1479 1.5349,-0.2259 1.5874,-0.1733 0.0525,0.0526 0.1334,0.3334 0.1799,0.624 0.078,0.4881 0.0598,0.5378 -0.2384,0.6512 -0.1776,0.0675 -1.0143,0.2259 -1.8593,0.352l-1.5364,0.2293 -0.0625,4.182 -0.0625,4.182l-0.625,0 -0.625,0l-0.0625,-1.875 -0.0625,-1.875l-0.5625,0L11.4375,15.6875l-0.0625,1.875 -0.0625,1.875 -0.595,0.0382c-0.4038,0.0259 -0.6146,-0.0143 -0.6559,-0.125zM11.3716,8.912c-0.4861,-0.3351 -0.6133,-0.5622 -0.6176,-1.1029 -0.0047,-0.6005 0.2255,-0.9684 0.739,-1.1811 0.8994,-0.3726 1.7571,0.2075 1.7571,1.1885 0,0.4533 -0.0659,0.5905 -0.4418,0.9206 -0.5007,0.4396 -0.9697,0.4967 -1.4366,0.1749z"

        android:strokeWidth="0.31999999"

        android:fillColor="#ffffff"/>

</vector>

core/res/res/layout/accessibility_service_warning.xml

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

<!-- Copyright (C) 2023 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="fill_parent"

    android:layout_height="fill_parent"

    android:textDirection="locale"

    android:scrollbarStyle="outsideOverlay"

    android:gravity="top">



    <LinearLayout

        android:accessibilityDataSensitive="yes"

        style="@style/AccessibilityDialog">



        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:orientation="vertical"

            android:gravity="center_horizontal"

            android:paddingLeft="24dp"

            android:paddingRight="24dp">



            <ImageView

                android:id="@+id/accessibility_permissionDialog_icon"

                style="@style/AccessibilityDialogServiceIcon" />



            <TextView

                android:id="@+id/accessibility_permissionDialog_title"

                style="@style/AccessibilityDialogTitle" />



            <TextView

                android:id="@+id/permissionDialog_description"

                android:text="@string/accessibility_service_warning_description"

                style="@style/AccessibilityDialogDescription" />



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                android:layout_marginBottom="24dp" >



                <ImageView

                    android:id="@+id/controlScreen_icon"

                    android:src="@drawable/ic_visibility"

                    style="@style/AccessibilityDialogIcon" />



                <LinearLayout

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:orientation="vertical" >



                    <TextView

                        android:id="@+id/controlScreen_title"

                        android:text="@string/accessibility_service_screen_control_title"

                        style="@style/AccessibilityDialogPermissionTitle" />



                    <TextView

                        android:id="@+id/controlScreen_description"

                        android:text="@string/accessibility_service_screen_control_description"

                        style="@style/AccessibilityDialogPermissionDescription" />



                </LinearLayout>



            </LinearLayout>



            <LinearLayout

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:orientation="horizontal"

                android:layout_marginBottom="24dp" >



                <ImageView

                    android:id="@+id/performAction_icon"

                    android:src="@drawable/ic_pan_tool"

                    style="@style/AccessibilityDialogIcon" />



                <LinearLayout

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:orientation="vertical" >



                    <TextView

                        android:id="@+id/performAction_title"

                        android:text="@string/accessibility_service_action_perform_title"

                        style="@style/AccessibilityDialogPermissionTitle" />



                    <TextView

                        android:id="@+id/performAction_description"

                        android:text="@string/accessibility_service_action_perform_description"

                        style="@style/AccessibilityDialogPermissionDescription" />



                </LinearLayout>



            </LinearLayout>



        </LinearLayout>



        <!-- Buttons on bottom of dialog -->

        <LinearLayout

            style="@style/AccessibilityDialogButtonList">



            <Space

                style="@style/AccessibilityDialogButtonBarSpace"/>



            <Button

                android:id="@+id/accessibility_permission_enable_allow_button"

                android:text="@string/accessibility_dialog_button_allow"

                style="@style/AccessibilityDialogButton" />



            <Button

                android:id="@+id/accessibility_permission_enable_deny_button"

                android:text="@string/accessibility_dialog_button_deny"

                style="@style/AccessibilityDialogButton" />



            <Button

                android:id="@+id/accessibility_permission_enable_uninstall_button"

                android:text="@string/accessibility_dialog_button_uninstall"

                android:visibility="gone"

                style="@style/AccessibilityDialogButton" />

        </LinearLayout>

    </LinearLayout>



</ScrollView>

core/res/res/values/strings.xml

+7 −0
Original line number Diff line number Diff line
@@ -4701,6 +4701,13 @@ 
    <string name="accessibility_dialog_button_allow">Allow</string>

    <!-- String for the deny button in accessibility permission dialog. [CHAR LIMIT=10] -->

    <string name="accessibility_dialog_button_deny">Deny</string>

    <!-- String for the uninstall button in accessibility permission dialog. -->

    <string name="accessibility_dialog_button_uninstall">Uninstall</string>

    <!-- Warning shown when user input has been blocked due to another app overlaying screen

         content. Since we don't know what the app is showing on top of the input target, we

         can't verify user consent. [CHAR LIMIT=NONE] -->

    <string name="accessibility_dialog_touch_filtered_warning">An app is obscuring the permission

        request so your response cannot be verified.</string>



    <!-- Title for accessibility select shortcut menu dialog. [CHAR LIMIT=100] -->

    <string name="accessibility_select_shortcut_menu_title">Tap a feature to start using it:</string>

core/res/res/values/styles.xml

+83 −0
Original line number Diff line number Diff line
@@ -1560,4 +1560,87 @@ please see styles_device_defaults.xml. 
    <!-- The default style for input method switch dialog -->

    <style name="InputMethodSwitchDialogStyle" parent="AlertDialog.DeviceDefault">

    </style>



    <style name="AccessibilityDialog">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:orientation">vertical</item>

        <item name="android:divider">@*android:drawable/list_divider_material</item>

        <item name="android:showDividers">middle</item>

    </style>



    <style name="AccessibilityDialogServiceIcon">

        <item name="android:layout_width">36dp</item>

        <item name="android:layout_height">36dp</item>

        <item name="android:layout_marginTop">16dp</item>

        <item name="android:layout_marginBottom">16dp</item>

        <item name="android:scaleType">fitCenter</item>

    </style>



    <style name="AccessibilityDialogIcon">

        <item name="android:layout_width">18dp</item>

        <item name="android:layout_height">18dp</item>

        <item name="android:layout_marginEnd">12dp</item>

        <item name="android:scaleType">fitCenter</item>

    </style>



    <style name="AccessibilityDialogTitle"

           parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:gravity">center</item>

        <item name="android:textSize">20sp</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:fontFamily">@*android:string/config_headlineFontFamilyMedium</item>

    </style>



    <style name="AccessibilityDialogDescription"

           parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:layout_marginTop">16dp</item>

        <item name="android:layout_marginBottom">32dp</item>

        <item name="android:textSize">16sp</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

    </style>



    <style name="AccessibilityDialogPermissionTitle"

           parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:textSize">16sp</item>

        <item name="android:textColor">?android:attr/textColorPrimary</item>

        <item name="android:fontFamily">@*android:string/config_headlineFontFamily</item>

    </style>



    <style name="AccessibilityDialogPermissionDescription"

           parent="@android:style/TextAppearance.DeviceDefault">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:textSize">14sp</item>

        <item name="android:textColor">?android:attr/textColorSecondary</item>

    </style>



    <style name="AccessibilityDialogButtonBarSpace">

        <item name="android:layout_width">0dp</item>

        <item name="android:layout_height">0dp</item>

        <item name="android:visibility">gone</item>

    </style>



    <style name="AccessibilityDialogButtonList">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">wrap_content</item>

        <item name="android:orientation">vertical</item>

        <item name="android:divider">@*android:drawable/list_divider_material</item>

        <item name="android:showDividers">middle</item>

    </style>



    <style name="AccessibilityDialogButton"

           parent="@*android:style/Widget.DeviceDefault.Button.ButtonBar.AlertDialog">

        <item name="android:layout_width">match_parent</item>

        <item name="android:layout_height">56dp</item>

        <item name="android:paddingEnd">8dp</item>

        <item name="android:paddingStart">8dp</item>

        <item name="android:background">?android:attr/selectableItemBackground</item>

    </style>

</resources>

core/res/res/values/symbols.xml

+4 −0
Original line number Diff line number Diff line
@@ -3614,11 +3614,14 @@ 
  <java-symbol type="string" name="accessibility_uncheck_legacy_item_warning" />



  <java-symbol type="layout" name="accessibility_enable_service_warning" />

  <java-symbol type="layout" name="accessibility_service_warning" />

  <java-symbol type="id" name="accessibility_permissionDialog_icon" />

  <java-symbol type="id" name="accessibility_permissionDialog_title" />

  <java-symbol type="id" name="accessibility_permission_enable_allow_button" />

  <java-symbol type="id" name="accessibility_permission_enable_deny_button" />

  <java-symbol type="id" name="accessibility_permission_enable_uninstall_button" />

  <java-symbol type="string" name="accessibility_enable_service_title" />

  <java-symbol type="string" name="accessibility_dialog_touch_filtered_warning" />



  <java-symbol type="layout" name="accessibility_shortcut_chooser_item" />

  <java-symbol type="id" name="accessibility_shortcut_target_checkbox" />
@@ -3647,6 +3650,7 @@ 


  <java-symbol type="drawable" name="ic_accessibility_color_inversion" />

  <java-symbol type="drawable" name="ic_accessibility_color_correction" />

  <java-symbol type="drawable" name="ic_accessibility_generic" />

  <java-symbol type="drawable" name="ic_accessibility_hearing_aid" />

  <java-symbol type="drawable" name="ic_accessibility_magnification" />

  <java-symbol type="drawable" name="ic_accessibility_reduce_bright_colors" />