Commit Graph

68498 Commits

Author SHA1 Message Date
András Klöczl
2718b93da7 Merge "Improve multi user settings screen" into rvc-dev am: 509ae917a4
Change-Id: I360bc2788c1865924438ba56084ac59a81f5ea1e
2020-05-05 17:43:37 +00:00
András Klöczl
509ae917a4 Merge "Improve multi user settings screen" into rvc-dev 2020-05-05 17:27:42 +00:00
Bonian Chen
52d2f6762a Merge "[Settings] Code refactor" into rvc-dev am: 1de5f2e799 am: 646b02e4d6 am: 464179cee9 am: ded2226c0d
Change-Id: Ibe11c2b3ee5de070a9fd1c339b73d16e0e4e3e7c
2020-05-05 17:05:51 +00:00
Automerger Merge Worker
fcb0262b00 Merge "Merge "[Settings] Code refactor" into rvc-dev am: 1de5f2e799 am: 646b02e4d6 am: 666c880630" into rvc-qpr-dev-plus-aosp am: 7ef654fb30
Change-Id: I648330191bb2adf67eaab3c2fc2129aa7fc7eee8
2020-05-05 17:05:43 +00:00
Bonian Chen
8b2f508fd4 Merge "[Settings] Code refactor" into rvc-dev am: 1de5f2e799 am: 441d085d94 am: 2be95c9322 am: c672c89963
Change-Id: I2d3f16a1808a45d8a171dbc422ea78eafb8df36c
2020-05-05 17:05:10 +00:00
Bill Yi
58957af851 Merge android10-qpr2-s3-release to aosp/master - DO NOT MERGE
Merged-In: I1da09579d5ce7b2c67b4a7db381c779a5c5ccb6b
Change-Id: Ifdb33d0e12e1a487f694c37e3e99f87af06b6b74
2020-05-05 17:02:32 +00:00
Bonian Chen
ded2226c0d Merge "[Settings] Code refactor" into rvc-dev am: 1de5f2e799 am: 646b02e4d6 am: 464179cee9
Change-Id: I41b2cb6f8e139ae3d422f9dff0891f508d2646d5
2020-05-05 16:45:59 +00:00
Automerger Merge Worker
7ef654fb30 Merge "Merge "[Settings] Code refactor" into rvc-dev am: 1de5f2e799 am: 646b02e4d6 am: 666c880630" into rvc-qpr-dev-plus-aosp 2020-05-05 16:45:05 +00:00
Bonian Chen
30236afb44 Merge "[Settings] Code refactor" into rvc-dev am: 1de5f2e799 am: 646b02e4d6 am: 666c880630
Change-Id: Ia2e07d65039445c46dcd197308f7d495d1ef2b98
2020-05-05 16:44:59 +00:00
Bonian Chen
c672c89963 Merge "[Settings] Code refactor" into rvc-dev am: 1de5f2e799 am: 441d085d94 am: 2be95c9322
Change-Id: Id0bef6b00eff8378bbc8f83dafb3418e9988293d
2020-05-05 16:44:57 +00:00
Bonian Chen
464179cee9 Merge "[Settings] Code refactor" into rvc-dev am: 1de5f2e799 am: 646b02e4d6
Change-Id: I43973671bc9f81e6bc82537b53498c959c983300
2020-05-05 16:28:46 +00:00
Bonian Chen
2be95c9322 Merge "[Settings] Code refactor" into rvc-dev am: 1de5f2e799 am: 441d085d94
Change-Id: I26022c264454ee6bf961a25bc8d3021dccc218c0
2020-05-05 16:28:29 +00:00
Bonian Chen
666c880630 Merge "[Settings] Code refactor" into rvc-dev am: 1de5f2e799 am: 646b02e4d6
Change-Id: I24fa8d90c6a9badae480f4817b81cf528f3c9ee2
2020-05-05 16:28:24 +00:00
Bonian Chen
646b02e4d6 Merge "[Settings] Code refactor" into rvc-dev am: 1de5f2e799
Change-Id: Icd6e9fd789f1ce9031d3171e238411e8978884c0
2020-05-05 16:12:52 +00:00
Bonian Chen
441d085d94 Merge "[Settings] Code refactor" into rvc-dev am: 1de5f2e799
Change-Id: I0e5602e0ad69b980cde0de231d30bb77595637d6
2020-05-05 16:12:38 +00:00
Bonian Chen
1de5f2e799 Merge "[Settings] Code refactor" into rvc-dev 2020-05-05 15:45:13 +00:00
TreeHugger Robot
f0d93c4b33 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 47883ee75d -s ours am: 4e64839ae5 -s ours am: 9d2174ce96 -s ours am: 0009ae6f64 -s ours am: b9c15a09be -s ours
am skip reason: subject contains skip directive

Change-Id: I0ffc74a59d902843501dc58b137a83bdefa36123
2020-05-05 15:24:57 +00:00
TreeHugger Robot
f767149b98 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 5c956f5b3c -s ours am: 7dc92e1f5e -s ours am: 82b1b91239 -s ours am: d0b9a29bf6 -s ours am: 22ac8cadb1 -s ours
am skip reason: subject contains skip directive

Change-Id: Id9d16522b8de89cf992b22a27c84ffd37b3e2ff1
2020-05-05 15:24:31 +00:00
TreeHugger Robot
b9c15a09be [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 47883ee75d -s ours am: 4e64839ae5 -s ours am: 9d2174ce96 -s ours am: 0009ae6f64 -s ours
am skip reason: subject contains skip directive

Change-Id: Id2430e9212a6958f9e1895e6a9a7f011337b0e07
2020-05-05 15:06:21 +00:00
TreeHugger Robot
22ac8cadb1 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 5c956f5b3c -s ours am: 7dc92e1f5e -s ours am: 82b1b91239 -s ours am: d0b9a29bf6 -s ours
am skip reason: subject contains skip directive

Change-Id: I07379f85af737b280800806dabd8dcb7df4272f3
2020-05-05 15:06:13 +00:00
TreeHugger Robot
b04b20d4eb [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 47883ee75d -s ours am: fedb9cff53 -s ours am: 2feb180858 -s ours am: bade566512 -s ours
am skip reason: subject contains skip directive

Change-Id: If07ae300d964f72f3fcf2daf142faf483d5995db
2020-05-05 15:02:05 +00:00
TreeHugger Robot
2320ae098c [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 5c956f5b3c -s ours am: 56796cca75 -s ours am: 496b6483f3 -s ours am: 7b5843a29e -s ours
am skip reason: subject contains skip directive

Change-Id: I1381f6f23e731171fe1a1aee04b93e03cbff3230
2020-05-05 15:01:58 +00:00
TreeHugger Robot
5f1381f441 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 47883ee75d -s ours am: 4e64839ae5 -s ours am: 0172a6a90a -s ours am: afe46789c2 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia54e34753f3ced0bbfeaa9e636b2942948334e45
2020-05-05 15:01:51 +00:00
TreeHugger Robot
f573d3da52 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 5c956f5b3c -s ours am: 7dc92e1f5e -s ours am: cd4288a32d -s ours am: dfa289d9fd -s ours
am skip reason: subject contains skip directive

Change-Id: I0ca046a4dd5a3ca55eddf3c816b37e64b053765b
2020-05-05 15:01:34 +00:00
TreeHugger Robot
0009ae6f64 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 47883ee75d -s ours am: 4e64839ae5 -s ours am: 9d2174ce96 -s ours
am skip reason: subject contains skip directive

Change-Id: I4d065b39cff12bedefbfe9bbece596fdcd429ac8
2020-05-05 14:53:33 +00:00
TreeHugger Robot
d0b9a29bf6 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 5c956f5b3c -s ours am: 7dc92e1f5e -s ours am: 82b1b91239 -s ours
am skip reason: subject contains skip directive

Change-Id: I498fb5912acb972d5d3f3660cfab5572fd3749df
2020-05-05 14:53:25 +00:00
TreeHugger Robot
bade566512 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 47883ee75d -s ours am: fedb9cff53 -s ours am: 2feb180858 -s ours
am skip reason: subject contains skip directive

Change-Id: I4552fc95e52617263444baf37bdd7faade75a902
2020-05-05 14:46:28 +00:00
TreeHugger Robot
7b5843a29e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 5c956f5b3c -s ours am: 56796cca75 -s ours am: 496b6483f3 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia40d9fbb6e49d76fb611a664af07d3c2b46fffe5
2020-05-05 14:45:51 +00:00
TreeHugger Robot
afe46789c2 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 47883ee75d -s ours am: 4e64839ae5 -s ours am: 0172a6a90a -s ours
am skip reason: subject contains skip directive

Change-Id: I88a2f9bc83ada2038b4c44de6bc599b03c8415eb
2020-05-05 14:45:33 +00:00
TreeHugger Robot
dfa289d9fd [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 5c956f5b3c -s ours am: 7dc92e1f5e -s ours am: cd4288a32d -s ours
am skip reason: subject contains skip directive

Change-Id: I2c8047d99e247e917e856b1e0e40ce1afb2923f7
2020-05-05 14:45:22 +00:00
TreeHugger Robot
2feb180858 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 47883ee75d -s ours am: fedb9cff53 -s ours
am skip reason: subject contains skip directive

Change-Id: I683b96a1502c92690e4ed6173da294dbaacabc29
2020-05-05 14:35:45 +00:00
TreeHugger Robot
496b6483f3 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 5c956f5b3c -s ours am: 56796cca75 -s ours
am skip reason: subject contains skip directive

Change-Id: I66c2f6ff2b3bd81f18e655b76b536a259a251008
2020-05-05 14:35:34 +00:00
TreeHugger Robot
9d2174ce96 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 47883ee75d -s ours am: 4e64839ae5 -s ours
am skip reason: subject contains skip directive

Change-Id: I85319c9ef96f3ebc8d07cea64727dd04babda43b
2020-05-05 14:34:51 +00:00
TreeHugger Robot
82b1b91239 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 5c956f5b3c -s ours am: 7dc92e1f5e -s ours
am skip reason: subject contains skip directive

Change-Id: Ic258f9b011336f361b90b68964b04414e14a7244
2020-05-05 14:34:43 +00:00
TreeHugger Robot
0172a6a90a [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 47883ee75d -s ours am: 4e64839ae5 -s ours
am skip reason: subject contains skip directive

Change-Id: Ifa8aec900df521f1d420dcca06de4dc413642c8f
2020-05-05 14:34:39 +00:00
TreeHugger Robot
cd4288a32d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 5c956f5b3c -s ours am: 7dc92e1f5e -s ours
am skip reason: subject contains skip directive

Change-Id: I3cbf99226fdf9ec820957553290babb24cf80a77
2020-05-05 14:34:30 +00:00
TreeHugger Robot
fedb9cff53 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 47883ee75d -s ours
am skip reason: subject contains skip directive

Change-Id: I8f2e506dab383f0cb074475ea7856f22d8c6ba09
2020-05-05 14:22:48 +00:00
TreeHugger Robot
4e64839ae5 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 47883ee75d -s ours
am skip reason: subject contains skip directive

Change-Id: Ibff6f24cb2287781a3045ca577150300b5d4736e
2020-05-05 14:22:42 +00:00
TreeHugger Robot
56796cca75 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 5c956f5b3c -s ours
am skip reason: subject contains skip directive

Change-Id: I5c7d6e2437356b2a81e01201787898a407513ef9
2020-05-05 14:22:41 +00:00
TreeHugger Robot
7dc92e1f5e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 5c956f5b3c -s ours
am skip reason: subject contains skip directive

Change-Id: Iecdc1a3e3810e15f85f21e7fa1e7ab54ad713c09
2020-05-05 14:22:10 +00:00
TreeHugger Robot
47883ee75d Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-05-05 14:12:46 +00:00
TreeHugger Robot
5c956f5b3c Merge "Import translations. DO NOT MERGE" into rvc-dev 2020-05-05 14:08:54 +00:00
TreeHugger Robot
b379c45ddb Merge "Replace banner video with static image for Color Inversion." into rvc-dev am: 2e4e4ed1fd am: 3308f6b52d am: 9e327405fd am: 75f919fa7e am: dc93b7a7da
Change-Id: Idce2dac6688d5638159c8eb1d7d482c25141a42a
2020-05-05 14:03:49 +00:00
TreeHugger Robot
2add1ea8df Merge "Replace banner video with static image for Color Inversion." into rvc-dev am: 2e4e4ed1fd am: 80bb9f5bf6 am: d05a30c5d6 am: 79e3df19d7
Change-Id: I70cbbdc1da1c3deefa0552ed6cebd9b3661c72cc
2020-05-05 14:03:33 +00:00
TreeHugger Robot
dc93b7a7da Merge "Replace banner video with static image for Color Inversion." into rvc-dev am: 2e4e4ed1fd am: 3308f6b52d am: 9e327405fd am: 75f919fa7e
Change-Id: I97ad198eb5bcb940e8058ef0b4eea14662102d5c
2020-05-05 14:03:18 +00:00
TreeHugger Robot
dd16153416 Merge "Replace banner video with static image for Color Inversion." into rvc-dev am: 2e4e4ed1fd am: 3308f6b52d am: 04ce41bf31 am: 7369ab018c
Change-Id: Id6488bc6259e44e267ed882674b79f6aa3165746
2020-05-05 14:02:43 +00:00
TreeHugger Robot
79e3df19d7 Merge "Replace banner video with static image for Color Inversion." into rvc-dev am: 2e4e4ed1fd am: 80bb9f5bf6 am: d05a30c5d6
Change-Id: I66beefd53ebc0a401dddf6e7aa1780b0a6a8afb6
2020-05-05 13:43:41 +00:00
TreeHugger Robot
75f919fa7e Merge "Replace banner video with static image for Color Inversion." into rvc-dev am: 2e4e4ed1fd am: 3308f6b52d am: 9e327405fd
Change-Id: I9e58e94520b2bca2adbf5ec72bc171f00af5cd04
2020-05-05 13:43:22 +00:00
TreeHugger Robot
7369ab018c Merge "Replace banner video with static image for Color Inversion." into rvc-dev am: 2e4e4ed1fd am: 3308f6b52d am: 04ce41bf31
Change-Id: I4e6c0f942a3e8ec7f402495e1df7c710aeb6842c
2020-05-05 13:43:21 +00:00
TreeHugger Robot
d05a30c5d6 Merge "Replace banner video with static image for Color Inversion." into rvc-dev am: 2e4e4ed1fd am: 80bb9f5bf6
Change-Id: I3725759dcc981aca3f2176164f35fb29fdca7898
2020-05-05 13:31:20 +00:00