Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
621,866 Commits 3 Branches 0 Tags
277cfb354dc76da33cb7c2cfaa914cedf73e130c
Commit Graph

621866 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Peiyong Lin
277cfb354d Merge "Implement per-app window resizing override." into sc-dev 2021-02-02 16:30:40 +00:00
Orion Hodson
f4144ddde7 Merge "libjnigraphics: drop dependency on libandroid_runtime" into sc-dev 2021-02-02 16:22:28 +00:00
Zimuzo Ezeozue
dacdd6fd40 Merge "Add PROPERTY_MEDIA_CAPABILITIES API" into sc-dev 2021-02-02 16:05:51 +00:00
Charles Chen
8e9c693813 Merge "Unhide IncorrectContextUseViolation" into sc-dev 2021-02-02 16:04:13 +00:00
Treehugger Robot
34becf1760 Merge "Update frameworks to use unbundled version of BouncyCastle." am: 19547685bb am: 36adf13e62 am: c3c1cd54e4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559779

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iaf00137fbdfc3dacd99537f9f4e2da0ffbc9a844
 2021-02-02 15:59:03 +00:00
Junyu Lai
88736d70bd Merge "[VCN08] Expose NOT_VCN_MANAGED capability as system API" am: 4a76351c9b am: 2562ab4856 am: b57e9b2dcc 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563497

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I932566b4bb788925072e57436cd5f5fa7918a32c
 2021-02-02 15:58:36 +00:00
TreeHugger Robot
dc22edcddb Merge "Promote mWindowContextToken to TestApi" into sc-dev 2021-02-02 15:55:35 +00:00
Bill Lin
d21bde0cef Merge "1/ Integrate legacySplitScreen Flicker tests into individual assertions" into sc-dev 2021-02-02 15:54:27 +00:00
Stevie Kideckel
dfeb40318e Merge "Add support for seconds hand to AnalogClock" into sc-dev 2021-02-02 15:43:22 +00:00
Treehugger Robot
c3c1cd54e4 Merge "Update frameworks to use unbundled version of BouncyCastle." am: 19547685bb am: 36adf13e62 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559779

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I573badb280d7e351dad049c94566a68f9498f730
 2021-02-02 15:34:40 +00:00
Junyu Lai
b57e9b2dcc Merge "[VCN08] Expose NOT_VCN_MANAGED capability as system API" am: 4a76351c9b am: 2562ab4856 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563497

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ib2b868b8e3be84e3e16fdf9a5c216b270e76e32e
 2021-02-02 15:34:23 +00:00
Derek Sollenberger
d7816b6140 Merge "Pass sampling or nothing to surface.draw" into sc-dev 2021-02-02 15:15:09 +00:00
John Reck
7cf75f0b15 Merge "Add stretch plumbing" into sc-dev 2021-02-02 14:49:42 +00:00
Treehugger Robot
36adf13e62 Merge "Update frameworks to use unbundled version of BouncyCastle." am: 19547685bb 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1559779

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I691da785142fee5967674ac2cf1261e71c1f16e3
 2021-02-02 14:41:24 +00:00
Junyu Lai
2562ab4856 Merge "[VCN08] Expose NOT_VCN_MANAGED capability as system API" am: 4a76351c9b 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1563497

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I48f029e663fe397ce0f88d2de7a758530c093012
 2021-02-02 14:37:47 +00:00
Treehugger Robot
19547685bb Merge "Update frameworks to use unbundled version of BouncyCastle." 2021-02-02 14:37:05 +00:00
Beverly Tai
fa00d3293a Merge "Refactor LockScreenLockIconController" into sc-dev 2021-02-02 14:35:06 +00:00
Fabian Kozynski
92ee65806f Merge "Implement design on privacy dialog" into sc-dev 2021-02-02 14:22:38 +00:00
Fabian Kozynski
467776a81b Implement design on privacy dialog 
* Implement margins and styles
* Change tappable region to whole row
* Implement a11y for whole row

Also, fix a bug with background window that would show black on some
devices instead of transparent.

Bug: 178093014
Fixes: 178616173
Test: manual
Test: atest PrivacyDialogTest
Change-Id: If03fcd75970a724f8209596b75640c5618b3b9c2
 2021-02-02 09:19:20 -05:00
Junyu Lai
4a76351c9b Merge "[VCN08] Expose NOT_VCN_MANAGED capability as system API" 2021-02-02 13:57:57 +00:00
Arc Wang
f1508a7746 Merge changes I020bd406,I85f82b8e into sc-dev 
* changes:
  Support custom content in UsageProgressBarPreference
  Adjust layout of UsageProgressBarPreference
 2021-02-02 13:38:47 +00:00
Treehugger Robot
a9e704a61d Merge "Sort import statements in RoutingControlAction.java" am: ae728c12ac am: ae5b319d7e am: c0939803e9 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564778

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7d061dfee54b9956a26f6e57524b528e053c9796
 2021-02-02 13:23:50 +00:00
Wei Sheng Shih
c9ff946d6f Merge "Fix NPE on RemoteAnimationTargetCompat" into sc-dev 2021-02-02 13:21:29 +00:00
TreeHugger Robot
cb872fc7d9 Merge "Update test to specify WorkTypes directly." into sc-dev 2021-02-02 13:04:15 +00:00
Treehugger Robot
c0939803e9 Merge "Sort import statements in RoutingControlAction.java" am: ae728c12ac am: ae5b319d7e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564778

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I4441733e174ac22883d7f030a8874920feba6b4b
 2021-02-02 13:01:01 +00:00
Orion Hodson
9b4db5364b libjnigraphics: drop dependency on libandroid_runtime 
Depending on jni_headers suffices.

Bug: 179115178
Test: m
Change-Id: I7ad29197ee56aa9cfeae7a5db2353eca996d0ef1
 2021-02-02 12:58:45 +00:00
Stanley Wang
832d478662 Update Main Switch widget. 
- Update switch size
- Update title magrin right
- Use default text color
- Update switch margin right
- Support xml title attribute

Fix: 177967927
Fix: 177968636

Test: Run robotest and apply the widget in Settings and see the ui
Change-Id: I226abbffc1539cc31e64f4a3b3723c95b40e5780
 2021-02-02 12:39:06 +00:00
Shashwat Razdan
fc890f1fba Merge "SmartspaceManager initial implementation" into sc-dev 2021-02-02 12:31:26 +00:00
Treehugger Robot
ae5b319d7e Merge "Sort import statements in RoutingControlAction.java" am: ae728c12ac 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564778

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: If683b283e17811bb629106c84ec90e13121ef8ef
 2021-02-02 12:14:26 +00:00
Lorenzo Colitti
5f6672f171 Merge changes I4f38a539,Id4f6c7f4 am: 22823382e4 am: f344ab8f12 am: 41db574a4d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565198

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I49cd86725c481827b4278e05afd4847c3a06e8d7
 2021-02-02 11:49:08 +00:00
Treehugger Robot
ae728c12ac Merge "Sort import statements in RoutingControlAction.java" 2021-02-02 11:43:08 +00:00
Lorenzo Colitti
41db574a4d Merge changes I4f38a539,Id4f6c7f4 am: 22823382e4 am: f344ab8f12 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565198

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I01f1b30d188e4cedcdb34bcd8f7f25ac1a5c64b4
 2021-02-02 11:30:18 +00:00
Tiger Huang
971df2ccb2 Merge "Remove BarController" into sc-dev 2021-02-02 11:20:19 +00:00
Zim
8d616b4506 Add PROPERTY_MEDIA_CAPABILITIES API 
This string allows apps add a media_capabilities.xml resource to the
AndroidManifest.xml

The media_capabilities.xml file will in turn allow apps declare the
media capabilities they support, so the OS can transcode unsupported
formats to compatible formats for the app

Note, that the hard-coded string is already in use in MediaProvider
and is covered by TranscodeTest mentioned below

Test: atest TranscodeTest
Bug: 178187121
Change-Id: I46cfaefe8fb7f0bbd14896efdee61dcc4da19783
 2021-02-02 10:59:11 +00:00
Lorenzo Colitti
f344ab8f12 Merge changes I4f38a539,Id4f6c7f4 am: 22823382e4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1565198

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id68e4e0ff5995bbf04859834fb2aa0936ef651bc
 2021-02-02 10:46:37 +00:00
Paul Hu
cdab0728bb Merge "Remove ArrayUtils usage in connectivity frameworks classes" am: c4cf8d3dfa am: ace78186e4 am: 0ca0316937 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564776

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia926472336a8abfa6583f29f452838056db932a8
 2021-02-02 10:09:24 +00:00
Lorenzo Colitti
22823382e4 Merge changes I4f38a539,Id4f6c7f4 
* changes:
  Add the underlying networks to NetworkAgentInfo#toString.
  Improve testing for network blocking.
 2021-02-02 10:06:03 +00:00
Paul Hu
0ca0316937 Merge "Remove ArrayUtils usage in connectivity frameworks classes" am: c4cf8d3dfa am: ace78186e4 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564776

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1915652c73514ea7800911222b68253e07e719a9
 2021-02-02 09:32:27 +00:00
Adrian Roos
84199909eb Merge changes from topic "nullablecollection" into sc-dev 
* changes:
  API: Suppress existing NullableCollections lints (TaskOrganizer)
  API: Suppress existing NullableCollections lints (S edition)
 2021-02-02 09:24:38 +00:00
Paul Hu
ace78186e4 Merge "Remove ArrayUtils usage in connectivity frameworks classes" am: c4cf8d3dfa 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1564776

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia8063e83503dce99985e999235ab7eb75f7cd747
 2021-02-02 09:07:11 +00:00
Paul Hu
c4cf8d3dfa Merge "Remove ArrayUtils usage in connectivity frameworks classes" 2021-02-02 08:47:04 +00:00
Chris Li
6809b5c011 Merge "Restrict DisplayArea appBounds to the override bounds" into sc-dev 2021-02-02 07:53:31 +00:00
Wilson Wu
d8343be5ac Merge "Make IInputMethodManager to oneway (11/N)" into sc-dev 2021-02-02 07:35:56 +00:00
Chenxi Ni
f5c2cf83e9 Merge "Fix InputConnection#performSpellCheck logic:" into sc-dev 2021-02-02 07:35:29 +00:00
Lorenzo Colitti
ee73d9b87c Add the underlying networks to NetworkAgentInfo#toString. 
This is useful in debugging VPN networks.

Bug: 173331190
Test: manual
Change-Id: I4f38a53980191a1813c2ef313fedc51af98f18f6
 2021-02-02 16:17:22 +09:00
Lorenzo Colitti
ac799e5a4d Improve testing for network blocking. 
This simplifies the uidNetworkingBlocked method and makes it more
realistic by supporting more combinations of rules than just the
four used by this test.

Also support RULE_ALLOW_METERED, and add test coverage for it.

Test: test-only change
Change-Id: Id4f6c7f41429f3ae7841d3214b3e5e95ec591f85
 2021-02-02 16:17:22 +09:00
Arc Wang
6cccae1354 Support custom content in UsageProgressBarPreference 
This change adds UsageProgressBarPreference#setCustomContent
for developers to set a custom ImageView at the right side
of total summary.

Bug: 177617478
Test: atest UsageProgressBarPreferenceTest
      manual visual
Change-Id: I020bd406baabd289b09f196e0a22669442e13b8e
 2021-02-02 15:14:47 +08:00
Donald Chai
9154c8febe Merge "Fix typo in comment." am: 182e90d1ea am: 2a0adcf0c6 am: 2b6eebf16d 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569600

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I7b0cbedae16e9efbc88521901cb225c1b5e64f58
 2021-02-02 07:12:02 +00:00
Donald Chai
2b6eebf16d Merge "Fix typo in comment." am: 182e90d1ea am: 2a0adcf0c6 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1569600

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I314a3e97c4683dddb0ced5f5368e01586eea9919
 2021-02-02 06:47:26 +00:00
Chris Ye
2b686e85f1 Merge "New API methods to access external battery info" into sc-dev 2021-02-02 06:42:37 +00:00