Commit Graph

13280 Commits

Author SHA1 Message Date
Benedict Wong
34417aafed Merge changes I97ba5903,Icd80b368 into rvc-dev am: 7df7129b40 am: 0a1afc6dbc
Change-Id: I7f211c7a4d383523e574c8ce969ee28687a42929
2020-03-31 17:36:58 +00:00
Benedict Wong
7df7129b40 Merge changes I97ba5903,Icd80b368 into rvc-dev
* changes:
  Make VpnProfile.maxMtu default value match Ikev2VpnProfile
  Add negotiated DNS servers to VPN config
2020-03-31 16:52:04 +00:00
Benedict Wong
399c1365c2 Make VpnProfile.maxMtu default value match Ikev2VpnProfile
This change corrects the VpnProfile's maxMtu defaults to match that of
the Ikev2VpnProfile. 1400 is too high as a default, and Settings will
run into an issue here quite often.

Bug: 152573931
Test: FrameworksNetTests passing
Change-Id: I97ba5903b3cc1ed6a21c706ed3d78bd8ecbeee0c
Merged-In: I97ba5903b3cc1ed6a21c706ed3d78bd8ecbeee0c
(cherry picked from commit d0a44f49df)
2020-03-30 22:59:17 -07:00
Antoan Angelov
f6be54216a Merge "Show empty state screens in order of priority." into rvc-dev am: 9238e32a16 am: 571c0e4ea3
Change-Id: Ia7f2f0f9f56392dace7e0b12e4bc2c9891e258a6
2020-03-30 20:05:03 +00:00
TreeHugger Robot
444f200f86 Merge "Fix flickers when changing control" into rvc-dev am: c322ed2173 am: 162040e358
Change-Id: Id54a95cfda897b0c88c02959ada4997ec4b69308
2020-03-30 18:58:25 +00:00
TreeHugger Robot
546feccda1 Merge "Fix DecorView error about non-visual context" into rvc-dev am: 8927986f3b am: 64b0a51b1b
Change-Id: I60cf98662d85f780d01ee0f02b1587193bff2752
2020-03-30 18:51:42 +00:00
arangelov
27608554dc Show empty state screens in order of priority.
To improve the user experience, this CL changes the order
in which the empty state screens are shown:
1. (highest priority) cross-profile disabled by policy
2. no apps available
3. (least priority) work is off

The intention is to prevent the user from having to turn
the work profile on if there will not be any apps resolved
anyway.

Fixes: 150936283
Test: atest ResolverActivityTest
Test: atest ChooserActivityTest
Test: manually tested each possible combination of edge cases
(work profile off, no apps found, cross-profile intents disabled)

Change-Id: Ic86c90bdda93cf731df2133890081b5583ef35e1
2020-03-30 17:00:09 +00:00
TreeHugger Robot
c322ed2173 Merge "Fix flickers when changing control" into rvc-dev 2020-03-30 11:45:54 +00:00
TreeHugger Robot
8927986f3b Merge "Fix DecorView error about non-visual context" into rvc-dev 2020-03-30 07:20:00 +00:00
Charles Chen
828c498904 Fix DecorView error about non-visual context
This error showed because DecorContext uses application context
to get WindowManager. This CL changes to use context to do so.
Also rename fields in DecorContext because we actually can pass any
context in "activityContext."
Note that most cases of misuse WindowManager is covered by [1].
We can guarantee that WindowManager can be obtained by mContext.

[1]:I52aa0c4a02b7da018aa10f1473e1616564296e41

Bug: 150632074
Test: manual - enable strict mode and check the error log not shown.
Test: atest DecorContextTest
Change-Id: I558a2819e5928a802b897a130cfc3262115b9935
2020-03-30 11:24:48 +08:00
Ram Muthiah
ee7f81aca9 Merge "Revert "Do not mount whitelisted package in storage data and obb dirs"" into rvc-dev am: 40383b0f2b
Change-Id: I32cc4880b7017114f9207e73e2c6087679efe637
2020-03-28 02:58:05 +00:00
Ram Muthiah
40383b0f2b Merge "Revert "Do not mount whitelisted package in storage data and obb dirs"" into rvc-dev 2020-03-28 02:47:38 +00:00
Ram Muthiah
7929c5dced Revert "Do not mount whitelisted package in storage data and obb dirs"
This reverts commit 2cd955e79d.

Reason for revert: Bisect indicates this change causes b/152550025

Bug: 152550025
Bug: 151218156
Change-Id: I350bfc44d2137416bd23591fffbe4284e1462a91
2020-03-28 02:39:58 +00:00
Jorim Jaggi
49b9f6c67c Fix flickers when changing control
- Do not reset system bar visibility when changing control target
- Do not apply hide transaction when gaining control, because that
may result in a single-frame flicker because it will conflict with
the animation
- Check requestedVisible instead of InsetsState.isVisible in
DecorView to avoid drawing the bar backgrounds transiently
- Abort transient mode when focused win changes.

Bug: 150195782
Bug: 152014877
Change-Id: I8bc9cdc89ce7364984ade8146e12a706ad5e8edb
2020-03-27 20:11:31 +01:00
Jorim Jaggi
2556c5f041 Merge "Make caption a insets source" into rvc-dev am: ac30aafd29
Change-Id: I5c486a30fe0828cfef21e2804a6dd9e3c4415d85
2020-03-27 17:42:41 +00:00
Jorim Jaggi
ac30aafd29 Merge "Make caption a insets source" into rvc-dev 2020-03-27 17:27:01 +00:00
TreeHugger Robot
f47351d42d Merge "Fix the duplicate components in edit shortcut menu list." into rvc-dev am: 22a0b13e5d
Change-Id: I69e00001eb1e3fbe7ce416eb01a83dc0a2503fb7
2020-03-27 01:34:06 +00:00
TreeHugger Robot
22a0b13e5d Merge "Fix the duplicate components in edit shortcut menu list." into rvc-dev 2020-03-27 01:33:38 +00:00
Andrii Kulian
5c13904c68 Merge "Report bounds instead of size in WindowMetrics" into rvc-dev am: 363edf449a
Change-Id: I80833bd0256a350662a90c2c4f73b9d1fee9273e
2020-03-27 01:16:24 +00:00
Andrii Kulian
363edf449a Merge "Report bounds instead of size in WindowMetrics" into rvc-dev 2020-03-27 01:08:37 +00:00
TreeHugger Robot
27fcb96242 Merge "Hide empty state icon and button in landscape mode." into rvc-dev am: 5e8e9e5f1a
Change-Id: I8e58e9cc4af96deebe46f01881362c3cc6ea92c0
2020-03-26 12:21:16 +00:00
TreeHugger Robot
5e8e9e5f1a Merge "Hide empty state icon and button in landscape mode." into rvc-dev 2020-03-26 12:19:56 +00:00
TreeHugger Robot
bdc1efb903 Merge "Do not mount whitelisted package in storage data and obb dirs" into rvc-dev am: e5d60ed552
Change-Id: I0cddbfd4a280ed2cfd8d13ea62c1c24ae6e2f2ad
2020-03-26 11:13:55 +00:00
TreeHugger Robot
e5d60ed552 Merge "Do not mount whitelisted package in storage data and obb dirs" into rvc-dev 2020-03-26 11:01:12 +00:00
Yunfan Chen
fae0aeabe0 Make caption a insets source
This patch introduced setCaptionInsets, and set the Insets in
ViewRootImpl when dispatch the insets if there's a caption.

Modification is made in Window and DecorCaptionView to make caption
overlay with the app content, and pass the value to ViewRootImpl to
apply when dispatch. It is necessary to trigger a dispatch when caption
enabled status chanaged, otherwise sometimes it will not be updated.
Because caption is now updated locally on the client side.

Some old logic to deal with the overlay caption without insets are
removed, including the touch event dispatch override, the color
override.

Bug: 134531136
Test: go/wm-smoke
Test: Manually change the value in dispatchApplyInsets, can observe a
      blank content area when there's a caption bar.
Test: atest InsetsStateTest
Test: atest InsetsControllerTest
Change-Id: I356344a13c8569512d8f51f7ea19a5603f778252
2020-03-26 06:58:07 +00:00
Peter_Liang
ee74b0ea90 Fix the duplicate components in edit shortcut menu list.
Root cause: After android R, will have new feature about AccessibilityShortcutInfo let developers to apply that in their service. But if the service have the both features that AccessibilityServiceInfo and AccessibilityShortcutInfo, the framework will make AccessibilityShortcutInfo priority higher than AccessibilityServiceInfo.

Goal: Filter tagert list in advance.

Bug: 152464317
Test: manual test
Change-Id: I93d2886ee686c939b8b6c4cf67b045392e9d9b51
2020-03-26 12:27:21 +08:00
Menghan Li
835bda5744 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev am: fea8d184c2
Change-Id: I276c3ab248480a37ae4905fc364a3e8325be0d7e
2020-03-26 00:38:20 +00:00
Menghan Li
fea8d184c2 Merge "Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)" into rvc-dev 2020-03-26 00:21:50 +00:00
Ricky Wai
2cd955e79d Do not mount whitelisted package in storage data and obb dirs
We now pass 2 booleans from AM to zygote about:
- If CE and DE data dirs need to be mounted
- If storage data and obb dirs need to be mounted

And also, separate whitelisted package from same uid packages, as same
uid packages do not need to be mounted in storage data and obb dir case,
it's needed to be mounted for CE and DE data dirs only. Otherwise
whtelisted packages will also be mounted in storage data and obb dirs,
which apps should not have access to it.

Bug: 151218156
Test: atest AdoptableHostTest
Change-Id: If7c20a7ed3b845d8657c937469161cb7ed3da07f
2020-03-25 16:40:46 +00:00
arangelov
c5fb839d31 Hide empty state icon and button in landscape mode.
This is to accommodate for the case when the user
has max font size and max display size. The rest of
the empty state screen won't fit unless we hide the
icon and "Turn on work" button.

Test: manual
Fixes: 149817494
Fixes: 152274446
Change-Id: I95b90461ac36b4bbf6b0e4c4dd223e941d8c75cb
2020-03-25 13:48:10 +00:00
TreeHugger Robot
af4ed634cf Merge "Fix calculation of the collapsible height" into rvc-dev am: 5cb264d9df
Change-Id: I5759366868bdd770959f20ac0c6cf04031f8b11f
2020-03-25 13:32:05 +00:00
TreeHugger Robot
5cb264d9df Merge "Fix calculation of the collapsible height" into rvc-dev 2020-03-25 13:25:56 +00:00
menghanli
390f8f9be9 Accessibility Service & Shortcut Redesign - Remove “volume key shortcut” setting (5/n)
- Target to fix migration issue to support a user revoked the accessibility shortcut before upgrading to R, but wants to to apply new hardware shortcut design in R.
- The switchbar of accessibility_shortcut_enabled was removed in (1/n), so we should also remove related checker in controller.

Bug: 142529032
Test: atest AccessibilityShortcutControllerTest
Change-Id: I48f8d88c4192e894b9e210221e5dc7e701344623
2020-03-25 07:46:41 +08:00
arangelov
685a1766c2 Fix calculation of the collapsible height
Test: manual
Fixes: 146654842
Change-Id: Ia63fcbb654218a2972596f19c409028db71dab79
2020-03-24 13:11:39 +00:00
Andrii Kulian
0be1d67b68 Report bounds instead of size in WindowMetrics
Use case: Jetpack WM will use them to get the location of windows on
screen and compute the display feature positions in window coordinate
space.

Bug: 150908045
Test: atest FrameworksCoreTests:WindowMetricsTest
Test: atest CtsWindowManagerDeviceTestCases:WindowMetricsTests
Change-Id: Ia08950cd5df35971408e8b17bb27d97d29d0ab9b
Exempt-From-Owner-Approval: API change
2020-03-24 17:05:50 +08:00
TreeHugger Robot
0ae44e1b8f Merge changes I3f220769,I4c9af08c into rvc-dev am: c1b17d656d
Change-Id: I90300d507761b84191238a339a3f49273b3de3ac
2020-03-24 04:43:31 +00:00
Selim Cinek
d00d01a298 Fixed the coloring of the background of the conversation icons
Since we moved it to an ImageView, the background tinting didn't work anymore.

Bug: 150905003
Test: add conversation in darkmode
Change-Id: I3f22076926c130f22445d06405dff75ac8fdbb0a
2020-03-24 02:28:57 +00:00
Selim Cinek
bf322ee05a Add back the conversation icon in the expanded view
The conversation icon now shrinks instead of disappearing
as does the face-pile. This also requirements some adjustments
for when the conversation is inside a group since the app
name disappears there.

Bug: 150905003
Test: add group conversations observe layout
Change-Id: I4c9af08cc6adbb1deea1b750a4fd20eaa06f087d
2020-03-24 02:28:37 +00:00
Antoan Angelov
55007c4e71 Merge "Center the work tab empty state spinner inside the empty state view." into rvc-dev am: 8c6b17b1ad
Change-Id: I9428292e142d3b99a8f14237bb92ab86abb240d7
2020-03-23 17:13:47 +00:00
Antoan Angelov
8c6b17b1ad Merge "Center the work tab empty state spinner inside the empty state view." into rvc-dev 2020-03-23 16:56:51 +00:00
Hui Yu
56deaab4c8 Merge "Update AppOps & UsageStats when app widget tapped." into rvc-dev am: aa3d42b129
Change-Id: I415deec0a9f7b168fc6ccdd5878be4fd57d53a58
2020-03-21 20:10:24 +00:00
Hui Yu
3dc45fbc57 Update AppOps & UsageStats when app widget tapped.
When the app widget on the launcher is tapped on:
1. Update AppOps. AppOps treats the underlying app as foreground so the app can get while-in-use
permission.
2. Report a USER_INTERACTION event to UsageStats so UsageStats can
update mLastTimeUsed and mLastTimeVisible of this package.

Bug: 149043079
Test: manual test, tapped on a widget.
Change-Id: Ic8c91190881cf5dcf89f0f72cfd410b0c2e86bf6
2020-03-21 08:36:54 -07:00
Selim Cinek
f2ec0f0cc0 Merge "Improved the transitions and layout of the app name in conversations" into rvc-dev am: 5568ff4a4c
Change-Id: I3191df59e40fa29ce8b058a7482a42b810b20e57
2020-03-21 01:14:43 +00:00
Selim Cinek
5568ff4a4c Merge "Improved the transitions and layout of the app name in conversations" into rvc-dev 2020-03-21 01:04:00 +00:00
TreeHugger Robot
0ebdcb6c18 Merge "Add application name to expanded conversation view" into rvc-dev am: eb0d8bff9b
Change-Id: I00a54a43411ab53a1fe0ccca11456d713c86c03e
2020-03-21 00:55:00 +00:00
TreeHugger Robot
eb0d8bff9b Merge "Add application name to expanded conversation view" into rvc-dev 2020-03-21 00:53:04 +00:00
TreeHugger Robot
89a4b908a6 Merge "Add importance ring around conversation badge" into rvc-dev am: fd8d9650ac
Change-Id: Ibfac285196b55e7cfec00cebdfd722ed8eff9f53
2020-03-21 00:48:23 +00:00
TreeHugger Robot
fd8d9650ac Merge "Add importance ring around conversation badge" into rvc-dev 2020-03-21 00:46:13 +00:00
TreeHugger Robot
39d40ca27f Merge "Made image messages display externally in the layout" into rvc-dev am: 4bd7796e1d
Change-Id: Ibaf80e60c314d44c3630ee3a537099f882c09381
2020-03-20 22:26:30 +00:00
TreeHugger Robot
4bd7796e1d Merge "Made image messages display externally in the layout" into rvc-dev 2020-03-20 22:20:28 +00:00