Commit Graph

66401 Commits

Author SHA1 Message Date
Fabian Kozynski
8d36410fa5 Merge "Fix default for CONTROLS_ENABLED" into rvc-dev am: 64097cbb11 am: 0533f91da7 am: 0f6205e51c
Change-Id: I6dce02773b2312f6a17671f98b37387bbf6d7aec
2020-05-07 14:15:55 +00:00
Fabian Kozynski
0f6205e51c Merge "Fix default for CONTROLS_ENABLED" into rvc-dev am: 64097cbb11 am: 0533f91da7
Change-Id: I5a69a7e8bdb173d1ec05cf3827a2218f95af0932
2020-05-07 13:51:44 +00:00
Fabian Kozynski
0533f91da7 Merge "Fix default for CONTROLS_ENABLED" into rvc-dev am: 64097cbb11
Change-Id: I4b18c2f17907a565578e1c1f92f7cf5247a662d7
2020-05-07 13:37:47 +00:00
Fabian Kozynski
64097cbb11 Merge "Fix default for CONTROLS_ENABLED" into rvc-dev 2020-05-07 13:24:04 +00:00
PETER LIANG
e2a93193c1 Merge "Revises the strings to meet the the activity-based accessibility feature." into rvc-dev am: 19319b85e9 am: 331dee0d24 am: f1a24c88d8
Change-Id: I88d92cc4c827e1016aa59ca7806b087225a495e4
2020-05-07 11:37:23 +00:00
PETER LIANG
b782fbd119 Merge "Correct the string relate to volume shortcut keys." into rvc-dev am: 6804573968 am: 7c73bbf233 am: 60c39c39cd
Change-Id: I89a3bbd8115108142878b794b7340894789b68c7
2020-05-07 11:37:16 +00:00
PETER LIANG
ba31b8e434 Merge "Revises the strings to meet the the activity-based accessibility feature." into rvc-dev am: 19319b85e9 am: c294b38a30 am: de66d77608
Change-Id: I20ec4fa201fff2cefb1bae9544c77adfff391827
2020-05-07 11:37:04 +00:00
Automerger Merge Worker
e8fae83dca Merge "Merge "Correct the string relate to volume shortcut keys." into rvc-dev am: 6804573968 am: 4c10589d13" into rvc-d1-dev-plus-aosp am: f8ec504981
Change-Id: Ic78897ad589be31ab7f882d355780e2d9453d387
2020-05-07 11:36:58 +00:00
PETER LIANG
84b47b56ab Merge "Revises the strings to meet the the activity-based accessibility feature." into rvc-dev am: 19319b85e9 am: 331dee0d24 am: 48e3a68b08
Change-Id: I4518e1ca86d8d8ee5dfe1817cfe5f56abf91659b
2020-05-07 11:36:51 +00:00
PETER LIANG
ad03453841 Merge "Correct the string relate to volume shortcut keys." into rvc-dev am: 6804573968 am: 7c73bbf233 am: 059f2080e3
Change-Id: If6c496969fb0d24fed653646972aced21454587f
2020-05-07 11:36:43 +00:00
PETER LIANG
f1a24c88d8 Merge "Revises the strings to meet the the activity-based accessibility feature." into rvc-dev am: 19319b85e9 am: 331dee0d24
Change-Id: I046f8a847d99471e29247669c1ebccc19e5386e8
2020-05-07 11:26:29 +00:00
PETER LIANG
de66d77608 Merge "Revises the strings to meet the the activity-based accessibility feature." into rvc-dev am: 19319b85e9 am: c294b38a30
Change-Id: Iae0d01472e83642719c086e286f30c42babfed06
2020-05-07 11:26:27 +00:00
PETER LIANG
60c39c39cd Merge "Correct the string relate to volume shortcut keys." into rvc-dev am: 6804573968 am: 7c73bbf233
Change-Id: Id26431c7787387c51b20ac09bce3c2bd0b1201c3
2020-05-07 11:26:22 +00:00
Automerger Merge Worker
f8ec504981 Merge "Merge "Correct the string relate to volume shortcut keys." into rvc-dev am: 6804573968 am: 4c10589d13" into rvc-d1-dev-plus-aosp 2020-05-07 11:26:17 +00:00
PETER LIANG
eccc3032ee Merge "Correct the string relate to volume shortcut keys." into rvc-dev am: 6804573968 am: 4c10589d13
Change-Id: I2ec060e1632bfbfd01c88613e072a8afc27ce98f
2020-05-07 11:26:13 +00:00
PETER LIANG
48e3a68b08 Merge "Revises the strings to meet the the activity-based accessibility feature." into rvc-dev am: 19319b85e9 am: 331dee0d24
Change-Id: Iceeaf78b68306e5fb7064ab7e32528b0b762e01c
2020-05-07 11:26:10 +00:00
PETER LIANG
059f2080e3 Merge "Correct the string relate to volume shortcut keys." into rvc-dev am: 6804573968 am: 7c73bbf233
Change-Id: I2343bab76fd8182835c3710f053426a8fe3b11aa
2020-05-07 11:26:02 +00:00
PETER LIANG
c294b38a30 Merge "Revises the strings to meet the the activity-based accessibility feature." into rvc-dev am: 19319b85e9
Change-Id: I64a59f952ca883860f59ac491dbadb51c697a608
2020-05-07 11:12:37 +00:00
PETER LIANG
331dee0d24 Merge "Revises the strings to meet the the activity-based accessibility feature." into rvc-dev am: 19319b85e9
Change-Id: I465766f88936723b9808795a2c05c2c23e0a5361
2020-05-07 11:12:32 +00:00
PETER LIANG
4c10589d13 Merge "Correct the string relate to volume shortcut keys." into rvc-dev am: 6804573968
Change-Id: I4f3f3cf8341f2181c7c240706b151a379d30d538
2020-05-07 11:12:29 +00:00
PETER LIANG
7c73bbf233 Merge "Correct the string relate to volume shortcut keys." into rvc-dev am: 6804573968
Change-Id: I358ff0b5fac119231eed0aa2386e982ab4b38779
2020-05-07 11:12:07 +00:00
PETER LIANG
19319b85e9 Merge "Revises the strings to meet the the activity-based accessibility feature." into rvc-dev 2020-05-07 10:57:14 +00:00
PETER LIANG
6804573968 Merge "Correct the string relate to volume shortcut keys." into rvc-dev 2020-05-07 10:56:24 +00:00
Edgar Wang
ead1ce514d Merge "Revert "Improve multi user settings screen"" into rvc-dev am: e13919cf4b am: 99bb5e0185 am: 8dae9e21f5
Change-Id: Ia2a5623a66ce6cc2cdcaa096fe6d7fd95da7ca4d
2020-05-07 10:14:03 +00:00
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
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
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
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
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
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