f0013da134
The following changes has been made:
- The on/off toggle for Assistant now becomes two radio selectors ("Power Menu" and "Digital Assistant"). This is to make things clearer that Press & hold power button can be configured to power menu.
- The corresponding power menu animation will be shown when "Power Menu" is selected.
- The Assistant specific sensitivity settings and the foot notes are hidden when "Power Menu" is selected.
- Some minor wording updates according to the requests from Assistant / Settings UXW.
Bug: 229722937
Test: robotest, manual
Change-Id: Ib356fba861ad8c4a2626a0e0bd8cf3e4d90ce9a6
60 lines
3.1 KiB
XML
60 lines
3.1 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2020 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.
|
|
-->
|
|
|
|
<PreferenceScreen
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
|
android:title="@string/power_menu_setting_name">
|
|
|
|
<!-- Animation uses embedded PNGs and lottie requires asset folder to be set despite
|
|
embedding. -->
|
|
<com.android.settingslib.widget.IllustrationPreference
|
|
android:key="gesture_power_menu_video"
|
|
settings:searchable="false"
|
|
settings:lottie_imageAssetsFolder="power_menu"
|
|
settings:lottie_rawRes="@raw/lottie_long_press_power_for_power_menu"
|
|
settings:controller="com.android.settings.gestures.LongPressPowerIllustrationPreferenceController"/>
|
|
|
|
<PreferenceCategory
|
|
android:key="gesture_power_menu_long_press_category"
|
|
android:title="@string/power_menu_long_press_category_title">
|
|
<com.android.settingslib.widget.SelectorWithWidgetPreference
|
|
android:key="gesture_power_menu_long_press_for_power_menu"
|
|
android:title="@string/power_menu_long_press_for_power_menu_title"
|
|
settings:controller="com.android.settings.gestures.LongPressPowerForPowerMenuPreferenceController"/>
|
|
|
|
<com.android.settingslib.widget.SelectorWithWidgetPreference
|
|
android:key="gesture_power_menu_long_press_for_assistant"
|
|
android:title="@string/power_menu_long_press_for_assistant_title"
|
|
settings:controller="com.android.settings.gestures.LongPressPowerForAssistantPreferenceController"/>
|
|
</PreferenceCategory>
|
|
|
|
<com.android.settings.widget.LabeledSeekBarPreference
|
|
android:key="gesture_power_menu_long_press_for_assist_sensitivity"
|
|
android:title="@string/power_menu_long_press_for_assist_sensitivity_title"
|
|
android:summary="@string/power_menu_long_press_for_assist_sensitivity_summary"
|
|
settings:allowDividerAbove="true"
|
|
settings:textStart="@string/power_menu_long_press_for_assist_sensitivity_low_label"
|
|
settings:textEnd="@string/power_menu_long_press_for_assist_sensitivity_high_label"
|
|
settings:controller="com.android.settings.gestures.LongPressPowerSensitivityPreferenceController"
|
|
/>
|
|
|
|
<com.android.settingslib.widget.FooterPreference
|
|
android:key="power_menu_power_volume_up_hint"
|
|
android:title="@string/power_menu_power_volume_up_hint"
|
|
android:selectable="false"
|
|
settings:searchable="false"
|
|
settings:controller="com.android.settings.gestures.LongPressPowerFooterPreferenceController"/>
|
|
</PreferenceScreen>
|