Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
638,826 Commits 3 Branches 0 Tags
b14134faf29ca2f371f6acddc08c2fadaf41daa3
Commit Graph

638826 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Santiago Rivera
b14134faf2 Merge "Added SQLite versions used on API levels 28, 30 and 31." am: 2a2aa6d3c5 am: e40b2193fe am: 1cfbf3a69e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688650

Change-Id: I15046e16677d49b795b8e845fd082c80c7d1cea7
 2021-04-29 18:14:31 +00:00
TreeHugger Robot
e548cadbc4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8c3a3602b1 -s ours am: a18e01b554 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I40d8cf0e1d6a30f34d4e4c0c1553e2c52a5b1bb5
 2021-04-29 18:13:57 +00:00
TreeHugger Robot
6f8488d44a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 35615bd603 -s ours am: 805d5813ac -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ief9d87de9e3c97734491a89d8c60a177cfd23c5b
 2021-04-29 18:13:17 +00:00
Daniel Santiago Rivera
1cfbf3a69e Merge "Added SQLite versions used on API levels 28, 30 and 31." am: 2a2aa6d3c5 am: e40b2193fe 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688650

Change-Id: I9ae5f4063db356c4bf70782db3492635e83daee4
 2021-04-29 18:11:41 +00:00
Curtis Belmonte
c05b6dbe20 Merge "Send AIDL face enrollment frame info to clients" into sc-dev 2021-04-29 17:58:28 +00:00
Bill Yi
641437329b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: e346b367f2 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Iede02600fb4c5e127896405c5946734415676688
 2021-04-29 17:55:46 +00:00
Chris Li
f9c4ee1fd3 Merge "Move legacy split screen flicker tests for non-resizable to presubmit" into sc-dev 2021-04-29 17:49:15 +00:00
Chris Li
34eedf496e Merge "Determine whether to support activities in multi window (2/n)" into sc-dev 2021-04-29 17:48:50 +00:00
TreeHugger Robot
a18e01b554 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 8c3a3602b1 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I1ef50365ba84344d686a6f5de7bc96e900005314
 2021-04-29 17:47:52 +00:00
TreeHugger Robot
805d5813ac [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 35615bd603 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I4a98eab00e305877c63390de15c37af4d464162e
 2021-04-29 17:46:55 +00:00
Lucas Dupin
43c67441e0 Merge "Close QS Detail before hiding QS." into sc-dev 2021-04-29 17:38:53 +00:00
Daniel Santiago Rivera
e40b2193fe Merge "Added SQLite versions used on API levels 28, 30 and 31." am: 2a2aa6d3c5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1688650

Change-Id: I6df7f027d41fada91f46873a4bdafae1b5e88cbc
 2021-04-29 17:38:43 +00:00
TreeHugger Robot
8c3a3602b1 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-29 17:31:46 +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
Bill Yi
e346b367f2 Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-04-29 17:21:26 +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
TreeHugger Robot
35615bd603 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-04-29 17:13:54 +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
Ying Xu
1ce4cdb8ff Merge "Mock the makeCopy() method in the unit test" into sc-dev 2021-04-29 17:02:14 +00:00
Daniel Santiago Rivera
2a2aa6d3c5 Merge "Added SQLite versions used on API levels 28, 30 and 31." 2021-04-29 17:00:01 +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
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
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
Bill Yi
ba94d565cd Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I873d14583db283b2cbbe45347bf4949d4c0f2001
 2021-04-29 15:45:07 +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
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
5565da2a9c Merge "Fix the padding for top intro preference" into sc-dev 2021-04-29 15:03:08 +00:00
Matt Pietal
5ab8c632b6 Smartspace - Check sensitivity settings 
For both the current user and any managed profiles, check to see if
sensitive smartspace content should be filtered out, based on the user
settings.

Bug: 183401939
Test: atest KeyguardClockSwitchControllerTest

Change-Id: I5de56b1e3229629864304853c26dc45c98ef0114
 2021-04-29 10:53:32 -04:00
Evan Severson
985b4f4ca5 Merge "Fix pin requirement for sensor toggle dialog" into sc-dev 2021-04-29 14:53:14 +00:00
Ryan Mitchell
3ec445926b Merge "Add <macro> tag to aapt2" into sc-dev 2021-04-29 14:15:41 +00:00
Shan Huang
a78718ac81 Merge "Play ripple on pluggedIn event instead of charge event." into sc-dev 2021-04-29 14:10:14 +00:00
Fabian Kozynski
c41e5371d7 Merge "Don't clip tiles as pages as scrolled" into sc-dev 2021-04-29 13:58:02 +00:00