Victor Chang
b074d0640c
Merge "Fix incorrect GMT offset in display" into pi-dev
...
am: caf72cf3ff
Change-Id: Id8ccf9caa54e655f810d77baf19c7d6df55a9087
2018-03-28 22:53:29 +00:00
Kousuke Kitahara
072a60c8c3
[automerger skipped] Merge "DO NOT MERGE Move IMS registration state to SIM status screen" am: e8b70d7422 -s ours
...
am: 7d906895e8 -s ours
Change-Id: Ia1ae6679a2e3c5c2372bee1280ef8577efa3ef84
2018-03-28 21:13:08 +00:00
TreeHugger Robot
caf72cf3ff
Merge "Fix incorrect GMT offset in display" into pi-dev
2018-03-28 21:05:15 +00:00
Kousuke Kitahara
7d906895e8
[automerger skipped] Merge "DO NOT MERGE Move IMS registration state to SIM status screen"
...
am: e8b70d7422 -s ours
Change-Id: I16c7823773e1a1ca070bfc5189be080996f0d38e
2018-03-28 20:49:50 +00:00
Jan Nordqvist
976280308d
Merge "Entity header: When screen scrolls, there should be shadow under the header." into pi-dev
...
am: 00a2dcb8f9
Change-Id: I1d577b8432cde8b696a84a1aaa284576013612d7
2018-03-28 20:40:15 +00:00
TreeHugger Robot
00a2dcb8f9
Merge "Entity header: When screen scrolls, there should be shadow under the header." into pi-dev
2018-03-28 20:12:46 +00:00
Fan Zhang
f08dd43f2a
Merge "Revert "Ignore broken test to unblock TreeHugger"" into pi-dev
...
am: 8482455df7
Change-Id: I10b2fc33b345607358ad81c98784eb15fcd2c2e5
2018-03-28 20:07:23 +00:00
Makoto Onuki
4cd5487e11
Merge "Fix battery saver setting default state" into pi-dev
...
am: 856017f915
Change-Id: I32f20eac01ddeed16ed95c3b8b9323067b8d0608
2018-03-28 20:00:45 +00:00
Treehugger Robot
e8b70d7422
Merge "DO NOT MERGE Move IMS registration state to SIM status screen"
2018-03-28 19:51:28 +00:00
TreeHugger Robot
8482455df7
Merge "Revert "Ignore broken test to unblock TreeHugger"" into pi-dev
2018-03-28 19:41:24 +00:00
TreeHugger Robot
856017f915
Merge "Fix battery saver setting default state" into pi-dev
2018-03-28 19:31:51 +00:00
Lei Yu
7952ddd062
Merge "Get anomaly info from StringArrayList" into pi-dev
...
am: 512cb18c2e
Change-Id: If0f76de185b489e5c7ac4ae4d6dfb930ef35e03f
2018-03-28 19:22:12 +00:00
TreeHugger Robot
512cb18c2e
Merge "Get anomaly info from StringArrayList" into pi-dev
2018-03-28 18:58:00 +00:00
Victor Chang
77f97af8eb
Fix incorrect GMT offset in display
...
- android.icu.impl.TimeZoneAdapter doesn't fully implement
java.util.TimeZone, e.g. does not override getOffset(long date).
TimeZoneAdapter isn't a public API in ICU/Android. It shouldn't be
used in the first place
Bug: 77223510
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Change-Id: Ic0d7794326948796dcc5cc0b268ef634a74803c4
2018-03-28 19:52:05 +01:00
Jan Nordqvist
4092b2193c
Entity header: When screen scrolls, there should be shadow under the header.
...
Bug: 70950124
Test: manual
Test: make RunSettingsRoboTests
Change-Id: I5c1d9f463a57d48e258d67602fc4d1fbbdfaad60
2018-03-28 11:17:23 -07:00
Victor Chang
5aa3b3c3b8
Merge "Add a header view to show the country in RegionZonePicker" into pi-dev
...
am: 05ab467e80
Change-Id: I0865b2a8cc8b920e17f8693e5015555f0241762f
2018-03-28 17:55:17 +00:00
TreeHugger Robot
05ab467e80
Merge "Add a header view to show the country in RegionZonePicker" into pi-dev
2018-03-28 17:49:36 +00:00
HJ ChangLiao
941af18fe7
Merge "Move BT, NFC out of Conntection pref" into pi-dev
...
am: c621ddc3f2
Change-Id: I6ab6467b5c93b5d87695c1e919043e0a6a080ab9
2018-03-28 17:47:51 +00:00
TreeHugger Robot
c621ddc3f2
Merge "Move BT, NFC out of Conntection pref" into pi-dev
2018-03-28 17:38:34 +00:00
Jyun LuoLai
8b5e2c323b
Merge "Subtext of "Add device" should only show when BT is off" into pi-dev
...
am: 671db84734
Change-Id: If5da86ea853dd287a23abe67779aa579fdb48bf3
2018-03-28 17:36:41 +00:00
Bill Yi
24346f619e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 4fa5774b90 -s ours
Change-Id: I982cb88d891696dd14f36f9a4c908464746db66e
2018-03-28 17:28:34 +00:00
Makoto Onuki
c8db611068
Fix battery saver setting default state
...
- Battery saver is off by default.
Test: manual test with: settings delete global low_power && settings delete global low_power_trigger_level
Test: b ROBOTEST_FILTER=BatterySaver RunSettingsRoboTests
Bug: 76460719
Change-Id: I749bba9a5e36fe8ccee6e4ed843596bc94d96fcc
Fix: 76460719
2018-03-28 10:23:40 -07:00
TreeHugger Robot
671db84734
Merge "Subtext of "Add device" should only show when BT is off" into pi-dev
2018-03-28 17:22:25 +00:00
Bill Yi
4fa5774b90
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-03-28 17:11:01 +00:00
Lei Yu
a79ba59c3d
Merge "Fix tests for time format in settings" into pi-dev
...
am: d46cf49b6d
Change-Id: I40a23a9ac45e1bbcdae2ba51a2a1085469e19a76
2018-03-28 16:52:39 +00:00
Shawn Ding
3711215808
Merge "Fix data usage under Wi-Fi has title "Mobile data usage"" into pi-dev
...
am: bbb3d3e72c
Change-Id: I515e7d7db8d4d365992b41df2306fa235169dea9
2018-03-28 16:47:24 +00:00
TreeHugger Robot
d46cf49b6d
Merge "Fix tests for time format in settings" into pi-dev
2018-03-28 16:45:45 +00:00
TreeHugger Robot
bbb3d3e72c
Merge "Fix data usage under Wi-Fi has title "Mobile data usage"" into pi-dev
2018-03-28 16:36:16 +00:00
Fan Zhang
dbe1ff67e7
Merge "Fix robotest failure" into pi-dev
...
am: aad168729f
Change-Id: I2a013a921d3c818eefa3ef0732afc66755304cd5
2018-03-28 15:28:18 +00:00
Artem Iglikov
471a5931bd
Ignore broken test to unblock TreeHugger
...
am: 54f467f9ad
Change-Id: Icdc40c6ffa9624fa7ba28c3bfe0e70812066b150
2018-03-28 15:12:40 +00:00
Fan Zhang
ea40291759
Revert "Ignore broken test to unblock TreeHugger"
...
This reverts commit 54f467f9ad .
Bug: 77161730
Change-Id: Ib93d0cd75a10a8be94dec4f822359c6c492297ea
2018-03-28 15:10:10 +00:00
Fan Zhang
aad168729f
Merge "Fix robotest failure" into pi-dev
2018-03-28 15:06:50 +00:00
Artem Iglikov
54f467f9ad
Ignore broken test to unblock TreeHugger
...
Bug: 77161730
Test: make RunSettingsRoboTests -j
Change-Id: If16368d7cbf899dfacf376f33712f68daf2aebf7
2018-03-28 15:52:39 +01:00
Victor Chang
65f09f3091
Add a header view to show the country in RegionZonePicker
...
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
2018-03-28 15:40:33 +01:00
Julia Reynolds
4fcb862c95
Merge "Allow app lists to have a toggle" into pi-dev
...
am: 2c18bbbd75
Change-Id: Id4debc1b5bb0be97615193eeebc51050442daf86
2018-03-28 11:29:33 +00:00
Julia Reynolds
2c18bbbd75
Merge "Allow app lists to have a toggle" into pi-dev
2018-03-28 11:21:51 +00:00
Kousuke Kitahara
d42af71001
DO NOT MERGE Move IMS registration state to SIM status screen
...
To show IMS registration state for each SIM, move the preference of
IMS registration state from Status screen to SIM Status screen.
Test: manual - Checked that the IMS registration state is displayed on
the SIM Status screen.
Test: auto - Passed SimStatusTest.
Bug: 66063299
Change-Id: I3aff03ebdc9dc165db66c5007a2fa987ab8cd822
2018-03-28 09:48:53 +00:00
Jyun LuoLai
41e02a9489
Subtext of "Add device" should only show when BT is off
...
Bug: 73960246
Test: Manual test & make RunSettingsRoboTests
Change-Id: I6eb5fbed20a4ffc923faf992bbf0b30a817444a0
2018-03-28 14:26:26 +08:00
Fan Zhang
cbc5239cee
Fix robotest failure
...
Change-Id: Ic584aab213fa7af8f6f79e10743710be6840c2ee
Fixes: 77161730
Test: robotest
2018-03-27 21:43:41 -07:00
HJ ChangLiao
b247311b2a
Move BT, NFC out of Conntection pref
...
Move BT, NFC preference out of Connection Preference,
To Connected devices page.
Because NFC and Android Beam are controlled by the same controller,
Create each controller for those preference and leave the sharing part.
Change-Id: I8bc303a5f487de9c667487119b49e1e4130aa80c
Fixes: 72458929
Test: manually test, make RunSettingsRoboTests
2018-03-28 09:55:22 +08:00
Fan Zhang
543bd80a90
Merge "Add "device is muted/vibrate, click to turn on" conditions" into pi-dev
...
am: 0a5367c0c4
Change-Id: I277b4c2123fbe6d08548972883c3e1cd5288a71c
2018-03-28 00:45:43 +00:00
TreeHugger Robot
0a5367c0c4
Merge "Add "device is muted/vibrate, click to turn on" conditions" into pi-dev
2018-03-28 00:05:32 +00:00
Shawn Ding
a4d78e43c2
Fix data usage under Wi-Fi has title "Mobile data usage"
...
Fix "Wi-Fi data usage" in Wi-Fi section. (Settings -> Network & internet -> Data usage)
Change-Id: I6c4117db321af252a2c3061f554ffbe2f87a714e
Fixes: 76165354
Test: Manual test
2018-03-28 07:32:23 +08:00
Lei Yu
bb90c955df
Get anomaly info from StringArrayList
...
Statsd populates the anomaly info in StringArrayList, not StringArray. So
in settings we should use the correct API to get the data.
Bug: 77141809
Test: RunSettingsRoboTests
Change-Id: I56fc096106b5c040422fd7f5bb8cb4be7fe71d9d
2018-03-27 16:10:54 -07:00
Vishwath Mohan
90e1cfb424
Merge "Disable pattern fading during the setup flow." into pi-dev
...
am: a6fa9226c9
Change-Id: I6f2546a9c271a4d7127b7101e6ffcf5754253069
2018-03-27 22:51:41 +00:00
Julia Reynolds
1cda00b12b
Allow app lists to have a toggle
...
And make the notifications app list toggle block/unblock
notifications.
Test: make -j RunSettingsRoboTests
Change-Id: I7417b98fb1c66504897df515c4c84afad591764e
Fixes: 74318867
2018-03-27 18:46:02 -04:00
Bill Yi
3a98069fd4
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ie0351c94a04bdafdc0517be7c96dd89a366cfdf6
2018-03-27 15:26:27 -07:00
Vishwath Mohan
a6fa9226c9
Merge "Disable pattern fading during the setup flow." into pi-dev
2018-03-27 22:00:06 +00:00
Bill Yi
70d8e8dea2
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 97a1f85291 -s ours
Change-Id: Ief3ac341d55051ca2ea71128d64e4e45298a284c
2018-03-27 21:24:30 +00:00
Lei Yu
71333cb477
Merge "Remove the old battery page" into pi-dev
...
am: 4e25277f60
Change-Id: Id73aa82818b697cf2754758120a8ff098a68fdd5
2018-03-27 21:11:06 +00:00