PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Improve the Accessibility warning dialog with new design" into qt-dev

Browse Source
This commit is contained in:
Kevin Chang
2019-05-10 05:49:59 +00:00
committed by Android (Google) Code Review
parent 30a9392b21 bb6395eb4a
commit 35890fabae
9 changed files with 440 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

71
res/layout/disable_accessibility_service_dialog_content.xml Normal file
View File

@@ -0,0 +1,71 @@
<?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="fill_parent"
android:layout_height="fill_parent"
android:textDirection="locale"
android:scrollbarStyle="outsideOverlay"
android:gravity="top">
<LinearLayout
android:theme="@style/Theme.AlertDialog"
style="@style/AccessibilityDialog">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:gravity="center_horizontal"
android:paddingTop="32dp"
android:paddingLeft="24dp"
android:paddingRight="24dp">
<TextView
android:id="@+id/permissionDialog_disable_title"
style="@style/AccessibilityDialogTitle" />
<TextView
android:id="@+id/permissionDialog_disable_message"
android:gravity="center"
android:text="@string/accessibility_service_warning_description"
style="@style/AccessibilityDialogDescription" />
</LinearLayout>
<!-- Buttons on bottom of dialog -->
<LinearLayout
style="@style/AccessibilityDialogButtonList">
<Space
style="@style/AccessibilityDialogButtonBarSpace"/>
<Button
android:id="@+id/permission_disable_stop_button"
android:text="@string/accessibility_dialog_button_stop"
style="@style/AccessibilityDialogButtonAllow" />
<Button
android:id="@+id/permission_disable_cancel_button"
android:text="@string/accessibility_dialog_button_cancel"
style="@style/AccessibilityDialogButtonDeny" />
</LinearLayout>
</LinearLayout>
</ScrollView>

126
res/layout/enable_accessibility_service_dialog_content.xml
View File

@@ -23,28 +23,118 @@
android:gravity="top">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingStart="16dip"
android:paddingEnd="16dip">
android:theme="@style/Theme.AlertDialog"
style="@style/AccessibilityDialog">
<TextView
android:id="@+id/encryption_warning"
android:layout_width="fill_parent"
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="10dip"
android:textAlignment="viewStart"
android:textAppearance="?android:attr/textAppearanceMedium"/>
android:orientation="vertical"
android:gravity="center_horizontal"
android:paddingLeft="24dp"
android:paddingRight="24dp">
<TextView
android:id="@+id/accessibility_service_warning"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:padding="10dip"
android:textAlignment="viewStart"
android:textAppearance="?android:attr/textAppearanceMedium"/>
<ImageView
android:id="@+id/permissionDialog_icon"
style="@style/AccessibilityDialogServiceIcon" />
<TextView
android:id="@+id/permissionDialog_title"
style="@style/AccessibilityDialogTitle" />
<TextView
android:id="@+id/encryption_warning"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:padding="10dip"
android:textAlignment="viewStart"
android:textAppearance="?android:attr/textAppearanceMedium"/>
<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_18dp"
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_18dp"
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/permission_enable_allow_button"
android:text="@string/accessibility_dialog_button_allow"
style="@style/AccessibilityDialogButtonAllow" />
<Button
android:id="@+id/permission_enable_deny_button"
android:text="@string/accessibility_dialog_button_deny"
style="@style/AccessibilityDialogButtonDeny" />
</LinearLayout>
</LinearLayout>
</ScrollView>