Lei Yu
081bbac10d
Merge "Fix tests for time format in settings" into pi-dev am: d46cf49b6d
...
am: a79ba59c3d
2018-03-28 17:06:22 +00:00
Shawn Ding
4d30b81e99
Merge "Fix data usage under Wi-Fi has title "Mobile data usage"" into pi-dev am: bbb3d3e72c
...
am: 3711215808
2018-03-28 16:59:00 +00:00
Lei Yu
a79ba59c3d
Merge "Fix tests for time format in settings" into pi-dev
...
am: d46cf49b6d
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
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
c8eb764d07
Merge "Fix robotest failure" into pi-dev am: aad168729f
...
am: dbe1ff67e7
2018-03-28 15:45:57 +00:00
Fan Zhang
dbe1ff67e7
Merge "Fix robotest failure" into pi-dev
...
am: aad168729f
2018-03-28 15:28:18 +00:00
Artem Iglikov
c2f76dbac9
Ignore broken test to unblock TreeHugger am: 54f467f9ad
...
am: 471a5931bd
2018-03-28 15:17:35 +00:00
Artem Iglikov
471a5931bd
Ignore broken test to unblock TreeHugger
...
am: 54f467f9ad
2018-03-28 15:12:40 +00:00
Fan Zhang
ea40291759
Revert "Ignore broken test to unblock TreeHugger"
...
This reverts commit 54f467f9ad
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
75279510fd
Merge "Allow app lists to have a toggle" into pi-dev am: 2c18bbbd75
...
am: 4fcb862c95
2018-03-28 11:35:38 +00:00
Julia Reynolds
4fcb862c95
Merge "Allow app lists to have a toggle" into pi-dev
...
am: 2c18bbbd75
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
Fan Zhang
6cd360a9b1
Merge "Add "device is muted/vibrate, click to turn on" conditions" into pi-dev am: 0a5367c0c4
...
am: 543bd80a90
2018-03-28 02:43:01 +00:00
Dieter Hsu
537c2cfc2c
Support AOD in the Universal Settings API
...
Bug: 67997452
Test: make -j RunSettingsRoboTests
Change-Id: I161bc5746573444b284a03de8f5d4d8e510153dc
2018-03-28 02:12:16 +00:00
Fan Zhang
c4c7ec4a5c
Remove duplicate classes from test/robotests
...
Robolectric now compiles against framework source, the duplicate classes
are no longer necessary
Bug: 76167422
Test: rerun robotest
Change-Id: Iceea1b53c2bd2feef19b5be344db3e4e3e893459
2018-03-27 18:59:32 -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
Vishwath Mohan
bde697bcf6
Merge "Disable pattern fading during the setup flow." into pi-dev am: a6fa9226c9
...
am: 90e1cfb424
2018-03-28 01:18:30 +00:00
Fan Zhang
543bd80a90
Merge "Add "device is muted/vibrate, click to turn on" conditions" into pi-dev
...
am: 0a5367c0c4
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
Bill Yi
e9bec656ef
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 97a1f85291 -s ours
...
am: 70d8e8dea2
2018-03-27 23:48:44 +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
2018-03-27 22:51:41 +00:00
Lei Yu
4b96ddb53d
Merge "Remove the old battery page" into pi-dev am: 4e25277f60
...
am: 71333cb477
2018-03-27 22:46:44 +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
2018-03-27 21:24:30 +00:00
Lei Yu
71333cb477
Merge "Remove the old battery page" into pi-dev
...
am: 4e25277f60
2018-03-27 21:11:06 +00:00
Lei Yu
04d13ee378
Fix tests for time format in settings
...
Because now we use different time format across the settings app.
We need to update all the tests.
Bug: 76113036
Test: RunSettingsRoboTests
Change-Id: Id4f7d55775adfdeb1aa0ae234f35d515ced4f450
2018-03-27 13:45:25 -07:00
TreeHugger Robot
97a1f85291
Merge "Import translations. DO NOT MERGE" into pi-dev
2018-03-27 20:41:16 +00:00
Fan Zhang
8878a957f8
Add "device is muted/vibrate, click to turn on" conditions
...
Bug: 76022431
Test: robotests
Change-Id: I89b71f99fa5ef866028912183ad04b053213bb0d
2018-03-27 13:31:12 -07:00
TreeHugger Robot
4e25277f60
Merge "Remove the old battery page" into pi-dev
2018-03-27 20:23:23 +00:00
Daniel Nishi
ec4866b323
Merge "Don't allow a zero-length device name to work."
2018-03-27 19:52:41 +00:00
Vishwath Mohan
670c252429
Disable pattern fading during the setup flow.
...
This CL disables fading the pattern during the pattern setup flow.
Test: The pattern fades everywhere but during the pattern setup flow.
Bug: 72798512
Change-Id: I959270cf39bc35080cce21777f0e168373406a17
2018-03-27 19:47:08 +00:00
Bill Yi
7764850080
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Bug: 64712476
Change-Id: Ife3ef6257d8ade3bcc9689171e4365f639c36440
2018-03-27 11:43:44 -07:00
Fan Zhang
473ee0e019
Merge "Add string linter preupload check" into pi-dev am: 49d0205749
...
am: cb3b32c9c4
2018-03-27 16:18:38 +00:00
Fan Zhang
cb3b32c9c4
Merge "Add string linter preupload check" into pi-dev
...
am: 49d0205749
2018-03-27 16:10:50 +00:00
TreeHugger Robot
49d0205749
Merge "Add string linter preupload check" into pi-dev
2018-03-27 16:01:24 +00:00
Amin Shaikh
b30587b473
Merge "Show wifi status label in preference summary." into pi-dev am: d467a8bc0f
...
am: 2f6979c9fe
2018-03-27 13:49:09 +00:00
HJ ChangLiao
b945a2a876
Merge "Add title to What to block page" into pi-dev am: 517f6d602d
...
am: ac4d617706
2018-03-27 13:32:12 +00:00
Amin Shaikh
2f6979c9fe
Merge "Show wifi status label in preference summary." into pi-dev
...
am: d467a8bc0f
2018-03-27 13:24:24 +00:00
