Fabian Kozynski
|
31c4bfd74f
|
Merge "Fix default for CONTROLS_ENABLED" into rvc-dev am: 64097cbb11 am: bb87fb6954
Change-Id: I68c7bcb853fef89c86832a96d4fd9d21b25a311d
|
2020-05-07 13:52:07 +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
|
bb87fb6954
|
Merge "Fix default for CONTROLS_ENABLED" into rvc-dev am: 64097cbb11
Change-Id: Id6f671320798ce5c63eb38afcd8a1d06f34e68d1
|
2020-05-07 13:38:02 +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
|
df294e4f57
|
Merge "Revises the strings to meet the the activity-based accessibility feature." into rvc-dev am: 19319b85e9 am: 331dee0d24 am: f1a24c88d8 am: e2a93193c1
Change-Id: I3b1d0a8b52ed9f4465291de06af8e1e9890e74ba
|
2020-05-07 11:55:26 +00:00 |
|
PETER LIANG
|
55a6627c8d
|
Merge "Correct the string relate to volume shortcut keys." into rvc-dev am: 6804573968 am: 7c73bbf233 am: 60c39c39cd am: b782fbd119
Change-Id: I9c56d58e008c8d9a2d0f46c7aaa2782eee8c24af
|
2020-05-07 11:55:18 +00:00 |
|
PETER LIANG
|
89b01ffc7e
|
Merge "Revises the strings to meet the the activity-based accessibility feature." into rvc-dev am: 19319b85e9 am: c294b38a30 am: de66d77608 am: ba31b8e434
Change-Id: I0e02cd17919cc6f5ad00ebd21c75cdc9c710bcc7
|
2020-05-07 11:54:55 +00:00 |
|
Automerger Merge Worker
|
b9f68db334
|
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 am: e8fae83dca
Change-Id: I9d8f5aaac16a1331422bef28033ade232ab4e224
|
2020-05-07 11:54:24 +00:00 |
|
PETER LIANG
|
c4b7067ac9
|
Merge "Revises the strings to meet the the activity-based accessibility feature." into rvc-dev am: 19319b85e9 am: 331dee0d24 am: 48e3a68b08 am: 84b47b56ab
Change-Id: I3aa299a360cc2f2bccace5c534d12eed39152a4e
|
2020-05-07 11:53:55 +00:00 |
|
PETER LIANG
|
59cc0fe457
|
Merge "Correct the string relate to volume shortcut keys." into rvc-dev am: 6804573968 am: 7c73bbf233 am: 059f2080e3 am: ad03453841
Change-Id: If935b9ec32344f7c3bb55642ca95a6b56dae227c
|
2020-05-07 11:53:27 +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 |
|
Bonian Chen
|
bfdf45e565
|
[Settings] Code reformat
Code reformat.
Bug: 155962136
Test: build pass
Change-Id: Icb56f72af925f2b47cd8867156ca12fc9a6e6347
|
2020-05-07 19:00:58 +08: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
|
47bd0e8c14
|
Merge "Revert "Improve multi user settings screen"" into rvc-dev am: e13919cf4b am: 99bb5e0185 am: 8dae9e21f5 am: ead1ce514d
Change-Id: I141e5db7c5a859dd8a2f8df895cc6c8a51d43e2f
|
2020-05-07 10:29:51 +00:00 |
|
Edgar Wang
|
9ebfa21265
|
Merge "Revert "Improve multi user settings screen"" into rvc-dev am: e13919cf4b am: 99bb5e0185 am: 18c5aee365 am: 557419a2e5
Change-Id: I9bda6086258c8b2ac127935e4e8654a4388b16e3
|
2020-05-07 10:29:36 +00:00 |
|
Edgar Wang
|
214ecd8bd0
|
Merge "Revert "Improve multi user settings screen"" into rvc-dev am: e13919cf4b am: bbf642d994 am: b846480e48 am: 043510b53f
Change-Id: Ic4fa3990c3de69652d989af8769b32b407577c78
|
2020-05-07 10:27:03 +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
|
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 |
|