Commit Graph

635257 Commits

Author SHA1 Message Date
Songchun Fan
b2fdd34a80 [api] hide ACTION_PACKAGE_FULLY_LOADED as it is not used
BUG: 171920377
Test: builds
Change-Id: I7b17bbe6624e5c96ceac55ca050ec0add0b05cb1
2021-04-12 23:49:57 +00:00
Pinyao Ting
55c108fdb1 Merge changes from topic "shortcut-app-search" into sc-dev
* changes:
  Shortcut integration with AppSearch (Part 10)
  Shortcut integration with AppSearch (Part 9)
  Shortcut integration with AppSearch (Part 8)
  Shortcut integration with AppSearch (Part 7)
  Shortcut integration with AppSearch (Part 5)
2021-04-12 23:29:34 +00:00
Josh Gao
60ef47b378 Merge "Increase DropBox size to 10MiB." am: e1b4e1d594 am: 95949aed66 am: e0d085e8a7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651533

Change-Id: Ia4623936e3440d6b70a153d29c9e0c170489b857
2021-04-12 23:26:44 +00:00
TreeHugger Robot
70bc4757b5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1678346f96 -s ours am: e84e3c9919 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ice87d59e125bd29469f598ea0ac0dcd4755f672c
2021-04-12 23:26:26 +00:00
Meng Wang
6517e68d15 Merge "Revert "PasswordPolicy.getMinMetrics PIN"" into sc-dev 2021-04-12 23:22:21 +00:00
Kevin Chyn
05a37fac59 Merge "Add logs when addAuthToken is invoked" into sc-dev 2021-04-12 23:02:38 +00:00
Josh Gao
e0d085e8a7 Merge "Increase DropBox size to 10MiB." am: e1b4e1d594 am: 95949aed66
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651533

Change-Id: Ia0d1c0f5b79fa0c3788122ef771c82c1e580095b
2021-04-12 23:00:37 +00:00
Josh Gao
95949aed66 Merge "Increase DropBox size to 10MiB." am: e1b4e1d594
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1651533

Change-Id: I337b8077934400a7e0cbd04c6700f0f37883438c
2021-04-12 22:41:07 +00:00
TreeHugger Robot
e84e3c9919 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1678346f96 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2dfa28592a158cda9324d13cefeddcc4be776222
2021-04-12 22:39:05 +00:00
Jing Ji
6c524b8a10 Merge "Clear the pending app freezer task if it's killed." into sc-dev 2021-04-12 22:29:22 +00:00
Meng Wang
3c167fe9ca Revert "PasswordPolicy.getMinMetrics PIN"
This reverts commit 8dd5021359.

Reason for revert: DroidMonitor: Potential culprit for Bug 185150796 - verifying through Forrest before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Bug: 185150796
Change-Id: Ie6809d9e20b5c32c076e7a790095c65a2295781a
2021-04-12 22:26:57 +00:00
TreeHugger Robot
650933432c Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-12 22:14:13 +00:00
TreeHugger Robot
1678346f96 Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-12 22:07:22 +00:00
Edgar Arriaga García
a7e2b44186 Merge "cleanups and fixes for process_madvise compaction" into sc-dev 2021-04-12 22:04:09 +00:00
Beverly Tai
517485f893 Merge "Use default font for clock font" into sc-dev 2021-04-12 21:55:26 +00:00
TreeHugger Robot
fd0773cb29 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b4c4f6d65e -s ours am: 361353f28b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib7c8372249f5087c8ae469144b09ec7448958a5f
2021-04-12 21:53:40 +00:00
Josh Gao
e1b4e1d594 Merge "Increase DropBox size to 10MiB." 2021-04-12 21:51:07 +00:00
Chloris Kuo
96ab6db65f Merge "Fix NAS feedback UI debug info" into sc-dev 2021-04-12 21:27:44 +00:00
TreeHugger Robot
361353f28b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: b4c4f6d65e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie4c6eb66645745102f6ee818bd3694a87a98696d
2021-04-12 21:23:25 +00:00
Paul Duffin
f5195618f8 Merge "Move global hidden API flags generation to platform_bootclasspath" am: f277259089 am: 72b1ff135f am: 78f9593ff7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670845

Change-Id: Ic3a1a3531016fa99e397a986bc05c2163d0f88bb
2021-04-12 20:59:22 +00:00
Mike Reed
c5b6959fb9 Merge "hwui's own impl for interpolator" into sc-dev 2021-04-12 20:48:21 +00:00
Eugene Susla
fc191ab4c2 Merge "Change associate return type to void" into sc-dev 2021-04-12 20:46:46 +00:00
Bill Yi
a601628360 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5fe0501b894e17ebc5d63b02f911fc72e457d9a8
2021-04-12 20:38:46 +00:00
TreeHugger Robot
b4c4f6d65e Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master 2021-04-12 20:35:50 +00:00
Kevin Chyn
e4c593cc86 Add logs when addAuthToken is invoked
Bug: 184804041
Test: Builds
Change-Id: I1eea05f8c7f45bb96790119c4b14bf436909af18
2021-04-12 13:32:16 -07:00
Bill Yi
2dde39b5d3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I6ad32a60f663bfe6ac6bed3befd0bd5ef5940c8f
2021-04-12 13:30:42 -07:00
Felipe Leme
6ebf3703f2 Merge "Documents that wipeData() is allowed for apps with MASTER_CLEAR permission." into sc-dev 2021-04-12 20:29:04 +00:00
Silin Huang
ce953e44cf Merge "Wallet card carousel screen UI polish." into sc-dev 2021-04-12 20:20:47 +00:00
Paul Duffin
78f9593ff7 Merge "Move global hidden API flags generation to platform_bootclasspath" am: f277259089 am: 72b1ff135f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670845

Change-Id: I79c9c1803ac53db9966646436f9b1c329595ae8e
2021-04-12 20:08:58 +00:00
Lais Andrade
8b2586c6ea Merge "Rename CombinedVibrationEffect to CombinedVibration" into sc-dev 2021-04-12 20:08:41 +00:00
Jiachen Zhao
7f188a9fa6 Merge "Addresses TODO in ResumeOnRebootService Javadoc" into sc-dev 2021-04-12 20:01:45 +00:00
TreeHugger Robot
c74ea74939 Merge "Upgrading allowlist for calendar provider" into sc-dev 2021-04-12 19:56:32 +00:00
Beverly
68d6e8ebb8 Use default font for clock font
Note: currently the default is roboto and provides limited support
for variable fonts (ie: Latin numerals supported but other locales may
not be supported by default). This means in certain locales, the font
weight may not change between AOD and the lock screen. OEMs should be
aware that this may cause burn-in on AOD.

Test: manual
Fixes: 171376810
Change-Id: Icb61fec9636ebacec5b7c39492423a9d4bca07c1
2021-04-12 19:34:40 +00:00
Paul Duffin
72b1ff135f Merge "Move global hidden API flags generation to platform_bootclasspath" am: f277259089
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1670845

Change-Id: Id60304459924aa75456d167fe18091f91ff62851
2021-04-12 19:29:12 +00:00
Songchun Fan
1b689fe01b Merge "[SettingsProvider] specify settings type in the comments" into sc-dev 2021-04-12 19:27:26 +00:00
Eugene Susla
c248630cff Change associate return type to void
Per API council feedback, since result wasn't meaningfully used

Fixes: 184264581
Test: presubmit

Change-Id: I65f2df6c2ce346c52cfc3f70d0ed8b63c41546d5
2021-04-12 12:01:45 -07:00
Mike Reed
7406527817 hwui's own impl for interpolator
Bug: 184822190
Test: make
Change-Id: Ib041ad8207417ea5dfa09b50412234e5cf7daf80
2021-04-12 14:58:25 -04:00
Jay Aliomer
fcfa35e119 Merge "ImageWallpaper density and bug fix" into sc-dev 2021-04-12 18:53:06 +00:00
Siim Sammul
650d60ad01 Merge "Store the collected binder latency samples in buckets to form a histogram. Add the ability to generate histograms with varying bucket counts and sizes." into sc-dev 2021-04-12 18:49:27 +00:00
TreeHugger Robot
6e3a221229 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: a700a70372 -s ours am: b778e99951 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I324a85b03087f0d7cfa9abe6ef145b20bad2c133
2021-04-12 18:47:58 +00:00
TreeHugger Robot
604cb1a687 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 27bb7521ba -s ours am: 559601bc20 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I84c45f8f2c62a4fd43e1bb0f0046288c67e63a92
2021-04-12 18:47:47 +00:00
Bill Yi
33a65a6530 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 3058e21acf -s ours am: 758028b112 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I72f0f479e5168f5809e3a1a4d227b891d419dc32
2021-04-12 18:47:30 +00:00
Paul Duffin
f277259089 Merge "Move global hidden API flags generation to platform_bootclasspath" 2021-04-12 18:43:31 +00:00
Lucas Dupin
76524088d0 Merge "New color spec" into sc-dev 2021-04-12 18:38:14 +00:00
Roshan Pius
fd9477d782 Merge "base/wifi: Remove rpius@ from OWNERS" into sc-dev 2021-04-12 18:36:22 +00:00
Silin Huang
da80a9a4e6 Wallet card carousel screen UI polish.
1. Adjust header icon size, 50dp -> 56dp, and increase the top margin
2. Update header icon color for locked state
3. Show both "show all" (app button) and "unlock to pay" (action button) in locked screen
4. Update the colors of the buttons

Test: manually test on device
Bug: b/184905963
Change-Id: I53d6cab7fb0adee412d89408481fcf8926e1a29f
2021-04-12 11:31:17 -07:00
Songchun Fan
c05712b927 Merge "Revert "[SettingsProvider] remove in-lock calls to PackageManager.getPackageUid()"" into sc-dev 2021-04-12 18:18:27 +00:00
Hui Yu
410c2bfeb8 Merge "Background location permission should elevate the standby bucket to FREQUENT" into sc-dev 2021-04-12 18:11:29 +00:00
TreeHugger Robot
c66db32d3b Merge "Fix consumption multiplier" into sc-dev 2021-04-12 18:08:52 +00:00
Xiaoyu Jin
6d44d9606d Merge "Use the PlatformLogger in the platform" into sc-dev 2021-04-12 18:04:09 +00:00