Commit Graph

542466 Commits

Author SHA1 Message Date
Automerger Merge Worker
b4d79832d2 Merge "Merge "Ensure that velocity tracker is never null." into rvc-dev am: 05df6a589e am: f91005b430" into rvc-d1-dev-plus-aosp 2020-06-18 14:33:43 +00:00
Automerger Merge Worker
b23c28a1a4 Merge "Merge "Check resolved override bounds for attaching IME to activity" into rvc-dev am: 4e11c2445b am: 64bba6ab51" into rvc-d1-dev-plus-aosp 2020-06-18 14:33:39 +00:00
TreeHugger Robot
f1d3ede4ee Merge "Ensure that velocity tracker is never null." into rvc-dev am: 05df6a589e am: f91005b430
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11796856

Change-Id: Ic46131d8d69eee669c6e499baf257eb7cae392f0
2020-06-18 14:33:38 +00:00
Automerger Merge Worker
25e7ac7c84 Merge "Merge "Allow finish resize transaction to be overriden" into rvc-dev am: 62a69b9632 am: b0ddde39d9" into rvc-d1-dev-plus-aosp 2020-06-18 14:33:34 +00:00
TreeHugger Robot
bcbb412454 Merge "Check resolved override bounds for attaching IME to activity" into rvc-dev am: 4e11c2445b am: 64bba6ab51
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881940

Change-Id: I85c69e58ba3850d238c7f4110d051b45360787ac
2020-06-18 14:33:33 +00:00
Automerger Merge Worker
7fb988c893 Merge "Merge "Fix issue where player wouldn't expire" into rvc-dev am: 475cf18309 am: 2ef3210f10" into rvc-d1-dev-plus-aosp 2020-06-18 14:33:29 +00:00
Antoan Angelov
db6f8e9a6d Merge "Re-setup viewpager on configuration change for RTL languages" into rvc-dev am: acfac74964 am: 08c98ca801
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894160

Change-Id: I8ca749f1319039f3b28791bf856069100808792e
2020-06-18 14:33:28 +00:00
Jorge Gil
08749803f5 Merge "Allow finish resize transaction to be overriden" into rvc-dev am: 62a69b9632 am: b0ddde39d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11838962

Change-Id: I5c3d8751885619df9c83b6e6e35954a4e35b63df
2020-06-18 14:33:28 +00:00
TreeHugger Robot
e1ed6dcf57 Merge "Controls API - Update template docs" into rvc-dev 2020-06-18 14:33:24 +00:00
Lucas Dupin
e439d2947e Merge "Fix issue where player wouldn't expire" into rvc-dev am: 475cf18309 am: 2ef3210f10
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11887489

Change-Id: I09f5767e4fc29d4516c65791d0ab68b6c0eb4500
2020-06-18 14:33:22 +00:00
Antoan Angelov
a300d05c69 Merge "Disable side swiping on RTL languages" into rvc-dev am: 46b4296beb am: a7c13cee2e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11880480

Change-Id: Iae43499a1563be00d6584f94bf85114be710e25d
2020-06-18 14:33:20 +00:00
TreeHugger Robot
441d5b6ebc Merge "WifiManager: Fix javadoc in addNetworkSuggestions" into rvc-dev am: fe471bb73a am: cbb913f587
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11883075

Change-Id: I8f4f3a888af4c03e2d109d5d0d11c24a10d3f9f6
2020-06-18 14:33:19 +00:00
TreeHugger Robot
230b21e99e Merge "Revert "Add logs that indicate why a surface is invalid"" into rvc-dev am: d82080094e am: 0f629dad5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11874469

Change-Id: I082024bd54a745812b6b5aa6960a0831e0dffece
2020-06-18 14:33:11 +00:00
Lucas Dupin
7169318522 Merge "fix issue where players would be wrongly dismissed" into rvc-dev am: 7d985f792c am: e03e835164
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11887440

Change-Id: I0b15cd00cfafb919893cc79d752afd22c30e9dd8
2020-06-18 14:33:11 +00:00
TreeHugger Robot
b4736afd14 Merge "Controls UI - Properly sort, and set default on seed" into rvc-dev am: f21036b4e7 am: cab1e51196
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11851787

Change-Id: I54d505bf545772423cb1b9184f1e2bf4eb7b0f54
2020-06-18 14:33:02 +00:00
Lucas Dupin
04b40cf229 Merge "Re-add DO Disclosure text to lock screen; now faded." into rvc-dev am: 01b07e368f am: 0c6e01702b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11852820

Change-Id: I07c7eec375964c8960a935b99401f4b6b9137cc0
2020-06-18 14:32:56 +00:00
TreeHugger Robot
b32186dde6 Merge "CEC: Prevent overwriting volume control Settings" into rvc-dev am: 58fd58dea7 am: 79b501a94d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11859734

Change-Id: Ibe27c3a50a60c312287674d83d44ce868037e25a
2020-06-18 14:32:55 +00:00
Lucas Dupin
bafb66fa27 Merge "Fix clipping while scrolling" into rvc-dev am: 4c6f3ff3e2 am: 22d76d1f6b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11889960

Change-Id: I54db36fc9242f39b706e08caa6131efa3dbd06ae
2020-06-18 14:32:47 +00:00
Tingting Wang
6ca57b8f6e Merge "Add CP2 general usage counters to westworld logs." into rvc-dev am: 6d4e262aa8 am: 5454e69665
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11855701

Change-Id: I246878de0382c91d90e98bdb448aec3a167eb44b
2020-06-18 14:32:41 +00:00
Tiger Huang
4c072d9bf2 Merge "Exclude translation caused by surface insets from the matrix" into rvc-dev am: 126e671343 am: baf9dd4cb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11788480

Change-Id: Id854b17a96e906a45bad7239cb294ad4f992cb4c
2020-06-18 14:32:38 +00:00
Nikita Dubrovsky
fa8c0e3cd9 Merge "Dataset authentication for Augmented Autofill" into rvc-dev am: 74c6b2a668 am: 56055f7dd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11825429

Change-Id: Ic280ae74fdb06d6d4ee5ce15607e191d9c9d20b6
2020-06-18 14:32:30 +00:00
Mark Chien
18e59cdc1d Merge "Revert "Revert "Pass entitlement configuration to Settings for entitlement check""" into rvc-dev am: 36806fa822 am: b64f7fd66d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11836350

Change-Id: I40b9c2a8b439fe191ae77264ef46823d128a4470
2020-06-18 14:32:29 +00:00
Tony Huang
254dfa947b Merge "Let activity resume after bubbles expanded" into rvc-dev am: 5ee6fd6f43 am: fb8f2ae018
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833785

Change-Id: I7687ed5351f1097c9f1017bee6336fd4d450bad6
2020-06-18 14:32:14 +00:00
TreeHugger Robot
0dbb487124 Merge changes Ic92e29c6,I6e044606 into rvc-dev am: eb18301bd5 am: c03bbfcb7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886117

Change-Id: I3ce98dbd1054cff5c801384650df461819cf164c
2020-06-18 14:32:11 +00:00
Patrick Baumann
64d253ac92 Pre-cache filter results am: 0192f737ff am: e518db7cd3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817533

Change-Id: I4025109f31b146caf2de09539229f2492d2b265f
2020-06-18 14:32:07 +00:00
Mark Chien
796582884e Merge "Protect invalid entitlement app configuration" into rvc-dev am: 06b2e1cb17 am: 4e8de47ed1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11699076

Change-Id: Ie7bab041938f1e7c25b010ae565791d4c51bd019
2020-06-18 14:32:01 +00:00
TreeHugger Robot
3618586f02 Merge "Check resolved override bounds for attaching IME to activity" into rvc-dev am: 4e11c2445b am: 64bba6ab51
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881940

Change-Id: Ic03d14e8979808dc6df2eb80eac1ddd8ba4d634c
2020-06-18 14:31:53 +00:00
Kevin Chyn
4c02bbf953 Merge "Update biometric/keystore documentation" into rvc-dev am: 9cd814be2a am: f1f2fa9e04
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11876678

Change-Id: I4f32b799f0c4e82d339f9c3aaa4412eead0a499c
2020-06-18 14:31:49 +00:00
Lucas Dupin
5680454d2c Merge "Fix issue where player wouldn't expire" into rvc-dev am: 475cf18309 am: 2ef3210f10
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11887489

Change-Id: I57218e5016fbdefd3dcd220eaee782140e508e56
2020-06-18 14:31:46 +00:00
Lucas Dupin
16b12b3130 Merge "fix issue where players would be wrongly dismissed" into rvc-dev am: 7d985f792c am: e03e835164
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11887440

Change-Id: I7d241b1c66fd333881c17b495737524f9edc6cba
2020-06-18 14:31:37 +00:00
Josh Tsuji
978833745a Merge "Fix issue with dragging bubbles in fullscreen." into rvc-dev am: da630a0779 am: 26e26c5e9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886049

Change-Id: I7fdd9da051f6e5cb3f685f1d496991256fa57412
2020-06-18 14:31:36 +00:00
Lucas Dupin
009e4aba0c Merge "Re-add DO Disclosure text to lock screen; now faded." into rvc-dev am: 01b07e368f am: 0c6e01702b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11852820

Change-Id: I173a53fa3f694ccf7ccfbd62d6cd2b7e9c8a6fff
2020-06-18 14:31:29 +00:00
Tingting Wang
305653a548 Merge "Add CP2 general usage counters to westworld logs." into rvc-dev am: 6d4e262aa8 am: 5454e69665
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11855701

Change-Id: If918f5b7c3daf04a90ac552f5261bd8c26912807
2020-06-18 14:31:21 +00:00
Hayden Gomes
869d45d07d Merge "Updating AudioFormat to handle CHANNEL_IN_DEFAULT" into rvc-dev am: ee67875159 am: ecea6e9950
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11854112

Change-Id: I167bc92308271663f8de1b07796178bff1a59a84
2020-06-18 14:31:20 +00:00
Nikita Dubrovsky
e4f55d5bb8 Merge "Dataset authentication for Augmented Autofill" into rvc-dev am: 74c6b2a668 am: 56055f7dd0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11825429

Change-Id: Ie4f15a1bc39510b0633aa42e3c23b6fa15e4ae86
2020-06-18 14:31:11 +00:00
Tony Huang
cf30740d82 Merge "Let activity resume after bubbles expanded" into rvc-dev am: 5ee6fd6f43 am: fb8f2ae018
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11833785

Change-Id: I637567b28e8f49ec2671d00f42693145bfedfa76
2020-06-18 14:30:56 +00:00
Mark Chien
2c93987411 Merge "Protect invalid entitlement app configuration" into rvc-dev am: 06b2e1cb17 am: 4e8de47ed1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11699076

Change-Id: I27177074a5822cc5767e9a952d9e772957a54e1c
2020-06-18 14:30:41 +00:00
Kevin Chyn
1edd6b1a3d Merge "Update biometric/keystore documentation" into rvc-dev am: 9cd814be2a am: f1f2fa9e04
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11876678

Change-Id: I576ed21f8efd77068ee05577d7785d5483333213
2020-06-18 14:30:30 +00:00
Josh Tsuji
30f4bb8018 Merge "Fix issue with dragging bubbles in fullscreen." into rvc-dev am: da630a0779 am: 26e26c5e9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11886049

Change-Id: If4980f1ade7edbf88683bbbaf1a4488bebe5decd
2020-06-18 14:30:18 +00:00
Taran Singh
05463ee455 Merge "Don't allow pinned window to be IME target" into rvc-dev am: 218e017d93
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11875421

Change-Id: I510545348789f1c5ceb5bb7cf3cea46670d979c5
2020-06-18 14:30:17 +00:00
Hayden Gomes
636b31307d Merge "Updating AudioFormat to handle CHANNEL_IN_DEFAULT" into rvc-dev am: ee67875159 am: ecea6e9950
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11854112

Change-Id: I38c1eca031b32a03fb2fcfff5bb8203a5daf7c71
2020-06-18 14:30:06 +00:00
TreeHugger Robot
4cb5a3ed91 Merge "Statsd log for app notification bans." into rvc-dev am: 4c3e345502
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881552

Change-Id: I6fa34c0105581604776da3d3bf28c1ad9be8dd71
2020-06-18 14:30:04 +00:00
TreeHugger Robot
2f7505cc6b Merge "Treat RouteInfo with different interfaces as different routes" into rvc-dev am: 70e3f56147
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11882397

Change-Id: I4c96f81ba9118b545b69eb507333f09ea634bdf8
2020-06-18 14:29:52 +00:00
Hai Zhang
7489a9bf4c Merge "Skip generating missing permission state for unknown permissions." into rvc-dev am: f654a5c22e am: a4b75fcbf4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11881635

Change-Id: I83a2ab5c3533483081ed7cf7d758984356a62934
2020-06-18 14:29:50 +00:00
TreeHugger Robot
4024346e03 Merge "SurfaceView: Check ViewRootImpl non-null" into rvc-dev am: 3764cbaac4 am: 63a3be6b5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11884759

Change-Id: I7161473702ef27308e2215f3c55773df78b3ade8
2020-06-18 14:29:40 +00:00
TreeHugger Robot
036bb6e2d3 Merge "Guard against NPE in ServiceConnector" into rvc-dev am: 892d269b65 am: 163686b1b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11885859

Change-Id: Ie245cac505ab85ab35767a27111d1661acb1a12a
2020-06-18 14:29:29 +00:00
Antoan Angelov
08c98ca801 Merge "Re-setup viewpager on configuration change for RTL languages" into rvc-dev am: acfac74964
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11894160

Change-Id: Ic4cc4009362113b411c58e2c43a503b39b5c6fd9
2020-06-18 14:29:28 +00:00
TreeHugger Robot
ed8b55e322 Merge "Revert "Disable user animations on insets whose visible frame is empty"" into rvc-dev am: 11fcb1987a am: f79e0b0cb4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11883882

Change-Id: Ib07d31e958e966ddfa853b0af2cad6a2e316046e
2020-06-18 14:29:19 +00:00
Antoan Angelov
a7c13cee2e Merge "Disable side swiping on RTL languages" into rvc-dev am: 46b4296beb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11880480

Change-Id: I41be3c664315f158f455857d5baff5a24c43ec27
2020-06-18 14:29:17 +00:00
TreeHugger Robot
1131b28c24 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 02f853ebe6 -s ours am: 5a10dc9fb4 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11842829

Change-Id: Iaa39a078085b19bd4a7fe91577a4d8ac5150c8ba
2020-06-18 14:29:10 +00:00