Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
642,899 Commits 3 Branches 0 Tags
2b5bbef53c607cd08ceabc5907ea29aac3bca2ee
Commit Graph

642899 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Neil Fuller
2b5bbef53c Merge "Tidy configuration associated with geotz" into sc-dev am: 8168766af7 am: e878841fca 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14553070

Change-Id: Id2f5c0fa20cf928d6c659a5cc4b8a05277845fce
 2021-05-19 08:48:25 +00:00
Marie Matheson
4c641f905e Merge "Updates BannerMessagePreference to new style" into sc-dev am: f5bb354999 am: 6985cc655c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14467714

Change-Id: I43e860fb62dad500f6dee31a68e6ab5c7d6694d9
 2021-05-19 08:48:13 +00:00
Jerry Chang
fca0aa5e15 Update the default value of use legacy split config am: 0adba8aafa 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14637425

Change-Id: I88ec8fa1ede8f551ea613d7ff3d0eccc66193b43
 2021-05-19 08:46:37 +00:00
Jacky Kao
cb93f26f02 Improve the windows register and unregister mechanism am: 31eaf452ad 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14637424

Change-Id: If7b01817b2d76d2b7e4512278f853ba5875d3c4d
 2021-05-19 08:46:35 +00:00
Chris Li
14e7951129 Include RootDisplayArea feature id in DisplayAreaInfo am: e59ae90be3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14637423

Change-Id: I4e7e19dd2d23041e6ed4119ac3e9f38648039660
 2021-05-19 08:46:32 +00:00
Neil Fuller
e878841fca Merge "Tidy configuration associated with geotz" into sc-dev am: 8168766af7 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14553070

Change-Id: I3c9643adb0adc97dc4d79c5a1b9ac9bc00501870
 2021-05-19 08:43:57 +00:00
Marie Matheson
6985cc655c Merge "Updates BannerMessagePreference to new style" into sc-dev am: f5bb354999 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14467714

Change-Id: I9a7ca0cfa3fe64f75560bf54ab4476d889f5c046
 2021-05-19 08:43:34 +00:00
Remi NGUYEN VAN
82892621e5 [automerger skipped] Merge "Move config_apf* resources to NetworkStack" into sc-dev am: 743563b8c3 -s ours am: 87c27c3c26 -s ours 
am skip reason: Merged-In I7a15ddcad5af11fa307d9dbe3a77b31a1179e5b3 with SHA-1 5ebef3eb14 is already in history

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

Change-Id: Ifba014d16f7742ff8923935cbff621c5a05435d8
 2021-05-19 08:36:41 +00:00
Robert Horvath
81866145d8 Merge "Support generic profile types" into sc-dev am: 2314129406 am: 4efbaf92fd 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14621138

Change-Id: I341dde8b197055634ef224579d246ec84bfd50cb
 2021-05-19 08:36:31 +00:00
Neil Fuller
8168766af7 Merge "Tidy configuration associated with geotz" into sc-dev 2021-05-19 08:33:00 +00:00
Marie Matheson
f5bb354999 Merge "Updates BannerMessagePreference to new style" into sc-dev 2021-05-19 08:26:03 +00:00
Remi NGUYEN VAN
87c27c3c26 [automerger skipped] Merge "Move config_apf* resources to NetworkStack" into sc-dev am: 743563b8c3 -s ours 
am skip reason: Merged-In I7a15ddcad5af11fa307d9dbe3a77b31a1179e5b3 with SHA-1 5ebef3eb14 is already in history

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

Change-Id: Ic8d42beef91705149641db3f63bc1a3c0ee162f4
 2021-05-19 08:11:23 +00:00
Robert Horvath
4efbaf92fd Merge "Support generic profile types" into sc-dev am: 2314129406 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14621138

Change-Id: Id274dfd9ef1420eaae84a47f9ed34a67b0f67946
 2021-05-19 08:10:40 +00:00
Jerry Chang
0adba8aafa Update the default value of use legacy split config 
Update use legacy split config to false to indicate using new split.

Bug: 187041611
Test: flash and check launch adjacent flag triggers staged split
 2021-05-19 07:55:37 +00:00
Jacky Kao
31eaf452ad Improve the windows register and unregister mechanism 
1. For fixing the crash due to mutl-register callback, we avoid using
the display context when un-registering the callback. Instead, we
remove the observer mapping if the display exists along with the
observer of any embedded displays that are children of the
un-registered one.

2. When an display registers its callback first, and then got its
reparent window, there's an displayWindowObserver for it in the
A11yWindowManager. But it didn't be used because it's an embedded
display and any windows change on it will be notified through the
callback of its parent display. So we add a callback to remove
this un-used displayWindowObservers in the A11yWindowManager when
this display is an embedded one.

Bug: 143114102
Test: a11y CTS & unit tests
Merged-In: I00fd1f45c0b4e362143a8d82f31264ff202f0967
(cherry picked from commit 5b8b737755)
 2021-05-19 07:54:39 +00:00
Remi NGUYEN VAN
743563b8c3 Merge "Move config_apf* resources to NetworkStack" into sc-dev 2021-05-19 07:54:19 +00:00
Chris Li
e59ae90be3 Include RootDisplayArea feature id in DisplayAreaInfo 
With the RootDisplayArea id, one can create WindowContext with bundle
that specifying the RootDisplayArea using KEY_ROOT_DISPLAY_AREA_ID to
get the WindowContext associated with the DA.

Bug: 176875245
Test: atest WmTests:DisplayAreaTest
 2021-05-19 07:53:35 +00:00
Robert Horvath
2314129406 Merge "Support generic profile types" into sc-dev 2021-05-19 07:47:08 +00:00
Chris Li
3a21aa0e12 Merge "Determine whether to support activities in multi window (9/n)" into sc-dev am: b9034aba83 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14606008

Change-Id: I50da1d7f277d070602140ae97fa128da8b205f53
 2021-05-19 06:50:18 +00:00
Chris Li
b9034aba83 Merge "Determine whether to support activities in multi window (9/n)" into sc-dev 2021-05-19 05:47:41 +00:00
TreeHugger Robot
41d06f0f0a Merge "Update bubble user education screens to use proper colors" into sc-dev am: 4d225a0e3c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14628477

Change-Id: I6e21132b7eb1f0aec8a1e29e878e7b24340b8c01
 2021-05-19 04:43:50 +00:00
TreeHugger Robot
4d225a0e3c Merge "Update bubble user education screens to use proper colors" into sc-dev 2021-05-19 04:36:06 +00:00
Stanislav Zholnin
5de1932dae Merge "Track OP_PHONE_CALL_MICROPHONE and OP_PHONE_CALL_CAMERA in Discrete registry." into sc-dev am: 94ba8dd4df 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14624433

Change-Id: Ibed03a40840cb34db4f21b8e3f6c7aca079a5f73
 2021-05-19 04:34:18 +00:00
Stanislav Zholnin
94ba8dd4df Merge "Track OP_PHONE_CALL_MICROPHONE and OP_PHONE_CALL_CAMERA in Discrete registry." into sc-dev 2021-05-19 04:10:21 +00:00
TreeHugger Robot
d0f21834f8 Merge "Only show filtered RecentLocationAccess apps" into sc-dev am: 252a579657 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14533937

Change-Id: Ie07b8f957cc1de2565e6d00ea94ba149665f63fb
 2021-05-19 03:51:46 +00:00
Hongwei Wang
a9b0f5e914 Merge "Do not move PiP upon Display change during exit" into sc-dev am: 21f0b70da5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14629573

Change-Id: Icbac2d003b0204f97c4489bea7bbec59a1d76094
 2021-05-19 03:51:27 +00:00
TreeHugger Robot
252a579657 Merge "Only show filtered RecentLocationAccess apps" into sc-dev 2021-05-19 03:41:57 +00:00
Hongwei Wang
21f0b70da5 Merge "Do not move PiP upon Display change during exit" into sc-dev 2021-05-19 03:27:00 +00:00
Remi NGUYEN VAN
780aaa9bd8 Merge "Move config_apf* resources to NetworkStack" am: 74ce6ae771 am: 785080237e 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684656

Change-Id: I93f5fd10f6c365365ff0e89ca4221d58d420c5ac
 2021-05-19 03:11:41 +00:00
Remi NGUYEN VAN
785080237e Merge "Move config_apf* resources to NetworkStack" am: 74ce6ae771 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684656

Change-Id: Ie51eae491092389fbc7321491da6129c24c3de00
 2021-05-19 02:37:01 +00:00
Rhed Jao
13bf754a2c Merge "Fix LauncherApps package removed Callback failed on multi-users" into sc-dev am: ce8a8e8d01 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14609917

Change-Id: Ia06f1173808b7e27cc8f410a9a1ce76fc40a2927
 2021-05-19 02:16:47 +00:00
Remi NGUYEN VAN
5363620962 Move config_apf* resources to NetworkStack 
The resources are only read by NetworkStack through their respective
ApfCapabilities SystemApi methods.
As the resources are being migrated out of frameworks/base resources
anyway, move them directly to NetworkStack instead of moving them to
ServiceConnectivityResources.

Also test that the framework resources are not overlaid or modified.
This should avoid OEM integration errors where the overlays are kept as
in R, without overlaying the resource in the NetworkStack package.

Bug: 185850634
Test: atest CtsNetTestCases
BYPASS_INCLUSIVE_LANGUAGE_REASON=Need to mention legacy APIs

Merged-In: I7a15ddcad5af11fa307d9dbe3a77b31a1179e5b3
(clean cherry-pick)

Change-Id: I7a15ddcad5af11fa307d9dbe3a77b31a1179e5b3
 2021-05-19 11:00:58 +09:00
Rhed Jao
ce8a8e8d01 Merge "Fix LauncherApps package removed Callback failed on multi-users" into sc-dev 2021-05-19 01:58:08 +00:00
TreeHugger Robot
e68d0dddad Merge "Take PIP snapshot in the shell and use bounds state size for crossfading" into sc-dev am: eea27600d3 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14461846

Change-Id: Ied99573f2c8cfde669d1cb17504ac099689c1702
 2021-05-19 01:07:25 +00:00
TreeHugger Robot
0f802d8b34 Merge "Clarify some UCE API docs" into sc-dev am: 3e2c6580a5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14629229

Change-Id: I19a40e55a9c04d5bd67b00c34a61fc61c521b849
 2021-05-19 01:06:39 +00:00
TreeHugger Robot
eea27600d3 Merge "Take PIP snapshot in the shell and use bounds state size for crossfading" into sc-dev 2021-05-19 01:06:32 +00:00
TreeHugger Robot
6eb527cdb2 Merge "Hide all AppsFilter tracing behind flag" into sc-dev am: 77b429629e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14628451

Change-Id: I6ee5f0b9ef05b540b9723ddb3490792c6f749060
 2021-05-19 01:06:21 +00:00
Remi NGUYEN VAN
74ce6ae771 Merge "Move config_apf* resources to NetworkStack" 2021-05-19 00:58:52 +00:00
TreeHugger Robot
3e2c6580a5 Merge "Clarify some UCE API docs" into sc-dev 2021-05-19 00:52:27 +00:00
TreeHugger Robot
77b429629e Merge "Hide all AppsFilter tracing behind flag" into sc-dev 2021-05-19 00:44:47 +00:00
Jerry Chang
85337e28dd Merge "Fix not releasing touching state of the handle on divider bar" into sc-dev am: 6c2ffa9595 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14540393

Change-Id: If57753c912ecf57bed2dea095be6b7fc03e0fdd5
 2021-05-19 00:16:20 +00:00
Jerry Chang
6c2ffa9595 Merge "Fix not releasing touching state of the handle on divider bar" into sc-dev 2021-05-19 00:08:08 +00:00
TreeHugger Robot
e4bfa0943e Merge "Controls - Use new privacy setting" into sc-dev am: 20e75f17e5 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14548608

Change-Id: I56e2e1e106c9318577da0af46d06b53d6481a573
 2021-05-19 00:08:02 +00:00
Jorge Gil
f18f6b626d Merge "Snap the PIP window to the left or right edge after pinch resize" into sc-dev am: 845205c00d 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14607700

Change-Id: I18e2d88b16ad37ead63bdb990f3fcb07d13fb5ac
 2021-05-19 00:07:15 +00:00
James O'Leary
6c72295195 Merge "Connect ColorStateList to CAM" into sc-dev am: 671019f95c 
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14269707

Change-Id: Iac6f93aef88b8f21a4525c889119a04768bbfd2f
 2021-05-19 00:05:53 +00:00
TreeHugger Robot
20e75f17e5 Merge "Controls - Use new privacy setting" into sc-dev 2021-05-18 23:55:18 +00:00
Jorge Gil
845205c00d Merge "Snap the PIP window to the left or right edge after pinch resize" into sc-dev 2021-05-18 23:44:26 +00:00
James O'Leary
671019f95c Merge "Connect ColorStateList to CAM" into sc-dev 2021-05-18 23:44:22 +00:00
Christopher Ferris
d1172f3b04 Merge "Add a cherry-pick exception." am: 9510033467 am: 6733d0ef8a 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1711190

Change-Id: I81ac1a60ab33b059488109f1aa7efada363bb3ff
 2021-05-18 23:36:45 +00:00
Nikita Iashchenko
832ce8f925 Merge "Move IoUtils#deleteContents from CorePlatformApi set to framework" am: a4466fbe61 am: 719831b948 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1686657

Change-Id: I08b1d281a3b71556d783b1d4f352bc7a4ba8e879
 2021-05-18 23:27:10 +00:00