Fan Zhang
c8eb764d07
Merge "Fix robotest failure" into pi-dev am: aad168729f
...
am: dbe1ff67e7
Change-Id: I08b1116d00d5d499865808c0156fa05a78adee0e
2018-03-28 15:45:57 +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
c2f76dbac9
Ignore broken test to unblock TreeHugger am: 54f467f9ad
...
am: 471a5931bd
Change-Id: I1b894bc3e6f9afd01349eb88bd0a84b5efb0613b
2018-03-28 15:17:35 +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
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
Julia Reynolds
75279510fd
Merge "Allow app lists to have a toggle" into pi-dev am: 2c18bbbd75
...
am: 4fcb862c95
Change-Id: I78a16fd951866a1d8295ce9641c8aa9078f62d67
2018-03-28 11:35:38 +00: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
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
Change-Id: Ia404aa2faf697ffc42e29d55600d75f680598508
2018-03-28 02:43:01 +00:00
Vishwath Mohan
bde697bcf6
Merge "Disable pattern fading during the setup flow." into pi-dev am: a6fa9226c9
...
am: 90e1cfb424
Change-Id: I2afc785e842e29c231b6533e11e92f6e03a3bfd5
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
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
Bill Yi
e9bec656ef
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 97a1f85291
-s ours
...
am: 70d8e8dea2
-s ours
Change-Id: I7d72846456183dedbd9a7b8fa2953c9c6b9ed31f
2018-03-27 23:48:44 +00: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
Lei Yu
4b96ddb53d
Merge "Remove the old battery page" into pi-dev am: 4e25277f60
...
am: 71333cb477
Change-Id: I166c6de0bd2a7150dbfbbe35783c2fab86c6ed45
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
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
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
Change-Id: I10351f1a71173ccc1e65de12ffbfdbf78c836af9
2018-03-27 16:18:38 +00:00
Fan Zhang
cb3b32c9c4
Merge "Add string linter preupload check" into pi-dev
...
am: 49d0205749
Change-Id: Icaf820d0d6e4f6b9f56283e93752310355e15b89
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
Change-Id: I577ffa4b4e699a9163a5ca190fcfe08f167dc2f5
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
Change-Id: I4b1d206842370e08e73f32e00404109a55463561
2018-03-27 13:32:12 +00:00
Amin Shaikh
2f6979c9fe
Merge "Show wifi status label in preference summary." into pi-dev
...
am: d467a8bc0f
Change-Id: Icae963b4831b916e615a9e729116135967c5a388
2018-03-27 13:24:24 +00:00
HJ ChangLiao
ac4d617706
Merge "Add title to What to block page" into pi-dev
...
am: 517f6d602d
Change-Id: I3e898bf29199164d279f611973459fd67b7f347c
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
Victor Chang
dae61e0fa3
Fix crash in time zone picker due to race condition on view updates am: 201c629fcc
...
am: 93e464564f
Change-Id: I909d13c92601b63dccd782af2c0962e81507cc0f
2018-03-27 09:53:53 +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
Change-Id: Icd55bf16959da9e67b75ec93c53ef21fdcb9014f
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
5dc9faf1a0
Merge "Auto time should show dynamic subtext when restricted." into pi-dev am: d7ea524e81
...
am: 8c3bccda2c
Change-Id: Ifc207a8adb1ab1e976d540366c3d1ef29588ebfa
2018-03-27 08:44:30 +00:00
yuemingw
8c3bccda2c
Merge "Auto time should show dynamic subtext when restricted." into pi-dev
...
am: d7ea524e81
Change-Id: I161487aff5d83975c6c0e647e8405fab89376f9e
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
17c93edb3c
Merge "Fix issue "open battery settings, switch locale, apps are still in old locale" into pi-dev" into pi-dev am: 032b0454f8
...
am: 00bddd986e
Change-Id: Ie15b207e3d75ee862e58be72dc240da9f9d859df
2018-03-27 06:33:29 +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
Change-Id: I4676626f12b340752bd867c73d45eda5d0124a1c
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
Adam Newman
61484db01d
Merge "Observe NetworkCallback instead of polling" into pi-dev am: d2fb46eac4
...
am: 211535a10d
Change-Id: I440c17b8cf5670e40706f07832737927930de986
2018-03-27 06:01:17 +00:00
Adam Newman
211535a10d
Merge "Observe NetworkCallback instead of polling" into pi-dev
...
am: d2fb46eac4
Change-Id: Id06fb42bf1144fa3f04d092718427d484557732f
2018-03-27 05:48:04 +00:00
Adam Newman
d2fb46eac4
Merge "Observe NetworkCallback instead of polling" into pi-dev
2018-03-27 05:23:21 +00:00
Fan Zhang
ec67075abc
Merge "Use custom drawable for Battery saver condition icon." into pi-dev am: 74ac3b1f3a
...
am: b4c4d47e2e
Change-Id: Ib7d4ea27dae28192ce4e1a53324b9062a2e6948b
2018-03-27 05:20:19 +00:00