Commit Graph

59311 Commits

Author SHA1 Message Date
Automerger Merge Worker
942981924c Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 2a428bbe48 am: 52731ec548
Change-Id: I42316ad946e3401e5020e703b636b7905c72e37b
2020-02-27 03:58:58 +00:00
Automerger Merge Worker
e4cc6e2f00 Merge "Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 64f8f95178 am: 853f56ddf6" into rvc-qpr-dev-plus-aosp 2020-02-27 03:58:57 +00:00
Automerger Merge Worker
a896fd8429 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 64f8f95178 am: 853f56ddf6
Change-Id: I6ed4d7580267ce76007f7cbee5ae99a5b468d6b5
2020-02-27 03:58:53 +00:00
Automerger Merge Worker
03bea8f0e0 Merge "Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 64f8f95178" into rvc-d1-dev-plus-aosp am: 79dc71bdfc
Change-Id: Ia03d42cbe12887a0b2689a8bc73edf7dc2593b99
2020-02-27 03:58:52 +00:00
Automerger Merge Worker
aaa31daa76 Merge "Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 3b67e90aa5 am: 5f89cb0f4a" into rvc-qpr-dev-plus-aosp 2020-02-27 03:58:51 +00:00
Automerger Merge Worker
bc830c55a2 Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 3b67e90aa5 am: 5f89cb0f4a
Change-Id: I06302d594db31c5f8457432c4aa151d4102ba03a
2020-02-27 03:58:48 +00:00
Automerger Merge Worker
13d1a1d40a Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 02790d5285 am: 350ce54f14
Change-Id: I846297138778fbd3dd61ed47ff45b5337cbc5d6a
2020-02-27 03:58:45 +00:00
Automerger Merge Worker
ab139d4620 Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 3b67e90aa5 am: a642ed8dba
Change-Id: I5fb737abb49bec78c9bb0cc51895c0313be82ed3
2020-02-27 03:58:30 +00:00
Automerger Merge Worker
52731ec548 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 2a428bbe48
Change-Id: I7527ad64e192cd01ad7f54f1c48b49da5eb9a714
2020-02-27 03:45:33 +00:00
Automerger Merge Worker
853f56ddf6 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 64f8f95178
Change-Id: I689b513ea5145a6eb1736a4db69c8087318537b2
2020-02-27 03:44:27 +00:00
Automerger Merge Worker
79dc71bdfc Merge "Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 64f8f95178" into rvc-d1-dev-plus-aosp 2020-02-27 03:44:26 +00:00
Automerger Merge Worker
5805974b93 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728 am: 64f8f95178
Change-Id: I82cc783d9990e9d16c7ecf2e4511aa0c8824fe56
2020-02-27 03:44:23 +00:00
Automerger Merge Worker
5f89cb0f4a Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 3b67e90aa5
Change-Id: I47601b56b513cd239d4a96cadd9a79d804575421
2020-02-27 03:44:22 +00:00
Automerger Merge Worker
350ce54f14 Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 02790d5285
Change-Id: I2b5d39a38724c8c0df00171c3cd723a705b53940
2020-02-27 03:44:21 +00:00
Automerger Merge Worker
a642ed8dba Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6 am: 3b67e90aa5
Change-Id: I8cb33aed6148d23d59f5757da26c40cbd602242d
2020-02-27 03:44:12 +00:00
Automerger Merge Worker
2a428bbe48 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728
Change-Id: I1a1a8c59a254fea7267dcf1be555573cf8c7c62a
2020-02-27 03:35:21 +00:00
Automerger Merge Worker
64f8f95178 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev am: d20ca89728
Change-Id: Ic9c13f75c7cfc12f6049ed671128f4fc8baa264a
2020-02-27 03:35:00 +00:00
TreeHugger Robot
d20ca89728 Merge "Fixes incorrect settings usages in AdaptiveSleepPreferenceController" into rvc-dev 2020-02-27 03:29:20 +00:00
Automerger Merge Worker
3b67e90aa5 Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6
Change-Id: I57ab4ac108c5bebfaca5a18a0b9400bbd92a1822
2020-02-27 03:26:27 +00:00
Automerger Merge Worker
02790d5285 Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev am: 640245cda6
Change-Id: I833d625652995ee1d8434935772d825e3a5c1a3d
2020-02-27 03:26:19 +00:00
TreeHugger Robot
640245cda6 Merge "[Wi-Fi] Apply new mock for supporting WiFi detail page for OpenRoaming feature." into rvc-dev 2020-02-27 03:15:29 +00:00
Automerger Merge Worker
10a84a365b Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f am: 424965f608 am: dc3a744401
Change-Id: I15f94569b4bca844245501f1f2f6ce0f64c0f5eb
2020-02-27 03:01:38 +00:00
Automerger Merge Worker
e1dc9058fe Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f am: a8e4c9a7f3 am: b89c028b6d
Change-Id: Ia5ff1233bde1170996343f8d916d86cf04f3c89e
2020-02-27 03:00:46 +00:00
Automerger Merge Worker
b91c0a90dc Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f am: a8e4c9a7f3 am: 5d4e63734e
Change-Id: I3f58b9bc451dcd9ec9f0fad32a5b552ddb9bf7ca
2020-02-27 03:00:31 +00:00
Automerger Merge Worker
dc3a744401 Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f am: 424965f608
Change-Id: I728b99f27a051bf55e31145cff26d851c4cc9fe3
2020-02-27 02:45:34 +00:00
Automerger Merge Worker
b89c028b6d Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f am: a8e4c9a7f3
Change-Id: I3c0fb3002cf73110060dbff2d3095eebe08d1362
2020-02-27 02:45:29 +00:00
Automerger Merge Worker
5d4e63734e Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f am: a8e4c9a7f3
Change-Id: Id35bebf502550f06fae410382c63d5267e9edd73
2020-02-27 02:45:22 +00:00
Automerger Merge Worker
424965f608 Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f
Change-Id: Ie5eb8cbdc00528c59bfa9d972de1149dab40477c
2020-02-27 02:29:23 +00:00
Automerger Merge Worker
a8e4c9a7f3 Merge "Launch output switcher with media package information" into rvc-dev am: b6c8fab86f
Change-Id: Ic4244cf0d1a09ec727a0d4b320b7c314d933cc43
2020-02-27 02:29:17 +00:00
Automerger Merge Worker
4ed77a80dd Merge "Increase size of touch target" into rvc-dev am: e28bd9d6d9 am: 63f67ffb1a am: 915900ccdf
Change-Id: I58f65a15c403fc6b9cfc1e4f2e7ee06a52b1191c
2020-02-27 02:20:54 +00:00
Automerger Merge Worker
00f2c88984 Merge "Merge "Increase size of touch target" into rvc-dev am: e28bd9d6d9 am: e58ea87a9d am: ad07d3c7ff" into rvc-qpr-dev-plus-aosp 2020-02-27 02:20:42 +00:00
Automerger Merge Worker
5eab0f2b5c Merge "Increase size of touch target" into rvc-dev am: e28bd9d6d9 am: e58ea87a9d am: ad07d3c7ff
Change-Id: Ibe6b5405a84ef9b91f96a9dc4248f116f0bbf3fb
2020-02-27 02:20:32 +00:00
Automerger Merge Worker
f139ff2e41 Merge "Increase size of touch target" into rvc-dev am: e28bd9d6d9 am: e58ea87a9d am: 56df848fba
Change-Id: I5130f1c8e9c20b8d00155be412bad092e388715a
2020-02-27 02:20:28 +00:00
tim peng
b6c8fab86f Merge "Launch output switcher with media package information" into rvc-dev 2020-02-27 02:18:03 +00:00
Automerger Merge Worker
915900ccdf Merge "Increase size of touch target" into rvc-dev am: e28bd9d6d9 am: 63f67ffb1a
Change-Id: Ib7f349792430c0bf06f720be0656fe3dd5baf820
2020-02-27 02:09:01 +00:00
Automerger Merge Worker
ad07d3c7ff Merge "Increase size of touch target" into rvc-dev am: e28bd9d6d9 am: e58ea87a9d
Change-Id: I3b01f14bdcca8926e367dba553909835d7fd308c
2020-02-27 02:08:45 +00:00
Automerger Merge Worker
56df848fba Merge "Increase size of touch target" into rvc-dev am: e28bd9d6d9 am: e58ea87a9d
Change-Id: I627a586abfecd61434d0ab5191ae7b44d11fe632
2020-02-27 02:08:33 +00:00
Automerger Merge Worker
63f67ffb1a Merge "Increase size of touch target" into rvc-dev am: e28bd9d6d9
Change-Id: I76cfbbc6147fc441d532f43b53b05d0ffd01e1ba
2020-02-27 01:51:16 +00:00
Automerger Merge Worker
e58ea87a9d Merge "Increase size of touch target" into rvc-dev am: e28bd9d6d9
Change-Id: Iff4ea6685a8322161e88dcd2bb851b9059df2f58
2020-02-27 01:51:11 +00:00
TreeHugger Robot
e28bd9d6d9 Merge "Increase size of touch target" into rvc-dev 2020-02-27 01:34:28 +00:00
Automerger Merge Worker
3f7f4bb113 Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751 am: 91715a9b68 am: af7dab44ed
Change-Id: I481b6b898a20d9bdf8d7a73c68acb690c840c19d
2020-02-27 00:24:57 +00:00
Automerger Merge Worker
e99afc99b1 Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751 am: 5145c82a2e am: da81e98492
Change-Id: I8653c681c09efea2adfd6a45544ba81163b80560
2020-02-27 00:18:01 +00:00
Automerger Merge Worker
e5f870cb5b Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751 am: 91715a9b68 am: c980fd89d5
Change-Id: Idedb5fed62a4ac912b6471f7a33ec11363fed7c5
2020-02-27 00:15:07 +00:00
Automerger Merge Worker
af7dab44ed Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751 am: 91715a9b68
Change-Id: I6f654f5c3384c5e155b9d6c0f8e13b33380ec680
2020-02-27 00:03:25 +00:00
Automerger Merge Worker
c980fd89d5 Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751 am: 91715a9b68
Change-Id: Ie728ea640963c065ca38b95d0330143eaeed97a3
2020-02-27 00:00:52 +00:00
Automerger Merge Worker
da81e98492 Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751 am: 5145c82a2e
Change-Id: Icd319494a30181c55bd6221e19814c8c0652dd41
2020-02-27 00:00:06 +00:00
Automerger Merge Worker
91715a9b68 Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751
Change-Id: I7ecc380c7bbf300912a8956fdc985f8ea2112af9
2020-02-26 23:44:14 +00:00
Automerger Merge Worker
5145c82a2e Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev am: 5c69259751
Change-Id: I41d6c5acfac1296fb7500ed4a7e7998847776c16
2020-02-26 23:44:06 +00:00
David Su
5c69259751 Merge "Rename WifiNetworkSuggestion#getPasspointConfiguration" into rvc-dev 2020-02-26 23:42:35 +00:00
Yi Jiang
c68a08fc7c Fixes incorrect settings usages in AdaptiveSleepPreferenceController
Test: manually tested on device
Bug: 139319542
Change-Id: I7b50d75862a678aecea9356253e443f7bded97b2
(cherry picked from commit c0f9424779)
2020-02-26 21:46:38 +00:00