Merge "Update the material next style for the banner of Auto Click." into sc-dev am: c4176b73e0 am: 5ed90daed0

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15153298

Change-Id: If4501f128bc5526e04e7db87f0bb0a2792dc3e3b
This commit is contained in:
PETER LIANG
2021-06-30 09:51:20 +00:00
committed by Automerger Merge Worker
2 changed files with 4 additions and 35 deletions

View File

@@ -1,30 +0,0 @@
<?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.
-->
<FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<ImageView
android:layout_width="match_parent"
android:layout_height="@dimen/autoclick_preview_height"
android:contentDescription="@null"
android:scaleType="fitCenter"
android:src="@drawable/accessibility_dwell"/>
</FrameLayout>

View File

@@ -19,14 +19,13 @@
xmlns:settings="http://schemas.android.com/apk/res-auto" xmlns:settings="http://schemas.android.com/apk/res-auto"
android:title="@string/accessibility_autoclick_preference_title"> android:title="@string/accessibility_autoclick_preference_title">
<com.android.settingslib.widget.LayoutPreference <com.android.settingslib.widget.IllustrationPreference
android:key="accessibility_autoclick_preview" android:key="accessibility_autoclick_banner"
android:layout="@layout/accessibility_autoclick_preview"
android:persistent="false" android:persistent="false"
android:selectable="false" android:selectable="false"
android:title="@string/summary_placeholder"
settings:allowDividerBelow="true" settings:allowDividerBelow="true"
settings:searchable="false" /> settings:searchable="false"
settings:lottie_rawRes="@drawable/accessibility_dwell" />
<com.android.settingslib.widget.RadioButtonPreference <com.android.settingslib.widget.RadioButtonPreference
android:key="accessibility_control_autoclick_default" android:key="accessibility_control_autoclick_default"