65f09f3091
Extra fixes in this CL - Minor string update in time zone picker. Use date_time_search_region string in search bar, and date_time_set_timezone_title string for lower case "zone". - Fixed b/76893139. Remove the unnecessary top padding in RecyclerView. Create a new layout file time_zone_items_list.xml without the padding. - Add missing return statement when region ISO code is invalid in RegionZonePicker#getAllTimeZoneInfos Bug: 76209571 Bug: 76893139 Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone Test: Verified that the strings are updated in the UI Change-Id: I1fb3e2abf80da3cb53cfbc3363bbe46e40a6ac22
43 lines
1.8 KiB
XML
43 lines
1.8 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
<!-- Copyright (C) 2018 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"
|
|
android:key="time_zone_settings_screen"
|
|
android:title="@string/date_time_set_timezone">
|
|
|
|
<PreferenceCategory
|
|
android:key="time_zone_region_preference_category">
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="region"
|
|
android:title="@string/date_time_select_region"
|
|
android:summary="@string/summary_placeholder" />
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="region_zone"
|
|
android:title="@string/date_time_set_timezone_title"
|
|
android:summary="@string/summary_placeholder" />
|
|
<com.android.settingslib.widget.FooterPreference/>
|
|
</PreferenceCategory>
|
|
|
|
<PreferenceCategory
|
|
android:key="time_zone_fixed_offset_preference_category">
|
|
<com.android.settingslib.RestrictedPreference
|
|
android:key="fixed_offset"
|
|
android:title="@string/date_time_select_fixed_offset_time_zones"
|
|
android:summary="@string/summary_placeholder"/>
|
|
</PreferenceCategory>
|
|
</PreferenceScreen>
|