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

Revert "Update styling of NLS dialog"

Browse Source 
This reverts commit 358fe8e508.

Reason for revert: Android Auto has a test depending on the old layout of the dialog, and we need to revert until that test is updated

Change-Id: I47095be8c89d5bea27de835ea3fa700e3b90b49d
Bug: 205920324
Bug: 191331361
This commit is contained in:
Julia Reynolds
2021-11-11 18:53:19 +00:00
parent 358fe8e508
commit 6d37fdc546
3 changed files with 19 additions and 224 deletions
Download Patch File Download Diff File Expand all files Collapse all files

167
res/layout/enable_nls_dialog_content.xml
View File

@@ -1,167 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- Copyright (C) 2021 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:paddingLeft="24dp"
android:paddingRight="24dp">
<ImageView
android:id="@+id/app_icon"
style="@style/AccessibilityDialogServiceIcon" />
<TextView
android:id="@+id/title"
style="@style/AccessibilityDialogTitle" />
<TextView
android:id="@+id/prompt"
android:text="@string/nls_warning_prompt"
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/read_icon"
android:src="@drawable/ic_visibility_18dp"
android:layout_width="24dp"
android:layout_height="24dp"
style="@style/AccessibilityDialogIcon" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView
android:id="@+id/read_title"
android:text="@string/nls_feature_read_title"
style="@style/AccessibilityDialogPermissionTitle" />
<TextView
android:id="@+id/read_description"
android:text="@string/nls_feature_read_summary"
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/reply_icon"
android:src="@drawable/ic_promote_conversation"
android:layout_width="24dp"
android:layout_height="24dp"
style="@style/AccessibilityDialogIcon" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView
android:id="@+id/reply_title"
android:text="@string/nls_feature_reply_title"
style="@style/AccessibilityDialogPermissionTitle" />
<TextView
android:id="@+id/reply_description"
android:text="@string/nls_feature_reply_summary"
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/settings_icon"
android:src="@drawable/ic_do_not_disturb_on_24dp"
android:layout_width="24dp"
android:layout_height="24dp"
style="@style/AccessibilityDialogIcon" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical" >
<TextView
android:id="@+id/settings_title"
android:text="@string/nls_feature_settings_title"
style="@style/AccessibilityDialogPermissionTitle" />
<TextView
android:id="@+id/settings_description"
android:text="@string/nls_feature_settings_summary"
style="@style/AccessibilityDialogPermissionDescription" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
<!-- Buttons on bottom of dialog -->
<LinearLayout
style="@style/AccessibilityDialogButtonList">
<Space
style="@style/AccessibilityDialogButtonBarSpace"/>
<Button
android:id="@+id/allow_button"
android:text="@string/accessibility_dialog_button_allow"
style="@style/AccessibilityDialogButton" />
<Button
android:id="@+id/deny_button"
android:text="@string/accessibility_dialog_button_deny"
style="@style/AccessibilityDialogButton" />
</LinearLayout>
</LinearLayout>
</ScrollView>