Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
646,512 Commits 3 Branches 0 Tags
41b249f862a3e1fc530f66dfd1766253aa4e55bf
Commit Graph

646512 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Bill Yi
41b249f862 Merge "Import translations. DO NOT MERGE ANYWHERE" 2021-04-29 17:39:57 +00:00
Silin Huang
f1de6ecc93 Merge "WalletTile should display the default card of wallet." into sc-dev am: 3061389c46 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14324210

Change-Id: I87e68ff6a81e70a8c95db94d4e5b1c3263f84790
 2021-04-29 17:30:49 +00:00
Silin Huang
3061389c46 Merge "WalletTile should display the default card of wallet." into sc-dev 2021-04-29 17:24:39 +00:00
Brad Ebinger
5fcdd639de Merge "Do not throw NPE if GRUU uri is not populated" am: a2fc362eb9 am: be8de58cf0 am: 1286675083 am: 06674f21c2 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690268

Change-Id: I40da0d6828d35a44625373407ccc3ead89d4eb14
 2021-04-29 17:23:59 +00:00
Bill Yi
635c601ece [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47ff768e64 -s ours am: ac18886190 -s ours am: bb0a4b1fb1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I98e5b155f5aaedc1020df38a006010554418e0dd
 2021-04-29 17:23:36 +00:00
Bill Yi
4b99a167d2 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26cbdaa84b -s ours am: b92255196d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6eb9919425499f36eab56bc63d4205178e8a7873
 2021-04-29 17:23:27 +00:00
Matt Pietal
b714914fde Merge "Smartspace - Check sensitivity settings" into sc-dev am: 4e65112c4f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14329345

Change-Id: Ic3ebd723ba8288b0db19d047757bf26234750ef2
 2021-04-29 17:22:33 +00:00
Brad Ebinger
06674f21c2 Merge "Do not throw NPE if GRUU uri is not populated" am: a2fc362eb9 am: be8de58cf0 am: 1286675083 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690268

Change-Id: I50795bb895c98fe105ee4a891ab72a2d9776109d
 2021-04-29 17:16:25 +00:00
Bill Yi
bb0a4b1fb1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47ff768e64 -s ours am: ac18886190 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Idb553b8e1d279ae66707abcb44928f36c980ed3a
 2021-04-29 17:15:59 +00:00
Bill Yi
b92255196d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26cbdaa84b -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I6f0bd41ccbada03cff89d020fee28ed43b107b6a
 2021-04-29 17:15:33 +00:00
Matt Pietal
4e65112c4f Merge "Smartspace - Check sensitivity settings" into sc-dev 2021-04-29 17:14:56 +00:00
Ying Xu
1eeff3f75a Merge "Mock the makeCopy() method in the unit test" into sc-dev am: 1ce4cdb8ff 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14343768

Change-Id: I446baf5c73c9fb4a832eabbddf5167b8a8faab23
 2021-04-29 17:07:50 +00:00
Dmitri Plotnikov
7d0edaf614 Merge "Fix mismatch between measured energy value for GNSS" into sc-dev am: cfe7c4f19b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14344089

Change-Id: I795d9dfc55bbb4f3e4161e91d854b7fdd1e9e483
 2021-04-29 17:07:36 +00:00
Mihai Niță
bd52a2f28e Merge "Update Android language picker with all eligible languages" into sc-dev am: 0df2fb42d2 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14298926

Change-Id: Ida41f893d5be2336e081c8e7202f888d7346296f
 2021-04-29 17:07:17 +00:00
Evan Rosky
6ea0542424 Merge "Adapt transition merge during recents into onTaskAppeared." into sc-dev am: aadebf0a38 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14297820

Change-Id: Ib07681dd19925d8a211deeae0167ecc61b48c869
 2021-04-29 17:06:48 +00:00
Brad Ebinger
1286675083 Merge "Do not throw NPE if GRUU uri is not populated" am: a2fc362eb9 am: be8de58cf0 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690268

Change-Id: I19af2165d5e6e50c37596b2b0aed7f4092334379
 2021-04-29 17:06:20 +00:00
Garfield Tan
e4fb183870 Merge "Add Dimmer to RootDisplayArea" into sc-dev am: efc43e9003 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14332880

Change-Id: Iffc4cb8a41107dc4f285d4c814638deb3a015cc5
 2021-04-29 17:06:12 +00:00
Ying Xu
1ce4cdb8ff Merge "Mock the makeCopy() method in the unit test" into sc-dev 2021-04-29 17:02:14 +00:00
Bill Yi
ac18886190 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 47ff768e64 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ie59c293266e86c840c172bca4915df55ed99ae3b
 2021-04-29 16:57:57 +00:00
Dmitri Plotnikov
cfe7c4f19b Merge "Fix mismatch between measured energy value for GNSS" into sc-dev 2021-04-29 16:56:29 +00:00
Mihai Niță
0df2fb42d2 Merge "Update Android language picker with all eligible languages" into sc-dev 2021-04-29 16:53:47 +00:00
Evan Rosky
aadebf0a38 Merge "Adapt transition merge during recents into onTaskAppeared." into sc-dev 2021-04-29 16:53:17 +00:00
Garfield Tan
efc43e9003 Merge "Add Dimmer to RootDisplayArea" into sc-dev 2021-04-29 16:52:22 +00:00
Brad Ebinger
be8de58cf0 Merge "Do not throw NPE if GRUU uri is not populated" am: a2fc362eb9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1690268

Change-Id: I5e1b81be5320cffb3fe1a709abbe0346f6021733
 2021-04-29 16:42:55 +00:00
TreeHugger Robot
7f44ed8f40 Merge "Add test coverage for android.hardware.lights.LightsRequest and hide android.hardware.lights.LightsManager.LightsSession constructor." into sc-dev am: 5dbfd93d4b 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14320311

Change-Id: Ic9998eb7604aad02327b69e27087e3290476a83f
 2021-04-29 16:32:36 +00:00
TreeHugger Robot
de033bc4f5 Merge "Rename Battery to BatteryState." into sc-dev am: d708154ede 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13993146

Change-Id: Ia49c7feb2fcedde4423c8ead014581128413c39e
 2021-04-29 16:32:20 +00:00
Hongwei Wang
8ac108b039 Merge "Ignore moveTaskToBack transition for PiP" into sc-dev am: bcf4d577d1 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13462530

Change-Id: Icd16a2c7a8a0e8c0cc86a048036630e6eafaf009
 2021-04-29 16:31:42 +00:00
James O'Leary
7c985766df Merge "Don't use pow for distance calculation" into sc-dev am: 3d121b7119 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14328435

Change-Id: I0e1ac4a60e5fa388f36c41fd77447c4b24dc9f61
 2021-04-29 16:31:27 +00:00
TreeHugger Robot
5dbfd93d4b Merge "Add test coverage for android.hardware.lights.LightsRequest and hide android.hardware.lights.LightsManager.LightsSession constructor." into sc-dev 2021-04-29 16:31:10 +00:00
Hyunyoung Song
97dc9e6f00 Merge "API council review for SearchUiManager" into sc-dev am: ce5f5faab8 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14166233

Change-Id: I64a6cd1cdeade7ebb260411fe379a3e970558254
 2021-04-29 16:31:00 +00:00
Nataniel Borges
6fbe54a16a Merge "Fix pip window visibility assertions" into sc-dev am: 8a26f00f1f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14327906

Change-Id: I0130f5a278599813510cc4cfe427bb8a01cab413
 2021-04-29 16:30:39 +00:00
TreeHugger Robot
d708154ede Merge "Rename Battery to BatteryState." into sc-dev 2021-04-29 16:30:16 +00:00
Brad Ebinger
a2fc362eb9 Merge "Do not throw NPE if GRUU uri is not populated" 2021-04-29 16:28:40 +00:00
Hongwei Wang
bcf4d577d1 Merge "Ignore moveTaskToBack transition for PiP" into sc-dev 2021-04-29 16:28:40 +00:00
James O'Leary
3d121b7119 Merge "Don't use pow for distance calculation" into sc-dev 2021-04-29 15:55:49 +00:00
Hyunyoung Song
ce5f5faab8 Merge "API council review for SearchUiManager" into sc-dev 2021-04-29 15:52:12 +00:00
Nataniel Borges
8a26f00f1f Merge "Fix pip window visibility assertions" into sc-dev 2021-04-29 15:51:59 +00:00
James O'Leary
fada9e8571 Don't use pow for distance calculation 
Bug: 186664313
Test: `mp droid`, verify wallpaper extraction continues to succeed
Change-Id: I8136522379abfe5cbce83beae904559e68725aca
 2021-04-29 11:48:39 -04:00
Chavi Weingarten
4366cd0e13 Merge "Updated DisplayHash APIs" into sc-dev am: 89e0e3fb07 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14342123

Change-Id: Ic11a312c6a0e9a17ce7d16a4082ddbab8a25b1a2
 2021-04-29 15:37:08 +00:00
Jeff Sharkey
deacbdbb7d Merge "Restore file truncation where expected." into sc-dev am: 02b741f883 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14266167

Change-Id: I5270dddb6f3daa79f4dbff6101497a8303f2c482
 2021-04-29 15:36:49 +00:00
Chavi Weingarten
89e0e3fb07 Merge "Updated DisplayHash APIs" into sc-dev 2021-04-29 15:31:20 +00:00
Jeff Sharkey
02b741f883 Merge "Restore file truncation where expected." into sc-dev 2021-04-29 15:31:16 +00:00
George Mount
509448d1d6 Merge "Allow intercept touch event while animating edge glow." into sc-dev am: a4b222f48d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14342255

Change-Id: Ibb7ee93abdf93f161dc72a47b4a6163799990912
 2021-04-29 15:28:15 +00:00
TreeHugger Robot
e01916071f Merge "Disable flaky app pair assertions" into sc-dev am: c8a0871269 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14325416

Change-Id: Ieaf959a606735c775c8e9d766631637873aa885f
 2021-04-29 15:27:56 +00:00
George Mount
a4b222f48d Merge "Allow intercept touch event while animating edge glow." into sc-dev 2021-04-29 15:21:51 +00:00
TreeHugger Robot
c8a0871269 Merge "Disable flaky app pair assertions" into sc-dev 2021-04-29 15:18:23 +00:00
Bill Yi
47ff768e64 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I9cf1d15d0bbb219131fbc0838211d1cd6c0f39d8
 2021-04-29 15:16:45 +00:00
Bill Yi
26cbdaa84b Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I45ca6916db47926d01830ac48fb0a6533d20970a
 2021-04-29 15:15:19 +00:00
Tsung-Mao Fang
adbe2eb9ee Merge "Fix the padding for top intro preference" into sc-dev am: 5565da2a9c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14341150

Change-Id: If3666423b3e8533fb4701b062ba87695963dd533
 2021-04-29 15:09:49 +00:00
Evan Severson
e927b3379c Merge "Fix pin requirement for sensor toggle dialog" into sc-dev am: 985b4f4ca5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14341847

Change-Id: Ie29c4c48654f56398edd16917b727db4fd524bac
 2021-04-29 15:09:30 +00:00