Edgar Wang
|
557419a2e5
|
Merge "Revert "Improve multi user settings screen"" into rvc-dev am: e13919cf4b am: 99bb5e0185 am: 18c5aee365
Change-Id: I2a784c8981977082292394a48d3fd5b5fc4ee819
|
2020-05-07 10:12:03 +00:00 |
|
Edgar Wang
|
043510b53f
|
Merge "Revert "Improve multi user settings screen"" into rvc-dev am: e13919cf4b am: bbf642d994 am: b846480e48
Change-Id: I7ec6480599679d5f69f401f652647e25e7021215
|
2020-05-07 10:11:43 +00:00 |
|
Edgar Wang
|
18c5aee365
|
Merge "Revert "Improve multi user settings screen"" into rvc-dev am: e13919cf4b am: 99bb5e0185
Change-Id: Idb7b50a53dd55ad5d8e414ecce1c4f95c0314020
|
2020-05-07 09:58:47 +00:00 |
|
Edgar Wang
|
8dae9e21f5
|
Merge "Revert "Improve multi user settings screen"" into rvc-dev am: e13919cf4b am: 99bb5e0185
Change-Id: I9d2ad36e4fac1a89fba6e8f87811146f90b7cce3
|
2020-05-07 09:58:47 +00:00 |
|
Edgar Wang
|
b846480e48
|
Merge "Revert "Improve multi user settings screen"" into rvc-dev am: e13919cf4b am: bbf642d994
Change-Id: I21074e3587dd21ca9b4105f4023d54a7f7d39588
|
2020-05-07 09:56:51 +00:00 |
|
Edgar Wang
|
bbf642d994
|
Merge "Revert "Improve multi user settings screen"" into rvc-dev am: e13919cf4b
Change-Id: I057a3f120e9664fd4764599e14b6d136da56da85
|
2020-05-07 09:45:37 +00:00 |
|
Edgar Wang
|
99bb5e0185
|
Merge "Revert "Improve multi user settings screen"" into rvc-dev am: e13919cf4b
Change-Id: I7e067881864b96e067d2b763dc41d6b3680750df
|
2020-05-07 09:45:16 +00:00 |
|
Edgar Wang
|
e13919cf4b
|
Merge "Revert "Improve multi user settings screen"" into rvc-dev
|
2020-05-07 09:28:23 +00:00 |
|
Edgar Wang
|
fff8c56de2
|
Revert "Improve multi user settings screen"
This reverts commit d19dc306dd.
Reason for revert: this CL made Settings the test cases called shadowUserManager.hasUserRestriction()
https://sponge.corp.google.com/target?show=FAILED&sortBy=STATUS&id=07150153-ccb7-4215-a9f8-eed31e44c66f&target=RunSettingsRoboTests1-test-output
Bug: 142798722
Change-Id: I3937a07ee35a472cadd6db8cd0177e08e63516a4
|
2020-05-07 09:24:47 +00:00 |
|
Yanting Yang
|
96f0da1720
|
Merge "Hide the app details preference for mainline module apps" into rvc-dev am: cf33b4bc5e am: 2b19585228 am: e21b7063fc am: b027c56c7c am: 390dfba43b
Change-Id: I179c49d978f93c2f5d0194c5649c87e01a968c0a
|
2020-05-07 09:23:33 +00:00 |
|
Bonian Chen
|
b74cfa9c07
|
Merge "[Settings] Update EID in background" into rvc-dev am: cae9a9c2fb am: 156ea15bb2 am: a166ff6b73 am: 1982d8cd2e am: 098312611e
Change-Id: Ifaf99ef57089ac43ed8c2c4f5c9952cc31fb7149
|
2020-05-07 09:23:26 +00:00 |
|
Yanting Yang
|
bf7a46e08f
|
Merge "Hide the app details preference for mainline module apps" into rvc-dev am: cf33b4bc5e am: 4b6408bf04 am: fb88f919b8 am: 67f47ecdd2 am: 697ba0b97a
Change-Id: I22a9970faf5b103061b89e633dbcc29c36dcb2cb
|
2020-05-07 09:23:08 +00:00 |
|
Bonian Chen
|
4647ba0d3a
|
Merge "[Settings] Update EID in background" into rvc-dev am: cae9a9c2fb am: e99b4cd4d2 am: 0f474e2222 am: 966f979ad2 am: 8cf5ce0dd4
Change-Id: I72e3fa57211dc2ec3dbad7525d96c8332003566c
|
2020-05-07 09:22:57 +00:00 |
|
Yanting Yang
|
994234d268
|
Merge "Hide the app details preference for mainline module apps" into rvc-dev am: cf33b4bc5e am: 2b19585228 am: 1b31829303 am: f37203cd17 am: b9835b33cd
Change-Id: I251f546ed8e893de368457931ab65681f8823e25
|
2020-05-07 09:22:37 +00:00 |
|
Bonian Chen
|
a286accaed
|
Merge "[Settings] Update EID in background" into rvc-dev am: cae9a9c2fb am: 156ea15bb2 am: a3409e66df am: 1e79e1d398 am: 5d856c1cfd
Change-Id: Id2a52c78e828db89b8fa0267bddb50f74790b8bb
|
2020-05-07 09:21:16 +00:00 |
|
Peter_Liang
|
a2f5497d69
|
Correct the string relate to volume shortcut keys.
Bug: 155948561
Test: manual test
Change-Id: I1e7a78fd1feeb87ee5f82157906137c4e169edeb
|
2020-05-07 17:15:15 +08:00 |
|
Yanting Yang
|
390dfba43b
|
Merge "Hide the app details preference for mainline module apps" into rvc-dev am: cf33b4bc5e am: 2b19585228 am: e21b7063fc am: b027c56c7c
Change-Id: I1124eb75fae11cfb912288407f993ee1e898ac22
|
2020-05-07 09:07:49 +00:00 |
|
Bonian Chen
|
098312611e
|
Merge "[Settings] Update EID in background" into rvc-dev am: cae9a9c2fb am: 156ea15bb2 am: a166ff6b73 am: 1982d8cd2e
Change-Id: I97a82903aef9312f29594e5d71d6968b1ead4d44
|
2020-05-07 09:07:30 +00:00 |
|
Yanting Yang
|
697ba0b97a
|
Merge "Hide the app details preference for mainline module apps" into rvc-dev am: cf33b4bc5e am: 4b6408bf04 am: fb88f919b8 am: 67f47ecdd2
Change-Id: I8496bc8f70c517aca10442ab831ca4ff07e0309e
|
2020-05-07 09:07:03 +00:00 |
|
Bonian Chen
|
8cf5ce0dd4
|
Merge "[Settings] Update EID in background" into rvc-dev am: cae9a9c2fb am: e99b4cd4d2 am: 0f474e2222 am: 966f979ad2
Change-Id: I6dc0b07bd71ffac2320bb8aee405fb2566b60cec
|
2020-05-07 09:06:53 +00:00 |
|
Yanting Yang
|
b9835b33cd
|
Merge "Hide the app details preference for mainline module apps" into rvc-dev am: cf33b4bc5e am: 2b19585228 am: 1b31829303 am: f37203cd17
Change-Id: Id2ce67830253759790269b87a804157c0f2873dc
|
2020-05-07 09:06:21 +00:00 |
|
Bonian Chen
|
5d856c1cfd
|
Merge "[Settings] Update EID in background" into rvc-dev am: cae9a9c2fb am: 156ea15bb2 am: a3409e66df am: 1e79e1d398
Change-Id: I2dde3ff7933a9aa466598e58d9ef2d628cefc250
|
2020-05-07 09:03:09 +00:00 |
|
Automerger Merge Worker
|
643d36e6bb
|
Merge "Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev am: 56cefaf3d6 am: 637a3ba98f am: 73148ca2c4" into rvc-qpr-dev-plus-aosp am: 0c415cc0f0 am: a6c8e5250d
Change-Id: I884a5a66f394b8b205babf131462502eda1ccc6f
|
2020-05-07 08:57:06 +00:00 |
|
Kevin Maurin
|
2bd835fbc2
|
Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev am: 56cefaf3d6 am: 3399305e3c am: c7e965084f am: 034a5110a4 am: a2d957242d
Change-Id: I49d2930431289339d83bd6727e597a68d263f294
|
2020-05-07 08:56:59 +00:00 |
|
Automerger Merge Worker
|
5b22ce17d2
|
Merge "Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: ee755aa059 am: 0bfc77b409" into rvc-qpr-dev-plus-aosp am: 12b02c1d47 am: 52f5cc5c83
Change-Id: I10cecf2c4d584804367e98523e7244295f9ceb75
|
2020-05-07 08:56:52 +00:00 |
|
Automerger Merge Worker
|
cd37c42f66
|
Merge "Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: a46c391290" into rvc-d1-dev-plus-aosp am: 1da1e1ffd2 am: 9b09e9877f am: abeab29c5c
Change-Id: I7737781e6cf7fd4b71844181f24426f6bf7d7b1a
|
2020-05-07 08:56:45 +00:00 |
|
Yanting Yang
|
b027c56c7c
|
Merge "Hide the app details preference for mainline module apps" into rvc-dev am: cf33b4bc5e am: 2b19585228 am: e21b7063fc
Change-Id: If6d27b88a51491f4d3ab03e04efdc4b0e1f85547
|
2020-05-07 08:56:39 +00:00 |
|
Kevin Maurin
|
dd157c2871
|
Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev am: 56cefaf3d6 am: 637a3ba98f am: b890ed1585 am: 2702c9854c am: 633986bade
Change-Id: I1f1b2df340f5f26cd9a60e490d35941778f1c5b6
|
2020-05-07 08:56:38 +00:00 |
|
TreeHugger Robot
|
0f3851d348
|
Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: ee755aa059 am: e2db16a44d am: e3ac2ebb4c am: d3db94ab0e
Change-Id: I5edbca43778530e08deb97046fab60633b34c46e
|
2020-05-07 08:56:31 +00:00 |
|
Bonian Chen
|
1982d8cd2e
|
Merge "[Settings] Update EID in background" into rvc-dev am: cae9a9c2fb am: 156ea15bb2 am: a166ff6b73
Change-Id: Ic9f6620297d2a2247005af80644a650e51176ac0
|
2020-05-07 08:56:30 +00:00 |
|
Yanting Yang
|
67f47ecdd2
|
Merge "Hide the app details preference for mainline module apps" into rvc-dev am: cf33b4bc5e am: 4b6408bf04 am: fb88f919b8
Change-Id: I1c9c5cd25fc5a26f6f17c8cbeb6d5737650c4311
|
2020-05-07 08:52:22 +00:00 |
|
Bonian Chen
|
966f979ad2
|
Merge "[Settings] Update EID in background" into rvc-dev am: cae9a9c2fb am: e99b4cd4d2 am: 0f474e2222
Change-Id: I1a5065481d8fd00fbe39a9e8f038f3b02450f5c3
|
2020-05-07 08:52:15 +00:00 |
|
Yanting Yang
|
f37203cd17
|
Merge "Hide the app details preference for mainline module apps" into rvc-dev am: cf33b4bc5e am: 2b19585228 am: 1b31829303
Change-Id: I4273c0b03f665d9485434218b5dcababc4a330ff
|
2020-05-07 08:51:58 +00:00 |
|
Bonian Chen
|
1e79e1d398
|
Merge "[Settings] Update EID in background" into rvc-dev am: cae9a9c2fb am: 156ea15bb2 am: a3409e66df
Change-Id: I627b530b4842d16b36e9f9dcdd949787f41d0a5a
|
2020-05-07 08:51:51 +00:00 |
|
Yanting Yang
|
e21b7063fc
|
Merge "Hide the app details preference for mainline module apps" into rvc-dev am: cf33b4bc5e am: 2b19585228
Change-Id: I9b50f440820bde3b3237dc133695026becbdbd74
|
2020-05-07 08:51:07 +00:00 |
|
Yanting Yang
|
fb88f919b8
|
Merge "Hide the app details preference for mainline module apps" into rvc-dev am: cf33b4bc5e am: 4b6408bf04
Change-Id: I3ffcb98ff0fe24d4514dcacaf17522d1b14ddf62
|
2020-05-07 08:51:07 +00:00 |
|
Bonian Chen
|
a166ff6b73
|
Merge "[Settings] Update EID in background" into rvc-dev am: cae9a9c2fb am: 156ea15bb2
Change-Id: Icc920238f99af9c247235132decf6c566d2e1854
|
2020-05-07 08:51:00 +00:00 |
|
Bonian Chen
|
0f474e2222
|
Merge "[Settings] Update EID in background" into rvc-dev am: cae9a9c2fb am: e99b4cd4d2
Change-Id: I2732ab500cc07017c69ed6bb71972bbe1a109e48
|
2020-05-07 08:50:59 +00:00 |
|
Yanting Yang
|
1b31829303
|
Merge "Hide the app details preference for mainline module apps" into rvc-dev am: cf33b4bc5e am: 2b19585228
Change-Id: I81df0d9ae0569ac1833364cdd855b485c83c0454
|
2020-05-07 08:50:49 +00:00 |
|
Bonian Chen
|
a3409e66df
|
Merge "[Settings] Update EID in background" into rvc-dev am: cae9a9c2fb am: 156ea15bb2
Change-Id: Ief6c86ab582be7b4c912cb4d8fdbd366ae1f3afb
|
2020-05-07 08:50:42 +00:00 |
|
Automerger Merge Worker
|
a6c8e5250d
|
Merge "Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev am: 56cefaf3d6 am: 637a3ba98f am: 73148ca2c4" into rvc-qpr-dev-plus-aosp am: 0c415cc0f0
Change-Id: I90ea2f366c8e8f30763fdc33c0e7ba0510ea24d0
|
2020-05-07 08:45:22 +00:00 |
|
Kevin Maurin
|
a2d957242d
|
Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev am: 56cefaf3d6 am: 3399305e3c am: c7e965084f am: 034a5110a4
Change-Id: Ibd6dd5c5cf70a06f520fa26b52e18047fb1a9a52
|
2020-05-07 08:45:13 +00:00 |
|
Automerger Merge Worker
|
52f5cc5c83
|
Merge "Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: ee755aa059 am: 0bfc77b409" into rvc-qpr-dev-plus-aosp am: 12b02c1d47
Change-Id: I8ea26c1df0619211ff15be0a8d842bce7baa1fba
|
2020-05-07 08:45:07 +00:00 |
|
Automerger Merge Worker
|
abeab29c5c
|
Merge "Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: a46c391290" into rvc-d1-dev-plus-aosp am: 1da1e1ffd2 am: 9b09e9877f
Change-Id: I73e1fcd39dcbb71196ed0feca39ee989ef296cdb
|
2020-05-07 08:44:59 +00:00 |
|
Yanting Yang
|
2b19585228
|
Merge "Hide the app details preference for mainline module apps" into rvc-dev am: cf33b4bc5e
Change-Id: I286857cb2b2f65581e23d5abc4eb970004db324e
|
2020-05-07 08:44:54 +00:00 |
|
Yanting Yang
|
4b6408bf04
|
Merge "Hide the app details preference for mainline module apps" into rvc-dev am: cf33b4bc5e
Change-Id: I421103706198203fb7e25aff4a380c0b0ede8df7
|
2020-05-07 08:44:51 +00:00 |
|
Kevin Maurin
|
633986bade
|
Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev am: 56cefaf3d6 am: 637a3ba98f am: b890ed1585 am: 2702c9854c
Change-Id: I8df5851f3d845c16207dc7dccdbac8e2a59b54bc
|
2020-05-07 08:44:51 +00:00 |
|
TreeHugger Robot
|
d3db94ab0e
|
Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: ee755aa059 am: e2db16a44d am: e3ac2ebb4c
Change-Id: Id3cdd5772a23470f506a790f1e2cc264f4ee7f1d
|
2020-05-07 08:44:32 +00:00 |
|
Yanting Yang
|
cf33b4bc5e
|
Merge "Hide the app details preference for mainline module apps" into rvc-dev
|
2020-05-07 08:41:39 +00:00 |
|
Bonian Chen
|
e99b4cd4d2
|
Merge "[Settings] Update EID in background" into rvc-dev am: cae9a9c2fb
Change-Id: I57d9f61803f827ff6dda7b9719a58cdb8df65981
|
2020-05-07 08:32:57 +00:00 |
|