227affaf29
Reworked the way screensaver settings are laid out for O. Instead of using the options menu and dialogs to navigate screensaver options, there are now two rows: one row for the screensaver choice and optionally its own settings, and one row for the "when to show" setting. And now there's a nice obvious button you can press to preview your choices. Test: 'export ROBOTEST_FILTER="RadioButtonListFragmentTest";\ mmm -j20 packages/apps/Settings/tests/robotests' Bug: 35031991 Change-Id: Ie7d2055fb45f6dfe72e34cb9598d9a25f7bee75a
41 lines
1.7 KiB
XML
41 lines
1.7 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2017 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/com.android.settings"
|
|
android:title="@string/screensaver_settings_title" >
|
|
|
|
<com.android.settings.widget.GearPreference
|
|
android:key="current_screensaver"
|
|
android:title="@string/screensaver_settings_current"
|
|
android:fragment="com.android.settings.dream.CurrentDreamPicker" />
|
|
|
|
<Preference
|
|
android:key="when_to_start"
|
|
android:title="@string/screensaver_settings_when_to_dream"
|
|
android:fragment="com.android.settings.dream.WhenToDreamPicker" />
|
|
|
|
|
|
<!-- Layout preference doesn't obey allowDividerAbove, so put it in a PreferenceCategory -->
|
|
<PreferenceCategory>
|
|
<com.android.settings.applications.LayoutPreference
|
|
android:key="dream_start_now_button_container"
|
|
android:selectable="false"
|
|
android:layout="@layout/dream_start_button" />
|
|
</PreferenceCategory>
|
|
|
|
</PreferenceScreen> |