Merge "Fix UI issue in LocationSettings"

This commit is contained in:
TreeHugger Robot
2019-12-17 09:06:38 +00:00
committed by Android (Google) Code Review
21 changed files with 442 additions and 246 deletions

View File

@@ -572,7 +572,7 @@
<item name="android:showDividers">middle</item>
</style>
<style name="TextAppearance.Tab" parent="TextAppearance.Design.Tab">
<style name="TextAppearance.Tab" parent="@android:style/TextAppearance.DeviceDefault">
<item name="android:textAllCaps">false</item>
</style>

View File

@@ -109,7 +109,7 @@
android:title="@string/spellcheckers_settings_for_work_title"
android:fragment="com.android.settings.inputmethod.SpellCheckersSettings"
settings:forWork="true"
settings:controller="com.android.settings.language.UserDictionaryForWorkPreferenceController" />
settings:controller="com.android.settings.core.WorkPreferenceController" />
<Preference
android:key="user_dictionary_settings_for_work_pref"

View File

@@ -32,6 +32,8 @@
android:title="@string/location_recent_location_requests_see_all"
android:icon="@drawable/ic_chevron_right_24dp"
android:fragment="com.android.settings.location.RecentLocationRequestSeeAllFragment"
settings:controller="com.android.settings.core.WorkPreferenceController"
settings:forWork="true"
settings:searchable="false"/>
<com.android.settingslib.RestrictedSwitchPreference

View File

@@ -1,28 +0,0 @@
<!--
~ 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
-->
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"
android:key="storage_dashboard_screen"
android:title="@string/storage_settings"
android:orderingFromXml="false">
<com.android.settings.deviceinfo.storage.StorageSummaryDonutPreference
android:key="pref_summary"
android:order="0"
settings:searchable="false"
settings:controller="com.android.settings.deviceinfo.storage.StorageSummaryDonutPreferenceController"/>
</PreferenceScreen>