Victor Chang
5aa3b3c3b8
Merge "Add a header view to show the country in RegionZonePicker" into pi-dev
...
am: 05ab467e80
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
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
2018-03-28 17:36:41 +00:00
Bill Yi
24346f619e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 4fa5774b90
2018-03-28 17:28:34 +00: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
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
dbe1ff67e7
Merge "Fix robotest failure" into pi-dev
...
am: aad168729f
2018-03-28 15:28:18 +00:00
Artem Iglikov
471a5931bd
Ignore broken test to unblock TreeHugger
...
am: 54f467f9ad
2018-03-28 15:12:40 +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
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
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
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
Vishwath Mohan
90e1cfb424
Merge "Disable pattern fading during the setup flow." into pi-dev
...
am: a6fa9226c9
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
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
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
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
2f6979c9fe
Merge "Show wifi status label in preference summary." into pi-dev
...
am: d467a8bc0f
2018-03-27 13:24:24 +00:00
HJ ChangLiao
ac4d617706
Merge "Add title to What to block page" into pi-dev
...
am: 517f6d602d
2018-03-27 13:18:51 +00:00
TreeHugger Robot
d467a8bc0f
Merge "Show wifi status label in preference summary." into pi-dev
2018-03-27 13:10:24 +00:00
TreeHugger Robot
517f6d602d
Merge "Add title to What to block page" into pi-dev
2018-03-27 13:04:03 +00:00
HJ ChangLiao
7fcf157762
Add title to What to block page
...
Add title to page Sound> Do Not Disturb> What to block
Fixes: 76103812
Test: make RunSettingsRoboTests -j
Change-Id: Iee2679cb94e1447769402d27895b276b8853d97a
2018-03-27 17:47:07 +08:00
Victor Chang
93e464564f
Fix crash in time zone picker due to race condition on view updates
...
am: 201c629fcc
2018-03-27 09:42:04 +00:00
Victor Chang
201c629fcc
Fix crash in time zone picker due to race condition on view updates
...
- Can't reproduce the race condition with manual test, probably the view
updates are fast enough that only monkey test can reproduce the issue.
- Reproduced a similar stacktrace and IndexOutOfBoundsException with
Robolectric test by assuming that the race condition happens after
text filtering and view updates. Try to fix the bug with this assumption
- The fix is to bind the data (data position in adapter) with ViewHolder.
Bug: 75322108
Test: m RunSettingsRoboTests ROBOTEST_FILTER=com.android.settings.datetime.timezone
Change-Id: Ie5d932bce30590b8067e042c3380911c9608872f
2018-03-27 09:31:54 +00:00
yuemingw
8c3bccda2c
Merge "Auto time should show dynamic subtext when restricted." into pi-dev
...
am: d7ea524e81
2018-03-27 08:37:28 +00:00
TreeHugger Robot
d7ea524e81
Merge "Auto time should show dynamic subtext when restricted." into pi-dev
2018-03-27 08:30:20 +00:00
Wenhung Teng
00bddd986e
Merge "Fix issue "open battery settings, switch locale, apps are still in old locale" into pi-dev" into pi-dev
...
am: 032b0454f8
2018-03-27 06:26:57 +00:00
Wenhung Teng
032b0454f8
Merge "Fix issue "open battery settings, switch locale, apps are still in old locale" into pi-dev" into pi-dev
2018-03-27 06:13:53 +00:00
