Commit Graph

69601 Commits

Author SHA1 Message Date
jasonwshsu
2282386c99 Change caption summary to get the whole translated string directly.
Bug: 154076977
Test: manual test
Change-Id: I9ddf1d52c1632c203713466dd9cf7b15de018a4d
2020-05-18 00:39:25 +08:00
Alex Kershaw
d3fa045e35 Close Settings page when cross-profile appop is granted
Fixes: 156365481
Test: manual
Change-Id: I9250ef5db0c40a42a25a2dedf84a47d1b1da11f1
2020-05-16 20:33:34 +01:00
PETER LIANG
a111ff6a26 Merge "Add the content description for accessibility tutorial pages." into rvc-dev am: 618ea90bbf am: 41dbddeac3 am: 3bf218e6fc am: 7832a0d715
Change-Id: I984174cf718a84207c54a7dce264c330ac1d5288
2020-05-16 16:27:54 +00:00
PETER LIANG
7832a0d715 Merge "Add the content description for accessibility tutorial pages." into rvc-dev am: 618ea90bbf am: 41dbddeac3 am: 3bf218e6fc
Change-Id: Id6629763e7c5216335ba27ee8f984aba1b4c4113
2020-05-16 16:16:28 +00:00
PETER LIANG
3bf218e6fc Merge "Add the content description for accessibility tutorial pages." into rvc-dev am: 618ea90bbf am: 41dbddeac3
Change-Id: Ia107bd4bbcb5aa66079b9f91f515d4c7b5c1241e
2020-05-16 16:00:47 +00:00
PETER LIANG
41dbddeac3 Merge "Add the content description for accessibility tutorial pages." into rvc-dev am: 618ea90bbf
Change-Id: Icd3d38e30ae5184e23ffd2a7de6371956b80f211
2020-05-16 15:42:42 +00:00
PETER LIANG
618ea90bbf Merge "Add the content description for accessibility tutorial pages." into rvc-dev 2020-05-16 15:26:58 +00:00
Julia Reynolds
123bcc41c9 Merge "Fix jank on conversation screen" into rvc-dev am: 35a839a689 am: 68bac97932 am: 207b456da5 am: 7a1047f75c
Change-Id: If7f23848179ffdf0e944beed328a8db2f95d74ed
2020-05-16 03:40:11 +00:00
Julia Reynolds
7a1047f75c Merge "Fix jank on conversation screen" into rvc-dev am: 35a839a689 am: 68bac97932 am: 207b456da5
Change-Id: I8537a817b72afba56b855154631f6fb267a72536
2020-05-16 03:20:30 +00:00
Julia Reynolds
207b456da5 Merge "Fix jank on conversation screen" into rvc-dev am: 35a839a689 am: 68bac97932
Change-Id: Ia987a204e3da68686487f530197b10b2f459e044
2020-05-16 03:02:06 +00:00
Kevin Chyn
bba38daac3 Merge "Remove dependencies on old BiometricPrompt bundle" 2020-05-16 02:47:00 +00:00
Julia Reynolds
68bac97932 Merge "Fix jank on conversation screen" into rvc-dev am: 35a839a689
Change-Id: I10bbbd88906a0af08babb761366a569b3f2a6f0c
2020-05-16 02:46:56 +00:00
TreeHugger Robot
5993000b7b Merge "Avoid launching activity-based feature to force stop exist actiivty and recreate it." into rvc-dev am: 45910eec3f am: ceb23bb736 am: d89a58f00f am: 9a26cc3405
Change-Id: I288f9d43f76552b1c50744c6834d5bf20a0be41f
2020-05-16 02:32:22 +00:00
Julia Reynolds
35a839a689 Merge "Fix jank on conversation screen" into rvc-dev 2020-05-16 02:30:09 +00:00
TreeHugger Robot
9a26cc3405 Merge "Avoid launching activity-based feature to force stop exist actiivty and recreate it." into rvc-dev am: 45910eec3f am: ceb23bb736 am: d89a58f00f
Change-Id: I5398b95c368f17f9377564e3d3bcdd6e1f9b9bc8
2020-05-16 02:18:31 +00:00
TreeHugger Robot
d89a58f00f Merge "Avoid launching activity-based feature to force stop exist actiivty and recreate it." into rvc-dev am: 45910eec3f am: ceb23bb736
Change-Id: I6327182f4400f7cbca26a79aa10f6b781a02a361
2020-05-16 01:57:18 +00:00
TreeHugger Robot
ceb23bb736 Merge "Avoid launching activity-based feature to force stop exist actiivty and recreate it." into rvc-dev am: 45910eec3f
Change-Id: I71b7429b2acd35016b655bdaba8cc536f5325e07
2020-05-16 01:31:36 +00:00
Benedict Wong
e37fb7fc00 Merge "Hide IKEv2 VPN options if not supported" am: 806523a7cd am: 63a1447508 am: 6f7a25cedc am: f594281fef am: fe9e41e638
Change-Id: I835dd2d269e52261316ae38c9b2c94c968f9f9f5
2020-05-16 01:30:56 +00:00
Benedict Wong
fe9e41e638 Merge "Hide IKEv2 VPN options if not supported" am: 806523a7cd am: 63a1447508 am: 6f7a25cedc am: f594281fef
Change-Id: I861c3243378fc9780a1ecd6f051d04e262db3f96
2020-05-16 01:16:49 +00:00
TreeHugger Robot
45910eec3f Merge "Avoid launching activity-based feature to force stop exist actiivty and recreate it." into rvc-dev 2020-05-16 01:09:07 +00:00
Benedict Wong
f594281fef Merge "Hide IKEv2 VPN options if not supported" am: 806523a7cd am: 63a1447508 am: 6f7a25cedc
Change-Id: I71c8258a7356d28f70a2a8800e851517b79cff9f
2020-05-16 00:58:39 +00:00
Benedict Wong
6f7a25cedc Merge "Hide IKEv2 VPN options if not supported" am: 806523a7cd am: 63a1447508
Change-Id: I33bc05a44f0c7a1862fdd725a6dcff2d848df4ed
2020-05-16 00:46:18 +00:00
Benedict Wong
63a1447508 Merge "Hide IKEv2 VPN options if not supported" am: 806523a7cd
Change-Id: I3e8b13b615bfc6c2095efd5bd7c2f61beebf7b3e
2020-05-16 00:25:53 +00:00
Benedict Wong
806523a7cd Merge "Hide IKEv2 VPN options if not supported" 2020-05-16 00:14:05 +00:00
TreeHugger Robot
0b74e96442 Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea am: d127bdc14a am: f91d67428e am: bc089d4171
Change-Id: Icc858f850673fa55bc3576f6667e53011da8918c
2020-05-16 00:08:02 +00:00
TreeHugger Robot
e9406ca30a Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea am: d127bdc14a am: 727aa42a94 am: 0d58f34da4
Change-Id: I203c75ee1434bc6dca85debcd90de6789004036e
2020-05-16 00:06:39 +00:00
TreeHugger Robot
07c525c487 Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea am: 0217cbd19e am: 2806494683 am: e8d332dc54
Change-Id: I035d09faa19a1269adf361a5e0cfdb8c9d74eb8b
2020-05-16 00:06:05 +00:00
Julia Reynolds
32d189fbfe Add settings for apps that don't use full conversations am: eca1e4d197 am: 33e6708f75 am: 2ae175233b am: 6a87cdcd50
Change-Id: Ic01e59c4462f51128cd9b425075087459add3057
2020-05-16 00:06:02 +00:00
TreeHugger Robot
463a664f49 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours am: e515101a1c -s ours am: 0b0bfd5bf3 -s ours am: c491a6522d -s ours
am skip reason: subject contains skip directive

Change-Id: I032d029a026e824cf9b3e812374ab010a6e73208
2020-05-16 00:04:13 +00:00
Automerger Merge Worker
cb0e51f169 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours am: 30738191dc -s ours am: d50f81964a -s ours" into rvc-qpr-dev-plus-aosp am: 892e7208df -s ours
am skip reason: subject contains skip directive

Change-Id: Ie498c6933c7e328c232cb882fe4fa6e5bda61984
2020-05-16 00:03:54 +00:00
Automerger Merge Worker
ca2d77c6c0 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours am: 30738191dc -s ours am: 10ab1e1e8b -s ours" into rvc-qpr-dev-plus-aosp am: d73663a4a6 -s ours
am skip reason: subject contains skip directive

Change-Id: Ibdac7372b9c55fa8139f69efb3b2a1f3c0b52526
2020-05-16 00:03:33 +00:00
Automerger Merge Worker
cdf7616e8e Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours am: 04ced7e940 -s ours am: 6051f64b1f -s ours" into rvc-qpr-dev-plus-aosp am: 62fefe2693 -s ours
am skip reason: subject contains skip directive

Change-Id: I99a2cb877419bc20e30b32d6a12b70b4aaacd59d
2020-05-16 00:03:02 +00:00
TreeHugger Robot
42b0612e0e [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours am: 753c885c08 -s ours am: 0736ea6e03 -s ours am: c9b95a3719 -s ours
am skip reason: subject contains skip directive

Change-Id: I37a498a8ef269fa5257d0e06ce4832ff85f78e29
2020-05-16 00:02:04 +00:00
TreeHugger Robot
998930e0ce [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours am: 753c885c08 -s ours am: 2b52ac3be1 -s ours am: 45e0004cf7 -s ours
am skip reason: subject contains skip directive

Change-Id: Ib0e0cb8d154fac8c2f7a7207fea2b0cce5564e8c
2020-05-16 00:01:30 +00:00
TreeHugger Robot
4a89b38fc1 Merge "Import translations. DO NOT MERGE" 2020-05-15 23:58:19 +00:00
TreeHugger Robot
bc089d4171 Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea am: d127bdc14a am: f91d67428e
Change-Id: I7342cb3ca238daf545f36943a3b851525baa54f9
2020-05-15 23:57:46 +00:00
TreeHugger Robot
0d58f34da4 Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea am: d127bdc14a am: 727aa42a94
Change-Id: I2e66118ecbbbb248453ff1299cc5507f10fea655
2020-05-15 23:51:06 +00:00
TreeHugger Robot
e8d332dc54 Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea am: 0217cbd19e am: 2806494683
Change-Id: Ibbdc8174b333a6ddeb867da31f4c34d765167835
2020-05-15 23:50:32 +00:00
Julia Reynolds
6a87cdcd50 Add settings for apps that don't use full conversations am: eca1e4d197 am: 33e6708f75 am: 2ae175233b
Change-Id: I6be478c823a49ca5066e0a80f182cdaf1391d946
2020-05-15 23:50:29 +00:00
TreeHugger Robot
c491a6522d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours am: e515101a1c -s ours am: 0b0bfd5bf3 -s ours
am skip reason: subject contains skip directive

Change-Id: Ie6ab149c072dd3bec5af184cd2f215f584e81d7e
2020-05-15 23:48:14 +00:00
Automerger Merge Worker
892e7208df Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours am: 30738191dc -s ours am: d50f81964a -s ours" into rvc-qpr-dev-plus-aosp 2020-05-15 23:48:12 +00:00
Automerger Merge Worker
d73663a4a6 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours am: 30738191dc -s ours am: 10ab1e1e8b -s ours" into rvc-qpr-dev-plus-aosp 2020-05-15 23:48:10 +00:00
TreeHugger Robot
65f4c33a89 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours am: 30738191dc -s ours am: d50f81964a -s ours
am skip reason: subject contains skip directive

Change-Id: Ic0c24719b0bc7c9d6f788360624f2e574b5fbf93
2020-05-15 23:48:09 +00:00
Automerger Merge Worker
62fefe2693 Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours am: 04ced7e940 -s ours am: 6051f64b1f -s ours" into rvc-qpr-dev-plus-aosp 2020-05-15 23:48:07 +00:00
TreeHugger Robot
25d50e8554 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a264157438 -s ours am: 30738191dc -s ours am: 10ab1e1e8b -s ours
am skip reason: subject contains skip directive

Change-Id: I947b107ad8f031170ea1d4b0d883977ec4b2129c
2020-05-15 23:48:06 +00:00
TreeHugger Robot
82ca756925 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours am: 04ced7e940 -s ours am: 6051f64b1f -s ours
am skip reason: subject contains skip directive

Change-Id: I114420e44695a76b06ac1e1c68fea6d27ef170e4
2020-05-15 23:48:03 +00:00
TreeHugger Robot
c9b95a3719 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours am: 753c885c08 -s ours am: 0736ea6e03 -s ours
am skip reason: subject contains skip directive

Change-Id: I4019d24055d2d41079e4d748c9815a89037d1eb7
2020-05-15 23:48:01 +00:00
TreeHugger Robot
45e0004cf7 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a9ef11f243 -s ours am: 753c885c08 -s ours am: 2b52ac3be1 -s ours
am skip reason: subject contains skip directive

Change-Id: I21c42bb9fd16038a2a6a1a7be30ab528497e45d8
2020-05-15 23:47:50 +00:00
TreeHugger Robot
727aa42a94 Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea am: d127bdc14a
Change-Id: If91efd066bfa439f1840a5dc774da96331cef303
2020-05-15 23:45:59 +00:00
TreeHugger Robot
2806494683 Merge changes from topic "jr-update" into rvc-dev am: 4bbe564aea am: 0217cbd19e
Change-Id: I674ec92dbe8ec7f0c5486ecf08bd9ddba7065996
2020-05-15 23:45:36 +00:00