Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
738,759 Commits 3 Branches 0 Tags
663abefa00a73a3d532558cdd146d00899fa9096
Commit Graph

738759 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cecilia
663abefa00 Modify the documentations for the UI template APIs 
- Rename the classes to be less verbose;
- Add the template layout descriptions to its corresponding data
  classes;
- Documents for all getter/setter methods.

Fixes: 217554855
Test: atest CtsSmartspaceServiceTestCases
Change-Id: Id5abcea0210b19b40c96cc8183e439c8af95bf85
 2022-02-10 20:24:57 +00:00
Cecilia
e4368e19b8 Modify Smartspace UI templates APIs. 
1. Add a SmartspaceText class to warp CharSequence with the info of TrunctAtPosition;
2. Add a field shouldTint to SmartspaceIcon.

Test: atest CtsSmartspaceServiceTestCases
Bug: 213926964
CTS-Coverage-Bug: 214471292
Change-Id: If9352fcced3db4e398d49dae8ff17f86f5765b47
 2022-02-04 19:48:43 +00:00
Cecilia
6927948dff Add all the Smartspace UI templates' corresponding data classes. 
- SmartspaceDefaultUiTemplateData represents the data of a Smartspace
card with the default UI template;
- Other templates' data classes are all subclasses of
SmartspaceDefaultUiTemplateData;
- SmartspaceIcon and SmartspaceTapAction are the newly-added primitives.

More details in go/ss-launcher-templated-ui.

Test: tested locally
Bug:213926964,212650337
CTS-Coverage-Bug:214471292

Change-Id: I056c49e3db7060697be4a3a8f51358802f2610b0
 2022-01-27 21:00:47 +00:00
TreeHugger Robot
f3366dcd87 Merge changes I8cf2b091,I13c5986e,I12579263,I42635877,Ib3ff55ab into sc-v2-dev am: 1e2a3ecc4d am: 5fa4798ec9 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16576688

Change-Id: I1cec243c50085c144cf1ac9c3274f523dd73dc64
 2022-01-07 20:22:22 +00:00
Joy Babafemi
25dcb44ae9 [automerger skipped] [DO NOT MERGE] Handle IllegalStateException in APM event handling. am: 60a456a0a6 am: ea582ced9d -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I2d072d54b17e65c55c1723d79a11f00f8c78e358
 2022-01-07 20:21:34 +00:00
TreeHugger Robot
e69176effd Merge "Update AidlContextHubWrapper methods" 2022-01-07 20:12:29 +00:00
TreeHugger Robot
5fa4798ec9 Merge changes I8cf2b091,I13c5986e,I12579263,I42635877,Ib3ff55ab into sc-v2-dev am: 1e2a3ecc4d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16576688

Change-Id: I7c366d5df178c5d23db739f59bc2a90853354585
 2022-01-07 20:02:36 +00:00
Joy Babafemi
ea582ced9d [DO NOT MERGE] Handle IllegalStateException in APM event handling. am: 60a456a0a6 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16576688

Change-Id: If0517cac3a8955660e1276682efbc6825e751ed5
 2022-01-07 20:02:25 +00:00
TreeHugger Robot
1e2a3ecc4d Merge changes I8cf2b091,I13c5986e,I12579263,I42635877,Ib3ff55ab into sc-v2-dev 
* changes:
  [DO NOT MERGE] Handle IllegalStateException in APM event handling.
  DO NOT MERGE: Disable UWB in airplane mode.
  DO NOT MERGE: Clear calling context when adding UWB default setting.
  DO NOT MERGE: Set default UWB state on.
  DO NOT MERGE: Persist UWB State in AOSP stack.
 2022-01-07 19:46:08 +00:00
Makoto Onuki
8b84813b99 Merge "Do not run unnecessary code in the common case" 2022-01-07 19:26:43 +00:00
Matt Buckley
2952c72239 Merge "Revert "Revert "Revert "Add APIs that allow to exclude routes fr..."" am: f7a327e8d5 am: 086cbfd1bf am: 366582cbae am: c83c35b7fd 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1941194

Change-Id: Ie4bdc7876ab2bc61aff66d1b3c8a72748b3117ad
 2022-01-07 18:58:22 +00:00
Bill Yi
86c61a4ee8 [automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: b99672c020 -s ours am: 84e861430f -s ours am: 92b4b0f20f -s ours am: 8ca829de8e -s ours 
am skip reason: subject contains skip directive

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

Change-Id: Ibd10976e021d96dcfb6e84e2c44d42b95c91ae5a
 2022-01-07 18:57:04 +00:00
Matt Buckley
c83c35b7fd Merge "Revert "Revert "Revert "Add APIs that allow to exclude routes fr..."" am: f7a327e8d5 am: 086cbfd1bf am: 366582cbae 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1941194

Change-Id: I9cae0caca7360861d59be3daf5f8406c8598da2d
 2022-01-07 18:35:23 +00:00
Bill Yi
8ca829de8e [automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: b99672c020 -s ours am: 84e861430f -s ours am: 92b4b0f20f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I232428ea53113f751280df92bbf77fb7a74d9070
 2022-01-07 18:34:08 +00:00
Nate Myren
d75cc07596 Merge "Add Default grants for notification permission" 2022-01-07 18:30:50 +00:00
TreeHugger Robot
f7714c7271 Merge "Set cutout mode to shortEdges on flicker" 2022-01-07 18:25:19 +00:00
Matt Buckley
366582cbae Merge "Revert "Revert "Revert "Add APIs that allow to exclude routes fr..."" am: f7a327e8d5 am: 086cbfd1bf 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1941194

Change-Id: Ia3dc04920b8941a9528547cf608099195bd948bf
 2022-01-07 18:17:35 +00:00
Bill Yi
92b4b0f20f [automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: b99672c020 -s ours am: 84e861430f -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I01ca3dc594e0a18cbbd8f8196af3fb4a806df617
 2022-01-07 18:16:19 +00:00
Beth Thibodeau
45dd38dbb4 Merge "Add carousel size info to dumpsys" 2022-01-07 18:05:43 +00:00
Guojing Yuan
961a42b157 Merge "Change CDM device presence scan mode" 2022-01-07 18:00:55 +00:00
Matt Buckley
086cbfd1bf Merge "Revert "Revert "Revert "Add APIs that allow to exclude routes fr..."" am: f7a327e8d5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1941194

Change-Id: Ifacb9e5cd98ddd1e5acd4757b9474c89fb1de3fc
 2022-01-07 17:50:51 +00:00
Bill Yi
84e861430f [automerger skipped] Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" am: b99672c020 -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I68d1975f5538f2a6aeb5dcc64a09d1f230af9aea
 2022-01-07 17:48:50 +00:00
Matt Buckley
f7a327e8d5 Merge "Revert "Revert "Revert "Add APIs that allow to exclude routes fr..."" 2022-01-07 17:48:45 +00:00
Matt Buckley
7153b105e7 Revert "Revert "Revert "Add APIs that allow to exclude routes fr..." 
Revert "Revert "Revert "Add VpnServiceBuilderShim for VpnService..."

Revert submission 1931760-reland-vpn-impl-part-2

Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.googleplex.com/builds/quarterdeck?branch=aosp-master&target=test_suites_x86_64&lkgb=8053795&lkbb=8053908&fkbb=8053828, bug b/213588956.
BUG: b/213588956
Reverted Changes:
Ic8ed8fce7:Revert "Revert "Add CTS tests for exclude VPN rout...
I07104340a:Revert "Revert "Add VpnServiceBuilderShim for VpnS...
I7c69b7244:Revert "Revert "Add APIs that allow to exclude rou...

Change-Id: Ic72cafcf5c7e2c62236f1cef61b0764882bacaad
 2022-01-07 17:44:52 +00:00
Julia Reynolds
02d271a391 Merge "Update FGS notification behavior" 2022-01-07 17:39:40 +00:00
Seth Moore
ea9d0dd167 Merge "Add missing </pre> to Javadoc" am: 076fb5e987 am: d084c0202a am: 33e0b830dc am: a665f6bd93 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1905490

Change-Id: I5965b31cb15b2cf30596939d4c5cb70e51b332b9
 2022-01-07 17:34:34 +00:00
Bill Yi
b99672c020 Merge "Merge sc-qpr1 to aosp-master - DO NOT MERGE" 2022-01-07 17:29:10 +00:00
Taras Antoshchuk
ddb46412b6 Merge "Revert "Revert "Add APIs that allow to exclude routes from VPN""" am: f4177e94ee am: 464eb8bc19 am: accf4c69a5 am: c159f90aa8 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931085

Change-Id: I5336589d5ddee73e626c6924d48b9b9cfb126a44
 2022-01-07 17:21:35 +00:00
Seth Moore
a665f6bd93 Merge "Add missing </pre> to Javadoc" am: 076fb5e987 am: d084c0202a am: 33e0b830dc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1905490

Change-Id: I34e3c8d5e8b89ca9f27ea43d3f3331d5bf6ead14
 2022-01-07 17:21:06 +00:00
Taras Antoshchuk
c159f90aa8 Merge "Revert "Revert "Add APIs that allow to exclude routes from VPN""" am: f4177e94ee am: 464eb8bc19 am: accf4c69a5 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931085

Change-Id: I8e7f48702c2fca7af6279d4cc3f67f724ed2f758
 2022-01-07 17:20:29 +00:00
TreeHugger Robot
ae8711302d Merge "Correct a transient view cleanup error" 2022-01-07 17:18:44 +00:00
TreeHugger Robot
21804ecb1c Merge "New Pipeline: Show media on lockscreen" 2022-01-07 17:18:39 +00:00
Leon Scroggins
a8693ecd42 Merge "DisplayManager: Add an API to query for DISPLAY_DECORATON" 2022-01-07 17:11:47 +00:00
Lucas Dupin
63282b4900 Merge "Hook up new styles to customization setting" 2022-01-07 17:09:34 +00:00
Seth Moore
33e0b830dc Merge "Add missing </pre> to Javadoc" am: 076fb5e987 am: d084c0202a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1905490

Change-Id: I0dfcbf12f73733995f13ce67f820d9ca0e7d3215
 2022-01-07 17:06:18 +00:00
Taras Antoshchuk
accf4c69a5 Merge "Revert "Revert "Add APIs that allow to exclude routes from VPN""" am: f4177e94ee am: 464eb8bc19 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931085

Change-Id: Iffa989b5fe71ba259e1d4221ae203b746ad7ddd1
 2022-01-07 17:05:54 +00:00
Nick Ning
0ceba2c3a7 Merge "Implement the native Dream Clock" 2022-01-07 17:05:54 +00:00
TreeHugger Robot
6567afa17f Merge "Add some more fakes to the test dependencies" 2022-01-07 17:02:50 +00:00
Seth Moore
d084c0202a Merge "Add missing </pre> to Javadoc" am: 076fb5e987 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1905490

Change-Id: Iff015f828a1e2be937d6ce9d27ec3c944dbc8c08
 2022-01-07 16:45:18 +00:00
Taras Antoshchuk
464eb8bc19 Merge "Revert "Revert "Add APIs that allow to exclude routes from VPN""" am: f4177e94ee 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931085

Change-Id: Ic6b7dd2cd547b29e1407601d508f8256bfc878cb
 2022-01-07 16:44:00 +00:00
Seth Moore
076fb5e987 Merge "Add missing </pre> to Javadoc" 2022-01-07 16:40:32 +00:00
Treehugger Robot
44756c5816 Merge "[MS39.1] Remove the looper from NetworkStatsSubscriptionMonitor" am: a8dd1f55ac am: f9d029bebd am: 8c60b78c1f am: 3168535d70 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1936448

Change-Id: I92cc7a0199c1d86b02ac980314394e34899a15db
 2022-01-07 16:33:52 +00:00
Junyu Lai
55db6afd86 Merge "[MS17.1] Remove getNetworkTotalBytes dependencies from MultipathPolicyTracker" am: a668e90292 am: 3a8216bb34 am: e602202e7d am: 25b501c6fa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1931588

Change-Id: Ic3b040fb95b94c0950e0455434499fe7c5e7d76a
 2022-01-07 16:33:14 +00:00
chapin
e4cd792bab Merge "Revert "gtbs: Add Generic Telephone Bearer Service support"" am: 279b828fd8 am: 84913280a8 am: 35117a7596 am: 815d4cedea 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1940083

Change-Id: I49a731122e7bdf8498ed00a30568a71cf66cad47
 2022-01-07 16:31:49 +00:00
Treehugger Robot
2def76d43e [automerger skipped] Merge "Add necessary parcelables of metadata" am: 8ed7defe20 am: 5c6ca53a00 am: 56cc4a092d am: 495a05886f -s ours 
am skip reason: Merged-In I3331d7e3d76db50f5b3c4db57891a20e4f935ad8 with SHA-1 67c75e4640 is already in history

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

Change-Id: I9a4eaadeb2dcbfa8175b3e7e45cf54172b05e7c2
 2022-01-07 16:31:11 +00:00
Treehugger Robot
c7a180802f Merge "[MS22] Move NetworkManagementSocketTagger into the module" am: 81589202e5 am: bc8cdbeecb am: cb6617a563 am: 3fe0c62490 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1933091

Change-Id: I62d56fadd938f9f0e260f0ed7c7d90554f5bfd12
 2022-01-07 16:30:27 +00:00
TreeHugger Robot
bfd7829902 Merge "Add PACKAGE_MANAGER_OWNERS as owners of SystemConfig.java" into stage-aosp-master am: 105f98c38c am: d31bba2d5c am: 23e9f0b15a 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16582694

Change-Id: I5a7782f0c6f4ffccbb5a07af376e4694b1cbc457
 2022-01-07 16:29:30 +00:00
Caitlin Cassidy
07ecbc6ee6 Merge "[Disable Flags] Update logging to make it clear when there's been no change." 2022-01-07 16:28:12 +00:00
Taras Antoshchuk
f4177e94ee Merge "Revert "Revert "Add APIs that allow to exclude routes from VPN""" 2022-01-07 16:27:12 +00:00
Fedor Kudasov
01c0d6b983 Merge "Annotate com.android.systemui.qs with @Nullable" 2022-01-07 16:19:38 +00:00