Commit Graph

641642 Commits

Author SHA1 Message Date
Les Lee
aa6feb95bb Merge "Add metered filter for API: buildTemplateCarrier" into sc-dev am: 6fff3df429
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622495

Change-Id: Ic72650951d9e03c5bb3c1861f4c39aac47065357
2021-05-19 14:50:04 +00:00
Zimuzo Ezeozue
b3e9d6bed9 Merge "Improve secondary volume mounts on user switch" into sc-dev am: 58b0886913
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14621130

Change-Id: Idb37e8d04328e1ddd6d3da2fc2baba6a5d2e40db
2021-05-19 14:49:44 +00:00
Ryan Mitchell
7a987a6e97 Merge "Add <staging-public-group> tags to SV2" into sc-v2-dev 2021-05-19 14:45:44 +00:00
Les Lee
6fff3df429 Merge "Add metered filter for API: buildTemplateCarrier" into sc-dev 2021-05-19 14:32:29 +00:00
Zimuzo Ezeozue
58b0886913 Merge "Improve secondary volume mounts on user switch" into sc-dev 2021-05-19 14:31:11 +00:00
Antoan Angelov
9530b4a0a7 Merge "SettingsLib logic for updated ActionDisabledByAdminDialogHelper" into sc-dev am: 392fd855a4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14550423

Change-Id: Icc59d6ebb2a64d064033b7298bd53c63e6a2b70d
2021-05-19 14:06:58 +00:00
Antoan Angelov
392fd855a4 Merge "SettingsLib logic for updated ActionDisabledByAdminDialogHelper" into sc-dev 2021-05-19 13:50:07 +00:00
Caitlin Cassidy
fadfb0bdad Merge "[Device Controls] For custom icons, keep the tint the icon comes with." into sc-dev am: 48f518618e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14589388

Change-Id: I332f67eb102157666ab11945e2117c803335d518
2021-05-19 13:33:55 +00:00
Caitlin Cassidy
48f518618e Merge "[Device Controls] For custom icons, keep the tint the icon comes with." into sc-dev 2021-05-19 13:16:44 +00:00
TreeHugger Robot
d20b62d8e2 Merge "Add hasExternalControl hidden API to Vibrator" into sc-dev am: c5efbf1dba
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14621133

Change-Id: I6c5761883c9491c9984abebe0b4b882a5c1755f1
2021-05-19 12:59:07 +00:00
TreeHugger Robot
c5efbf1dba Merge "Add hasExternalControl hidden API to Vibrator" into sc-dev 2021-05-19 12:50:27 +00:00
Junyu Lai
0069e7e222 Merge changes I3ba50cbd,I970ee365 into sc-dev am: b987babf5e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14562500

Change-Id: Ibd0f0edb5c9666dd32ef42168d41111f2cf24d70
2021-05-19 12:41:44 +00:00
junyulai
cfea2411e2 [FUI27] Fix internal naming of notifyNetworkStatus am: 0c7c578433
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14562499

Change-Id: I4671975978f6f07b32a7e7b4507f82600d454739
2021-05-19 12:41:40 +00:00
Junyu Lai
b987babf5e Merge changes I3ba50cbd,I970ee365 into sc-dev
* changes:
  [FUI29] Migrate ConnectivityService to use getAllNetworkStateSnapshots
  [FUI27] Fix internal naming of notifyNetworkStatus
2021-05-19 12:36:03 +00:00
Beverly Tai
5283548af8 Merge "onFinished, update scrim based on lastState" into sc-dev am: 161bec7e1d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14624413

Change-Id: I32b10ed95bf568ac80590ce2f4baa025e0a5164a
2021-05-19 12:31:52 +00:00
TreeHugger Robot
7c31aa3826 Merge "Changed behavior of DPMS.setLocationEnabled() for automotive." into sc-dev am: cf2f6ff89a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14525263

Change-Id: I6c73265fa86148bda8fc44047fa6c6b86b6023cb
2021-05-19 12:31:42 +00:00
Beverly Tai
161bec7e1d Merge "onFinished, update scrim based on lastState" into sc-dev 2021-05-19 12:20:38 +00:00
TreeHugger Robot
cf2f6ff89a Merge "Changed behavior of DPMS.setLocationEnabled() for automotive." into sc-dev 2021-05-19 12:15:04 +00:00
Junyu Lai
4a133d34d9 Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present" into sc-dev am: 5e23456875
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14550548

Change-Id: I7239024fd28b3faf9feaf8bc2d6ba6d63ab8c5db
2021-05-19 12:05:23 +00:00
Junyu Lai
5e23456875 Merge "[VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present" into sc-dev 2021-05-19 11:31:39 +00:00
Anna Zappone
2dd509b218 Merge "UX polish updates" into sc-dev am: 0c94c3f6a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14601814

Change-Id: I8c73a772267ffcfe4e7a7483f1e0818bcee383a0
2021-05-19 10:07:12 +00:00
junyulai
106c3bc56f [VCN21] Do not add NOT_VCN_MANAGED capability if specifier is present
Test: atest NetworkRequestTest#testBypassingVcn
Fix: 176939355
Fix: 188597540
Merged-In: I98dd3f4652dc067eb5c4666e952db6c854bcbb10
Change-Id: I98dd3f4652dc067eb5c4666e952db6c854bcbb10
  (cherry-picked from aosp/1705390)
2021-05-19 09:52:03 +00:00
Anna Zappone
0c94c3f6a0 Merge "UX polish updates" into sc-dev 2021-05-19 09:46:13 +00:00
Ryan Mitchell
6c782479b4 Add <staging-public-group> tags to SV2
To prevent apps from having to respin atomically with SDK finalization,
<staging-public-group> must be created with type ids that do not
overlap the public resource id namespace.

For SV2, start allocating type ids at 0xff and decrement to get
additional type ids.

Bug: 188463919
Test: builds
Change-Id: Ia7835d04d988127d061d3a454b8391294346a915
Merged-In: Ia7835d04d988127d061d3a454b8391294346a915
2021-05-19 09:08:39 +00:00
Neil Fuller
26cf681ae9 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: I019482b2e976611c16dd58be4038e76c4e0fd576
2021-05-19 08:38:47 +00:00
Marie Matheson
31b5f50eff 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: Ib3dc14ff02f9a21a904176dd33fffda26e50e42f
2021-05-19 08:38:03 +00:00
Remi NGUYEN VAN
3475215fd6 Merge "Move config_apf* resources to NetworkStack" into sc-dev am: 743563b8c3
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14622500

Change-Id: I2493282fac852b98b992a7ea708438e8a8a2a9e4
2021-05-19 08:37:43 +00:00
Robert Horvath
8c341488fc 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: I8fc10bb55dfbb7323372ff64daccc42bcfdb531c
2021-05-19 08:36:28 +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
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
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
4d225a0e3c Merge "Update bubble user education screens to use proper colors" into sc-dev 2021-05-19 04:36:06 +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
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
lesl
559d4ec575 Add metered filter for API: buildTemplateCarrier
This CL modifies NetworkTemplate#buildTemplateCarrier to force on
metered carrier network and rename to buildTemplateCarrierMetered.
This method was introduced recently and has no callers.

This method will be used in Settings and NetworkPolicyManagerService
to display and manage data usage on carrier metered networks.

Settings/NetworkPolicyManagerService will use it instead of the existing
method buildTemplateMobileAll method, which only matches metered networks.
That code will change from matching metered mobile networks to matching
metered carrier networks.

Note: The carrier metered network includes metered mobile network and
metered "merged carrier wifi network" that is a specific cerrier wifi network
which provides the same user experience as mobile.

Bug: 176396812
Test: atest -c NetworkTemplateTest
Change-Id: I7196d62bb60844458a6c4b1d94e2baccb71e15cd
Merged-In: I7196d62bb60844458a6c4b1d94e2baccb71e15cd
2021-05-19 02:53:39 +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
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
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
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
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