Felipe Leme
21f7f01703
Merge "Final (?!?!?!?!) Directory Access improvements." into pi-dev am: 65499ac2a3
...
am: 7c719772ee
Change-Id: I9a7081ca92a242b6b96c91047a0024f3a96acc87
2018-03-31 07:44:33 +00:00
Fan Zhang
a38a3728c6
Merge "Remove more wrappers" into pi-dev am: a1c7bd0640
...
am: 483ad78026
Change-Id: Ic5fc39baf1511bf4b786720e647e66c73d543496
2018-03-31 07:43:57 +00:00
Salvador Martinez
0f9a6d439f
Merge "Update add network dialog to not make networks hidden by default" into pi-dev am: 9dc3f74ccf
...
am: e36aafd230
Change-Id: I1899e6d309bdb6c997cc9846742623cb272a8aab
2018-03-31 07:43:17 +00:00
Salvador Martinez
a90332397b
Merge "Make metered wifi controller resilient to null config" into pi-dev am: 861bf93502
...
am: 0ec10e6a43
Change-Id: I79cf0e83ca9616d27b7f0d06c16f1415f2d91a77
2018-03-31 07:29:21 +00:00
TreeHugger Robot
94bc86c12a
Merge "Use colorPrimary for EntityHeader's background."
2018-03-31 06:15:37 +00:00
Daniel Nishi
1a509e4af9
Merge "Polish the About Phone page." into pi-dev am: e645558049
...
am: 45a587441f
Change-Id: I18252d96dc06d1f47c0121ce7bb45d5820f4dd69
2018-03-31 04:18:08 +00:00
Lei Yu
4e5ec9a9c1
Merge "Remove the obsolete bluetooth code" into pi-dev am: fa150fca3c
...
am: a5a338dff6
Change-Id: Icbc382b54b4bfe329aa8f2045433885997badf05
2018-03-31 03:35:30 +00:00
Fan Zhang
62b5000647
Merge "Remove networkScorer wrapper" into pi-dev am: 272d3b5096
...
am: 0cad854925
Change-Id: Ieb6bf1eed2e0877d5223bb45036af42ed6ebd791
2018-03-31 03:34:46 +00:00
Lei Yu
1ad1a29d88
Merge "Update the battery saver summary" into pi-dev am: 97dd3c9aac
...
am: 5b8c6c39e9
Change-Id: I6584692ea03b6f1c8bea8ceda4693d48d057e9e1
2018-03-31 03:34:11 +00:00
Shaotang Li
aab7756f08
Use colorPrimary for EntityHeader's background.
...
Bug: 76219670
Test: check color from screen manually.
Change-Id: If13d5cbd2bd7db1c6d9c9f840281601ab78ba267
2018-03-31 11:09:30 +08:00
Felipe Leme
7c719772ee
Merge "Final (?!?!?!?!) Directory Access improvements." into pi-dev
...
am: 65499ac2a3
Change-Id: I4a2da6e0fc3ae9001de620cddf553456b787ce6f
2018-03-31 02:27:28 +00:00
Fan Zhang
483ad78026
Merge "Remove more wrappers" into pi-dev
...
am: a1c7bd0640
Change-Id: If4ea13ed3a96272d01f1bce577613e44b15043ed
2018-03-31 02:20:03 +00:00
Salvador Martinez
e36aafd230
Merge "Update add network dialog to not make networks hidden by default" into pi-dev
...
am: 9dc3f74ccf
Change-Id: I463adc8f49a2707d4db3c7ff6a2c9fc6f7b6d2bd
2018-03-31 02:10:50 +00:00
Lei Yu
f1e1fe26e1
Merge "Refine the update process of battery tip" into pi-dev am: 227f056c8b
...
am: 5072234808
Change-Id: I92a29efd4c58a002c23a5d97f3cba5a581a44212
2018-03-31 02:04:46 +00:00
Salvador Martinez
0ec10e6a43
Merge "Make metered wifi controller resilient to null config" into pi-dev
...
am: 861bf93502
Change-Id: I58a91c9761867fba26dab51f24454b4619eb094c
2018-03-31 01:55:35 +00:00
Lei Yu
824bd92a16
Merge "Update battery strings" into pi-dev am: 7bbc11e87d
...
am: ab4ebab76c
Change-Id: Ic7bd7ff889bf921cdf3123d5df7a73795f3b734a
2018-03-31 00:21:58 +00:00
TreeHugger Robot
65499ac2a3
Merge "Final (?!?!?!?!) Directory Access improvements." into pi-dev
2018-03-31 00:21:36 +00:00
Daniel Nishi
45a587441f
Merge "Polish the About Phone page." into pi-dev
...
am: e645558049
Change-Id: I05a7128ca22960baa8ce19585441864f1d4d8a36
2018-03-30 23:56:52 +00:00
TreeHugger Robot
a1c7bd0640
Merge "Remove more wrappers" into pi-dev
2018-03-30 23:37:15 +00:00
Lei Yu
a5a338dff6
Merge "Remove the obsolete bluetooth code" into pi-dev
...
am: fa150fca3c
Change-Id: Ie9af21c4f4fcd31466334ba745d0f9e7c75356e5
2018-03-30 23:19:52 +00:00
Fan Zhang
0cad854925
Merge "Remove networkScorer wrapper" into pi-dev
...
am: 272d3b5096
Change-Id: I37beaa5483ad24cc3c27b4bc73eb26f129fa77bf
2018-03-30 23:18:37 +00:00
Lei Yu
5b8c6c39e9
Merge "Update the battery saver summary" into pi-dev
...
am: 97dd3c9aac
Change-Id: I9773a5c7fafcad6bbb840949a88f8341812222d1
2018-03-30 23:17:40 +00:00
Lei Yu
5072234808
Merge "Refine the update process of battery tip" into pi-dev
...
am: 227f056c8b
Change-Id: I01c9da780b587a480a7c3b6ef6bc904b7bd1d38f
2018-03-30 23:17:01 +00:00
Lei Yu
ab4ebab76c
Merge "Update battery strings" into pi-dev
...
am: 7bbc11e87d
Change-Id: Iaf0055a9082e3e13314107a290e2bddc0329d2dd
2018-03-30 22:46:42 +00:00
Salvador Martinez
9dc3f74ccf
Merge "Update add network dialog to not make networks hidden by default" into pi-dev
2018-03-30 22:22:59 +00:00
Victor Chang
34e0883317
Merge "Remove dead code in time zone picker" into pi-dev am: 93b5d0d3f0
...
am: 78d61aff2d
Change-Id: I567b56244cee9c72fe6bf17b0a2db4c14d4d244e
2018-03-30 21:40:51 +00:00
Jyun LuoLai
56d3c705ee
Merge "Modify AddDevicePreferenceController's constructor" into pi-dev am: 11174d3ced
...
am: b02f7f71a5
Change-Id: Idba6e2791e87b58293e47583884d2eaded02f0a0
2018-03-30 21:30:44 +00:00
Fan Zhang
c0c3eaa66c
Remove more wrappers
...
Bug: 76167422
Test: make RunSettingsRoboTests -j40
Change-Id: I0dc42c483ae92d508dec94e42573b55ced0e4bb0
2018-03-30 14:29:50 -07:00
Pengquan Meng
ae49fee55c
[automerger skipped] Merge "Add apn data structure" into pi-dev am: dbf8a678ae
...
am: 89918e3209
-s ours
Change-Id: I9ba2c1d14a08a187ca702eeb49d0e884e8a6e93d
2018-03-30 21:10:35 +00:00
TreeHugger Robot
861bf93502
Merge "Make metered wifi controller resilient to null config" into pi-dev
2018-03-30 20:50:25 +00:00
Daniel Nishi
e645558049
Merge "Polish the About Phone page." into pi-dev
2018-03-30 20:24:58 +00:00
Lei Yu
fa150fca3c
Merge "Remove the obsolete bluetooth code" into pi-dev
2018-03-30 20:24:01 +00:00
TreeHugger Robot
272d3b5096
Merge "Remove networkScorer wrapper" into pi-dev
2018-03-30 20:16:06 +00:00
Felipe Leme
68acecff56
Final (?!?!?!?!) Directory Access improvements.
...
- Hide children items when parent is granted access (and vice versa).
- Added dividers in between volumes.
Test: manual verification
Test: atest CtsAppSecurityHostTestCases:ScopedDirectoryAccessTest#testResetDoNotAskAgain,testResetGranted
Bug: 72055774
Change-Id: Ie4ad117d1f8a53bf7dbf7747e768a301b0d03604
2018-03-30 13:10:53 -07:00
Lei Yu
97dd3c9aac
Merge "Update the battery saver summary" into pi-dev
2018-03-30 20:01:50 +00:00
Lei Yu
227f056c8b
Merge "Refine the update process of battery tip" into pi-dev
2018-03-30 19:56:46 +00:00
Victor Chang
78d61aff2d
Merge "Remove dead code in time zone picker" into pi-dev
...
am: 93b5d0d3f0
Change-Id: Icc46d77ae3a4ba1d4f3ad2d5bcba0a1e0a3c289a
2018-03-30 19:17:47 +00:00
Lei Yu
7bbc11e87d
Merge "Update battery strings" into pi-dev
2018-03-30 19:12:41 +00:00
Jyun LuoLai
b02f7f71a5
Merge "Modify AddDevicePreferenceController's constructor" into pi-dev
...
am: 11174d3ced
Change-Id: I28e2aeeda026f7a1268f512a4808bca9cf09e0a3
2018-03-30 19:02:21 +00:00
Pengquan Meng
89918e3209
Merge "Add apn data structure" into pi-dev
...
am: dbf8a678ae
Change-Id: Ib6f5840689a924b26468c88ef0e68d8e97195e76
2018-03-30 18:56:22 +00:00
Victor Chang
93b5d0d3f0
Merge "Remove dead code in time zone picker" into pi-dev
2018-03-30 18:35:52 +00:00
Lei Yu
dec7a719d1
Remove the obsolete bluetooth code
...
Also update the shortcut:
1. Change the name to "Devices"
2. Change it point to "Connected device" page
Bug: 74806595
Fixes: 69926683
Test: robo test still pass
Change-Id: Ic57756fc955dc622cc22d0be64f02b5ae07a2915
2018-03-30 11:24:26 -07:00
Rubin Xu
228246d47f
Merge "Remove password blacklist check" into pi-dev am: 48283ec44c
...
am: d982a37476
Change-Id: I0c90b8cfb3dbec57cac00c55666e79dd0d32fc90
2018-03-30 18:24:21 +00:00
Fan Zhang
368c81e97b
Remove networkScorer wrapper
...
Also modified NetworkScorerPickerPreferenceController to register itself
in xml directily
Bug: 76167422
Test: robotests
Change-Id: I4a216b5e6845aecd6aaeed0ed9b3e06c9e0fc590
2018-03-30 11:06:30 -07:00
TreeHugger Robot
11174d3ced
Merge "Modify AddDevicePreferenceController's constructor" into pi-dev
2018-03-30 17:23:51 +00:00
Pengquan Meng
dbf8a678ae
Merge "Add apn data structure" into pi-dev
2018-03-30 17:00:35 +00:00
Rubin Xu
d982a37476
Merge "Remove password blacklist check" into pi-dev
...
am: 48283ec44c
Change-Id: I443bf5991b0cd0f859c63c48589eca7e872b4a25
2018-03-30 13:50:19 +00:00
Rubin Xu
48283ec44c
Merge "Remove password blacklist check" into pi-dev
2018-03-30 13:38:31 +00:00
Beverly
ffddcf0c95
Merge "Dnd 'blink light' option only if phone has LED" into pi-dev am: efa1cde042
...
am: 84b51371a9
Change-Id: Ie21dbfea9917f50b1cb533d28a84829739623a76
2018-03-30 13:37:26 +00:00
Beverly
84b51371a9
Merge "Dnd 'blink light' option only if phone has LED" into pi-dev
...
am: efa1cde042
Change-Id: Ibf201c126141cea6fb84660e93450e8fc6f61c33
2018-03-30 13:27:52 +00:00