Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
636,157 Commits 3 Branches 0 Tags
aaef048c4bfb2d3094f675b86f4f8164ca8241cd
Commit Graph

636157 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Andy Wickham
aaef048c4b Merge "Removes System UI plugin for BC Smartspace." into sc-dev 2021-04-16 20:59:37 +00:00
Adam He
7ae022ade8 Merge "Add cancellationSignal to the Translator#translate() api." into sc-dev 2021-04-16 20:58:59 +00:00
TreeHugger Robot
c6df2ba06a Merge "Indication area text running into wallet" into sc-dev 2021-04-16 20:01:53 +00:00
TreeHugger Robot
861446d2e7 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-16 20:01:12 +00:00
TreeHugger Robot
306ebb508f Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-16 19:55:23 +00:00
Song Hu
a12fc5162f Merge "Pass ScreenshotSmartActionType as a new parameter into ScreenshotNotificationSmartActionsProviderGoogle#getActions where it maps to InteractionType to differentiate Quick Share action from regular smart actions. SystemUI side change." into sc-dev 2021-04-16 19:28:02 +00:00
TreeHugger Robot
c595b18769 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-16 19:26:13 +00:00
Zhen Zhang
c8db0a505f Merge "Refactor isAppHibernationEnabled check in AppHibernationService" into sc-dev 2021-04-16 18:45:29 +00:00
Amy Zhang
0aa9d38e9d Merge "Force FilterClient to NOT reset the FMQ pointer when creating the MQ" into sc-dev 2021-04-16 18:41:31 +00:00
Winson Chiu
e78782b60b Merge "Enforce isSystem for app-link SysConfig" into sc-dev 2021-04-16 18:23:42 +00:00
Hongming Jin
0f4986c28f Merge "Restructure tracing code to prepare for the adding of filtering and searching features." into sc-dev 2021-04-16 17:57:27 +00:00
Almaz Mingaleev
e2b7cb3df2 Merge "Add copy builder to TimeZoneCapabilities." into sc-dev 2021-04-16 17:45:54 +00:00
Pinyao Ting
38304db40b Merge "Various fixes in ShortcutService" into sc-dev 2021-04-16 17:45:31 +00:00
Bill Yi
c30f4b7712 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I662b3784aa18d8b6fe7337cfccaaa78e1eecad53
 2021-04-16 17:42:59 +00:00
TreeHugger Robot
b2cf9f0988 Merge "Fix alignment when build number is not shown" into sc-dev 2021-04-16 17:23:55 +00:00
TreeHugger Robot
1f1bbd88dc Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-16 17:20:34 +00:00
Junyu Lai
6c443135d2 [automerger skipped] Merge "[VCN20] Change requestBackgroundNetwork argument order" am: 28aca09bbf am: 7de0a9088f am: a4ca067284 -s ours 
am skip reason: skip tag Change-Id Id281678fe85ce0894b0e92e11c0283d4d1b4ecdb with SHA-1 0aa8c19a82 is already in history

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

Change-Id: Icd3d0fe11a9de3c98d55fb91e935dc537a28af48
 2021-04-16 17:16:07 +00:00
Jeff DeCew
d50d6db3e8 Merge "Fix notigication group background color" into sc-dev 2021-04-16 17:12:28 +00:00
TreeHugger Robot
db9210da53 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-16 17:06:51 +00:00
TreeHugger Robot
637ad5dc1e Merge "Bug fix for QuickAccessWallet." into sc-dev 2021-04-16 16:57:42 +00:00
Junyu Lai
a4ca067284 Merge "[VCN20] Change requestBackgroundNetwork argument order" am: 28aca09bbf am: 7de0a9088f 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675630

Change-Id: I2b4369cb4127f130076ced52ba020db99f617cd7
 2021-04-16 16:52:07 +00:00
Zoey Chen
6670d2d5d0 Merge "[ANAPIC Review] Change the type of List by ANAPIC review" into sc-dev 2021-04-16 16:50:15 +00:00
Mark Renouf
3a37c9ea0b Merge "Update Javadoc method references" into sc-dev 2021-04-16 16:47:59 +00:00
Jay Aliomer
b1474958c7 Merge "Inline notif send button dimentions fix" into sc-dev 2021-04-16 16:39:03 +00:00
TreeHugger Robot
2b15c25095 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-16 16:28:40 +00:00
TreeHugger Robot
7c21c82dcb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev 2021-04-16 16:27:54 +00:00
Junyu Lai
7de0a9088f Merge "[VCN20] Change requestBackgroundNetwork argument order" am: 28aca09bbf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675630

Change-Id: I73df5528088176070af6e54e01358b1edec27b50
 2021-04-16 16:25:55 +00:00
Paul Duffin
444c535a46 Merge "Move hiddenapi sort preupload tools to tools/platform-compat" am: b82853357b am: 89aedd6cb8 am: af77c134d9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675867

Change-Id: I35b678f40dbc8643224aec26ba1808da893bb80f
 2021-04-16 16:15:32 +00:00
Junyu Lai
28aca09bbf Merge "[VCN20] Change requestBackgroundNetwork argument order" 2021-04-16 16:04:31 +00:00
Bill Yi
05cb3cc0a1 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: Ibefe086aab5df6fc22fdeb4858049c8f3303fa0c
 2021-04-16 16:01:14 +00:00
Junyu Lai
e12ebbb9cc Merge "[VCN19] Rename get/setSubIds to get/setSubscriptionIds" into sc-dev 2021-04-16 15:59:16 +00:00
Paul Duffin
af77c134d9 Merge "Move hiddenapi sort preupload tools to tools/platform-compat" am: b82853357b am: 89aedd6cb8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675867

Change-Id: Ib3c4202f8b84d7bce390d72bfde2e4e518c6b2a0
 2021-04-16 15:45:18 +00:00
Matt Pietal
dcbfcc5928 Indication area text running into wallet 
If the wallet affordance is enabled, add padding to both sides of the
indication area to keep it centered and let the text wrap to the 2nd
line.

Fixes: 185467117
Test: manual (seeing charging message + wallet)
Change-Id: Id44b473faab2acb0f5446cf0ea890c2b2cc74e71
 2021-04-16 11:41:14 -04:00
Greg Kaiser
39d923d7f6 Merge "Revert "Workaround for sysui studio builds"" into sc-dev 2021-04-16 15:24:33 +00:00
Paul Duffin
89aedd6cb8 Merge "Move hiddenapi sort preupload tools to tools/platform-compat" am: b82853357b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675867

Change-Id: If5f4b280c943a1e6a15821077b5e5997baf55436
 2021-04-16 15:21:03 +00:00
Lucas Dupin
cb071176be Merge "Move sparkle animation to RenderThread" into sc-dev 2021-04-16 15:08:52 +00:00
Paul Duffin
b82853357b Merge "Move hiddenapi sort preupload tools to tools/platform-compat" 2021-04-16 15:07:52 +00:00
Matt Pietal
624459fde3 Revert "Workaround for sysui studio builds" 
This reverts commit cbe99e87b7.

Reason for revert: Bootlooping with:

```Caused by: java.lang.UnsupportedOperationException: Failed to resolve attribute at index 0: TypedValue{t=0x2/d=0x112002d a=1 r=0x1060276}
04-16 09:17:42.931  7256  7256 E AndroidRuntime: 	at android.content.res.TypedArray.getColor(TypedArray.java:529)
04-16 09:17:42.931  7256  7256 E AndroidRuntime: 	at com.android.keyguard.NumPadAnimator.reloadColors(NumPadAnimator.java:103)```

Change-Id: If23d3b1ce206029b1b45549edbfb9a0a7823e732
 2021-04-16 15:05:31 +00:00
Bill Yi
b14fae8bf2 Import translations. DO NOT MERGE ANYWHERE 
Auto-generated-cl: translation import
Change-Id: I5502c6423a240a71f2801fc43f803d2690ef3756
 2021-04-16 15:05:11 +00:00
Josh Tsuji
11b83652e9 Merge "Use the existing wallpaper command API to send wake/sleep events to the wallpaper." into sc-dev 2021-04-16 14:59:23 +00:00
Josh Tsuji
bde980759e Use the existing wallpaper command API to send wake/sleep events to the wallpaper. 
This is already used for similar events such as icon drops and user taps. Using it to indicate that the user has woken/slept the device (and passing along location information) makes sense!

This does require an API modification to add the new string constants to WallpaperManager. This change is being requested by 1P apps (the Live Wallpapers, which are not bundled with the OS and thus can't use system APIs).

Bug: 169693662
Test: locally with modified wallpaper, it receives events
Change-Id: I0cc1bc70dbea509a049b08f8119ed875ffc2e8d5
 2021-04-16 14:58:24 +00:00
Almaz Mingaleev
8533c0b3ca Add copy builder to TimeZoneCapabilities. 
This method is added to change capabilities
more easily in Robolectric's TimeManager shadow class.

Bug: 159891384
Test: atest core/tests/coretests/src/android/app/time/*
Change-Id: I10b964666e93af9c2c4ead50088773a77521db65
 2021-04-16 14:51:51 +00:00
TreeHugger Robot
4d68ee6b66 Merge "Controls - Restart activity on rotation" into sc-dev 2021-04-16 14:31:21 +00:00
Jason Chang
fbe969c925 Merge "Fix metrics didn't log ONE_HANDED_TRIGGER_GESTURE_OUT logs when NavigationBar type is Gesture Navi" into sc-dev 2021-04-16 14:26:03 +00:00
Martijn Coenen
79b9512c9a Merge "Dump binder proxies interface descriptors on a separate thread." into sc-dev 2021-04-16 14:23:48 +00:00
Rubin Xu
229a149a91 Merge "Fix LockSettingsServiceTest" am: 3ccd60f47e am: 6f59202300 am: cf83069773 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675899

Change-Id: I2614db2ead6d24e11fa6e3a83ce1e443202610a8
 2021-04-16 14:17:42 +00:00
Rubin Xu
cf83069773 Merge "Fix LockSettingsServiceTest" am: 3ccd60f47e am: 6f59202300 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675899

Change-Id: I42e939c406883463a7be51de7ff152c99fe19849
 2021-04-16 13:48:42 +00:00
Rubin Xu
6f59202300 Merge "Fix LockSettingsServiceTest" am: 3ccd60f47e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1675899

Change-Id: I9b6a9f20aa087934ce2045e664b9f9d713fbadb2
 2021-04-16 13:17:51 +00:00
Mariia Sandrikova
43dfe44a0f Merge "Refactor letterbox logic in separate classes." into sc-dev 2021-04-16 12:53:43 +00:00
Rubin Xu
3ccd60f47e Merge "Fix LockSettingsServiceTest" 2021-04-16 12:53:39 +00:00