Pengquan Meng
27146be745
[automerger skipped] Fixed ApnEditor issue am: 519009d3ed
...
am: 572f658ce5
-s ours
Change-Id: I19bb3958649ffe50ccc8dff19493e8dfbbc6c6e5
2018-04-02 19:07:26 -07:00
Pengquan Meng
572f658ce5
Fixed ApnEditor issue
...
am: 519009d3ed
Change-Id: Idab921debf4a00895e5c93766327bf91b40864c0
2018-04-02 23:55:33 +00:00
Fan Zhang
bf0a17a90b
Merge "Remove wrapper for device policy manager" into pi-dev am: e35e00712c
...
am: 4d91ea3036
Change-Id: If7baa937eda42db42cc5161c195f8da56677f06e
2018-04-02 22:30:37 +00:00
Salvador Martinez
cdaf7f2c32
Update color whitelist for check color repohook am: 38c4b38740
...
am: f6812242e4
Change-Id: If8e4b2c0140d559b0c8b024f18025ae530322b29
2018-04-02 22:29:55 +00:00
Lei Yu
d5dceb7d5c
Merge changes Ib497aca6,Ic6def54a into pi-dev am: 5e8a0e2436
...
am: fc6f4e05da
Change-Id: I44510b8dd49325b913d0d7ad82ceb844f3d98886
2018-04-02 22:29:29 +00:00
Salvador Martinez
49d0d7b492
Merge "Update auto wi-fi to prompt user for permissions" into pi-dev am: 27587f7884
...
am: 3903f787e9
Change-Id: Ia5f05b32874ec93019fad725bb78d1adae922e4b
2018-04-02 22:27:49 +00:00
Lei Yu
739c68c369
Merge "Update the battery string." into pi-dev am: 43a325dd05
...
am: 3dbdb27605
Change-Id: If997f4feac5446310ab8e98091ea40b65aa5256c
2018-04-02 21:56:11 +00:00
Jyun LuoLai
6c5c6d7c22
Merge "Let battery status icon has consist UI in PowerSummaryPage" into pi-dev am: ab19293cf4
...
am: 6b0a77647c
Change-Id: I2fffa4d581d527b302056e2535f496e62ed1c272
2018-04-02 21:44:35 +00:00
Fan Zhang
4d91ea3036
Merge "Remove wrapper for device policy manager" into pi-dev
...
am: e35e00712c
Change-Id: I2b10893350176f34604d1a9dfeb9c5a6256a5842
2018-04-02 21:35:55 +00:00
Salvador Martinez
f6812242e4
Update color whitelist for check color repohook
...
am: 38c4b38740
Change-Id: I6667de2d1b0520c5291cd6f3efe081d81a800e3c
2018-04-02 21:31:42 +00:00
Lei Yu
fc6f4e05da
Merge changes Ib497aca6,Ic6def54a into pi-dev
...
am: 5e8a0e2436
Change-Id: Iaf656a0a6600e5907a7272b1c6e12e2b3a58fd06
2018-04-02 21:24:24 +00:00
Salvador Martinez
3903f787e9
Merge "Update auto wi-fi to prompt user for permissions" into pi-dev
...
am: 27587f7884
Change-Id: I9c171a39c3594641f46f53a789e383798bae248c
2018-04-02 21:14:15 +00:00
Lei Yu
3dbdb27605
Merge "Update the battery string." into pi-dev
...
am: 43a325dd05
Change-Id: I8282a986797fdce16673a890d501853348af7123
2018-04-02 20:58:15 +00:00
Jyun LuoLai
6b0a77647c
Merge "Let battery status icon has consist UI in PowerSummaryPage" into pi-dev
...
am: ab19293cf4
Change-Id: Ifb1c8093929fdc763b90d3a324c875177e654efb
2018-04-02 19:55:09 +00:00
TreeHugger Robot
e9c8a73607
Merge "Add registry for PreventRingingGestureSettings"
2018-04-02 19:22:30 +00:00
Pengquan Meng
519009d3ed
Fixed ApnEditor issue
...
The mainly changed:
1. Will not insert invalid apn data to database.
2. Clicking back button will save the APN data to database if the data is valid.
Test: make ROBOTEST_FILTER=ApnEditorTest -j40 RunSettingsRoboTests
Bug: 73745458
Bug: 67327863
Merged-In: Ie2c147cae03ad78d43c351e05add761b2dffac0c
Change-Id: Ie2c147cae03ad78d43c351e05add761b2dffac0c
(cherry picked from commit f39ef85653
)
2018-04-02 18:53:53 +00:00
Pengquan Meng
811a0ad404
Merge "Fixed ApnEditor issue"
2018-04-02 18:52:31 +00:00
TreeHugger Robot
e35e00712c
Merge "Remove wrapper for device policy manager" into pi-dev
2018-04-02 18:45:53 +00:00
Salvador Martinez
38c4b38740
Update color whitelist for check color repohook
...
It is blocking cl's being uploaded due to someone skipping the
repo-hooks.
Test: Can build and upload CL's
Bug: 77478756
Change-Id: I3ae4212fb06a5b82c0afe57dcd839f5a55583cce
2018-04-02 11:32:06 -07:00
TreeHugger Robot
5e8a0e2436
Merge changes Ib497aca6,Ic6def54a into pi-dev
...
* changes:
Make anomaly jobs persistent.
Update job ids in Settings
2018-04-02 16:44:51 +00:00
hylo
ba3fce9559
Add registry for PreventRingingGestureSettings
...
Register PreventRingingGestureSettings to SearchIndexableResourcesImpl
Change-Id: Idbb9c09f844a327dc1dd865e932ae464db1933ee
Fixes: 77454987
Test: remove @ignore("b/73960706") and make RunSettingsRoboTests ROBOTEST_FILTER=CodeInspectionTest
2018-04-02 14:06:33 +08:00
TreeHugger Robot
27587f7884
Merge "Update auto wi-fi to prompt user for permissions" into pi-dev
2018-04-02 01:36:37 +00:00
TreeHugger Robot
43a325dd05
Merge "Update the battery string." into pi-dev
2018-04-02 01:33:28 +00:00
Jyun LuoLai
ab19293cf4
Merge "Let battery status icon has consist UI in PowerSummaryPage" into pi-dev
2018-04-02 01:27:56 +00:00
Fan Zhang
570bd7bb0c
Merge "Remove wrappers" into pi-dev am: 1873faefb8
...
am: cb8a01dd00
Change-Id: I0b7f46ee3ff2626c2a2e3e471b8cd11a9667b21c
2018-03-31 11:14:36 +00:00
Fan Zhang
cb8a01dd00
Merge "Remove wrappers" into pi-dev
...
am: 1873faefb8
Change-Id: Id9c1c6625ddf6dccb39c19fb396a9009c447b33f
2018-03-31 11:08:34 +00:00
TreeHugger Robot
1873faefb8
Merge "Remove wrappers" into pi-dev
2018-03-31 11:00:25 +00:00
Ryan Lin
dbbbb81943
Merge "Add callback onProfileAudioStateChanged()" into pi-dev am: 388907d136
...
am: a56e1283f3
Change-Id: I314fb7c7b701d28ee8d30fe1d7b35b61eeddc6ad
2018-03-31 10:36:06 +00:00
HJ ChangLiao
53bc8f575f
Merge "Wake notifications to TogglePreferenceController" into pi-dev am: 3173e9d103
...
am: 64b0fbf89e
Change-Id: I69c71e6fc9ebda8f8641f3d6e667a9081eb33ef6
2018-03-31 10:35:22 +00:00
Bill Yi
26706dc6ad
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 830011bf33
-s ours
...
am: 77c816b4fa
-s ours
Change-Id: I000639f7d42cc9c4f4a720e1228e784fd851852b
2018-03-31 10:14:15 +00:00
Phil Weaver
4718e8070d
Merge "Use touch delegate in SwitchBar" into pi-dev am: 76f24ebbaf
...
am: 7488609a99
Change-Id: I9b4b39b64d3b0d0d67302c36bae19b8a45f7651d
2018-03-31 09:07:32 +00:00
Tracy Zhou
5d538ca257
Merge "Update screen pinning instructions for QuickStep." into pi-dev am: ef440bd313
...
am: e25fe8e3bf
Change-Id: Iafc0b77cc1ba7b6e664beb98d0f116d2542e5fe0
2018-03-31 09:03:20 +00:00
Fan Zhang
a163b89a60
Merge "Remove FingerprintManagerWrapper" into pi-dev am: d12d8be502
...
am: 1cc21311ba
Change-Id: Idbf2d8ac48cad365c244e4528c7351f2d385002c
2018-03-31 08:57:54 +00:00
Fan Zhang
a89f53ae32
Merge changes from topic "remove_wrappers" into pi-dev am: e6a18f8105
...
am: c04dcd01c1
Change-Id: I14e92ac2141c08bb22bd6d88f7159967f60f144c
2018-03-31 07:47:30 +00:00
Fan Zhang
564bf11ece
Merge "Update wi-fi hotspot min length of summary to 2" into pi-dev am: 8608f6b000
...
am: 0dda026432
Change-Id: Ic4ab7959061fce5040ae824d0de71cc75002ad45
2018-03-31 07:46:40 +00:00
Sean Stout
b271fdc134
Merge "Improve Night Light suggestion criterion" into pi-dev am: 981569f530
...
am: eabb4b523b
Change-Id: I4d3fba69a720451dd7e19d56dd3cff8749b0be9f
2018-03-31 07:45:46 +00:00
Fan Zhang
4e21eb78d5
Merge "Remove wrapper class for AutofillManager in Settings" into pi-dev am: e33ff4e97c
...
am: 57df7c2c59
Change-Id: If736611ced421e396408de5ab575bdad58e8def1
2018-03-31 07:45:06 +00:00
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
Ryan Lin
a56e1283f3
Merge "Add callback onProfileAudioStateChanged()" into pi-dev
...
am: 388907d136
Change-Id: I424368815e312c90a2c6427976ac895e1ed3f0eb
2018-03-31 06:40:42 +00:00
Ryan Lin
388907d136
Merge "Add callback onProfileAudioStateChanged()" into pi-dev
2018-03-31 06:23:26 +00:00
TreeHugger Robot
94bc86c12a
Merge "Use colorPrimary for EntityHeader's background."
2018-03-31 06:15:37 +00:00
HJ ChangLiao
64b0fbf89e
Merge "Wake notifications to TogglePreferenceController" into pi-dev
...
am: 3173e9d103
Change-Id: Iae79df1337ec924937ce6f704f927d455451f58d
2018-03-31 05:28:49 +00:00
Bill Yi
77c816b4fa
[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev
...
am: 830011bf33
-s ours
Change-Id: Id60b3aa35c3fd4c6b3444870361d34b2527a518c
2018-03-31 05:17:02 +00:00
TreeHugger Robot
3173e9d103
Merge "Wake notifications to TogglePreferenceController" into pi-dev
2018-03-31 05:15:28 +00:00
Fan Zhang
c9827b4918
Remove wrappers
...
Bug: 76167422
Test: robotests
Change-Id: Ic673fa2aa815b84da4b522dab85aacbeab6e39ec
2018-03-30 22:05:19 -07:00
Phil Weaver
7488609a99
Merge "Use touch delegate in SwitchBar" into pi-dev
...
am: 76f24ebbaf
Change-Id: Ib560079c43fc4c0297ba94aa7a2a676da68f49cc
2018-03-31 04:33:15 +00:00
Tracy Zhou
e25fe8e3bf
Merge "Update screen pinning instructions for QuickStep." into pi-dev
...
am: ef440bd313
Change-Id: I098e8f3981a045e31568091dcd24d9b5d74612e8
2018-03-31 04:30:16 +00:00