315693 Commits

Author SHA1 Message Date
Jason Monk
5881209cac Merge "Make QS light" into oc-dev
am: 755138bb1c

Change-Id: I2a76725f4fb4edb0fa478619b28498c9bfc490ac
2017-04-12 20:50:32 +00:00
Adam Lesinski
d11c5510b1 OMS: Fix bug where overlay settings wouldn't persist
The dead user check was using a List.removeAll() call to find
the subset of users that have been removed and need deleting
from the overlay settings. The target class, UserInfo, does not
implement equals(), therefore no UserInfos would be removed from
the set and all user IDs would be candidates for deleting.

This change avoids the UserInfo class entirely and manipulates userIds.

Bug: 36099320
Test: Pick a theme and reboot.
Test: Theme should still be applied on next boot.
Change-Id: I1ee57839515460bf578664dfe1bd67df7d10d041
2017-04-12 13:49:13 -07:00
TreeHugger Robot
755138bb1c Merge "Make QS light" into oc-dev 2017-04-12 20:43:16 +00:00
Wale Ogunwale
9c64cb6a72 Dump controller for AppWindowToken
To help with debugging.

Bug: 36097078
Test: N/A
Change-Id: I72108b918d839b67efe8b8eed65a33775bd94dbc
2017-04-12 13:39:59 -07:00
Kang Li
4762931cf7 resolve merge conflicts of 40afdf05b5ba to master
Test: I solemnly swear I tested this conflict resolution.
Change-Id: Ic31b6858fb0850b36bb6751c6bd5ef18675ee277
2017-04-12 20:36:07 +00:00
Bill Yi
8c53d24399 Merge "Import translations. DO NOT MERGE" into oc-dev
am: 88ab6c1304  -s ours

Change-Id: I5f4ab216d538b793f1b9437a9e44320e2412b9cc
2017-04-12 20:27:30 +00:00
Bill Yi
88ab6c1304 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-12 20:19:39 +00:00
Todd Kennedy
455b742bb6 Merge "Allow instant app resolution for any user" into oc-dev
am: e7b806e9d2

Change-Id: Ic1dbc09e11aab6aacf66e0106274281534515b2d
2017-04-12 20:00:09 +00:00
Seigo Nonaka
fa4b862518 Merge "Update Typeface.Builder API to reflect API feedback." into oc-dev
am: 1e924df63e

Change-Id: I484cd07fb67b40b54d7ad4b1ae7324a0d370ed6a
2017-04-12 19:55:52 +00:00
Jesse Evans
3d1676cfc4 Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev
am: 684b5381e9

Change-Id: I3be91519cbe8b7c3cef474923a30927504e68642
2017-04-12 19:52:07 +00:00
TreeHugger Robot
e7b806e9d2 Merge "Allow instant app resolution for any user" into oc-dev 2017-04-12 19:45:55 +00:00
Jaewan Kim
e391fe76e8 Merge "Add documentation for 'am start-foreground-service'" into oc-dev
am: e7ce1d40e1

Change-Id: I4202bc13102f35b8d3cd4b328c5a1de49b7cb08e
2017-04-12 19:45:21 +00:00
Seigo Nonaka
1e924df63e Merge "Update Typeface.Builder API to reflect API feedback." into oc-dev 2017-04-12 19:39:50 +00:00
TreeHugger Robot
684b5381e9 Merge "Rename WEB_ACTION_ENABLED to INSTANT_APPS_ENABLED" into oc-dev 2017-04-12 19:39:16 +00:00
TreeHugger Robot
e7ce1d40e1 Merge "Add documentation for 'am start-foreground-service'" into oc-dev 2017-04-12 19:37:26 +00:00
Julia Reynolds
bf3f4dd7f5 Merge "Clear calling identity before verifying listeners" into oc-dev
am: 43dd3ba3c4

Change-Id: I05a728d069a06f4ec36dff79db022407f4d3504c
2017-04-12 19:24:55 +00:00
Casey Burkhardt
79bc410133 Merge "Improved multiuser support for A11y button/Magnification" into oc-dev
am: 9aa64e6cfa

Change-Id: Ia7a56ce9ddc39d1e9e5d814d593dba96c95ae957
2017-04-12 19:14:04 +00:00
Julia Reynolds
43dd3ba3c4 Merge "Clear calling identity before verifying listeners" into oc-dev 2017-04-12 19:13:05 +00:00
Robert Carr
414ebc6ac8 ViewRoot: More surgically fix child-life time.
A more targeted version of "ViewRootImpl: Fix child lifetime".
In this version we avoid hijacking the window visibility callback
and introduce a new path.
Our contract has been that at any time after returning from
onStop, the WindowManager may destroy the clients Surface. We
see in setWindowStopped, we set the stopped state on the hardware
renderer in order to prevent further use of the Surface. However
there is nothing synchronously dispatching this change to child views
and so SurfaceView is not necessarily informed to release it's Surface
in time. Typically SurfaceView will be informed through the
onWindowVisibilityChanged callback. The signal producing this
is emitted from SystemServer prior to onStop but has to pass
through the clients handler thread. It seems this has always been
broken, and we have always had intermittent reports of EGL_BAD_ALLOC
scenarios. I speculate that elevation of WindowManager scheduling during
app close scenarios is perhaps making this more severe, as it seems to
ensure the WindowManger will win the race to destroy the Surface before
the client handler thread process onWindowVisibilityChanged (unless
the FIFO timeout is surpassed).

Test: Put Chrome in PiP. Turn screen off. No Crash!
Bug: 36561071
Change-Id: I9233ba8151c7f577b1d1044afc0c2ac3a65be4b4
2017-04-12 12:08:01 -07:00
Julius D'souza
0a8ecc6886 DO NOT MERGE: Remove the development privelege level from SET_DISPLAY_OFFSET.
Bug: 36515029
Test: the build still works.
Change-Id: I39ae2c55b6b2b0d6547f75f4ef06e62e3e5f0b84
(cherry picked from commit 8e9ea907448c49f573dd045707e37dd14efdf152)
2017-04-12 12:06:50 -07:00
Casey Burkhardt
9aa64e6cfa Merge "Improved multiuser support for A11y button/Magnification" into oc-dev 2017-04-12 19:04:18 +00:00
Svet Ganov
400f10fe50 Merge "Fill UI polish" into oc-dev
am: c9a83326c2

Change-Id: Iafae2e819d836a1bda463898695f2fbf9334299b
2017-04-12 19:03:26 +00:00
Julius D'souza
43791354c7 Merge "Remove the development privelege level from SET_DISPLAY_OFFSET." 2017-04-12 19:00:40 +00:00
TreeHugger Robot
c9a83326c2 Merge "Fill UI polish" into oc-dev 2017-04-12 18:54:32 +00:00
Mady Mellor
e5c8b231eb Merge "Don't offer snooze for foreground service notifications" into oc-dev am: 8f395a16fb
am: cb5b58d990

Change-Id: If20d6cef28c3b79fe4577b0ea82fb6479a8dc163
2017-04-12 18:46:59 +00:00
Charles He
066b8d8b5f Merge "Disallow direct-boot aware activities to bypass work lock" into oc-dev am: 9f074e2224
am: fd7eb11a2b

Change-Id: I221b89a01108e1d932a612f45b81798cebbaf66b
2017-04-12 18:45:49 +00:00
Salvador Martinez
ab932147aa Added strings for thermal shutdown warning
Strings for thermal shutdown warning were missing
so this CL adds them and a proto message value.

Test: SysUI tests still pass
Bug: 30994946
Change-Id: Ifd0b26248c2ebae5bcf32ecbea2566c14be7dc32
2017-04-12 18:41:35 +00:00
Kang Li
40afdf05b5 Merge "Updates reportChooserSelection to be synchronized with queryUsageStats in UsageStatsService, to fix a flaky test." into oc-dev
am: 1f477fb270

Change-Id: Ibab9026c9330218e459091f5d53505a64c039ce8
2017-04-12 18:41:21 +00:00
Mady Mellor
cb5b58d990 Merge "Don't offer snooze for foreground service notifications" into oc-dev
am: 8f395a16fb

Change-Id: Ieb5ea626ed2fb83a4959f85be097d0f5563e1471
2017-04-12 18:40:12 +00:00
nharold
a237a34085 Merge changes from topic 'ipsec-api-tweaks' am: fddf677b8b
am: 176bfb58c6

Change-Id: I056e52c4c3bf41ffaf482ebaf4c7b14a9091f3ca
2017-04-12 18:39:15 +00:00
Nathan Harold
99c50add4f IpSecManager and IpSecAlgorithm API Tweaks am: 6045429b35
am: 9c2428ad4d

Change-Id: I6f7e2011a273d10386b72391d12a0ce55f18ffd7
2017-04-12 18:37:23 +00:00
Bill Yi
bc4b6de277 Merge "Import translations. DO NOT MERGE" into oc-dev am: 2d1fb47916 -s ours
am: d5a6453cba  -s ours

Change-Id: I9bdae2592409be360b274dd45da6d3cfb61e6ab2
2017-04-12 18:37:18 +00:00
Charles He
fd7eb11a2b Merge "Disallow direct-boot aware activities to bypass work lock" into oc-dev
am: 9f074e2224

Change-Id: Ie57c07ed9caee3ee66847cbedc4b10b79bcd9abe
2017-04-12 18:36:10 +00:00
Siyamed Sinir
e1f3987ddb Merge "Do not enforce paragraph constraint for copy ctr" into oc-dev am: 37bfd57ead
am: fcbc2800db

Change-Id: I1abf46b2204d6c2e382a2aefcf02bbab47fcdf25
2017-04-12 18:33:39 +00:00
TreeHugger Robot
1f477fb270 Merge "Updates reportChooserSelection to be synchronized with queryUsageStats in UsageStatsService, to fix a flaky test." into oc-dev 2017-04-12 18:33:23 +00:00
nharold
176bfb58c6 Merge changes from topic 'ipsec-api-tweaks'
am: fddf677b8b

Change-Id: I0c0812164e8fa4b36fd43f00b7388d4c0cc337f1
2017-04-12 18:29:04 +00:00
Mady Mellor
8f395a16fb Merge "Don't offer snooze for foreground service notifications" into oc-dev 2017-04-12 18:27:29 +00:00
Nathan Harold
9c2428ad4d IpSecManager and IpSecAlgorithm API Tweaks
am: 6045429b35

Change-Id: I93d58f64834e5a4c7bc1bf03a5baf2eb5364a36d
2017-04-12 18:27:09 +00:00
Bill Yi
d5a6453cba Merge "Import translations. DO NOT MERGE" into oc-dev
am: 2d1fb47916  -s ours

Change-Id: Ie7184d013593bad3c8b70974917236fd1717bd6a
2017-04-12 18:26:14 +00:00
Charles He
9f074e2224 Merge "Disallow direct-boot aware activities to bypass work lock" into oc-dev 2017-04-12 18:25:49 +00:00
Jiaquan He
fb62ecb220 Fix broken CTS tests.
The default focus highlight should be necessary when the view is
attached to window.

Test: cts-tradefed run singleCommand cts --skip-device-info
--skip-preconditions --abi armeabi-v7a -m CtsViewTestCases -t
android.view.cts.ViewTest
Test: cts-tradefed run singleCommand cts --skip-device-info
--skip-preconditions --abi armeabi-v7a -m CtsWidgetTestCases -t
android.widget.cts.MediaControllerTest
Bug: 37082416

Change-Id: I5d6b0c00b5ba03c8f62e4f71be9336823a73134b
2017-04-12 18:25:26 +00:00
Jiaquan He
8062949ece Draw a default focus highlight if needed.
This commit draws a default highlight for a focused
View if it's detected to have no state_focused defined
and its useDefaultFocusHighlight attribute is true.

When we detect a default highlight is needed, we show it
on top of the view to. Once we detect that it's no longer
needed, we remove it.

Test: Check that views without a focused_state in its
state spec have a default highlight when they get focused.
Bug: 35096940

Change-Id: Ifbe4bb9e1297d98845314e24d8b758f14e5987a9
2017-04-12 18:24:52 +00:00
Jiaquan He
b7daaf8b5f Add a public API defaultFocusHighlightEnabled.
This commit adds a public API to turn on/off default
focus highlights. When a focused View is detected to
have no state_focused defined, we can use this API to
decide wether we should show a default highlight for it.

Test: cts-tradefed run singleCommand cts --skip-device-info
--skip-preconditions --abi armeabi-v7a -m CtsViewTestCases
-t android.view.cts.View_DefaultFocusHighlightTest
Bug: 35096940

Change-Id: I76b45d6bf5761641a0ed7f4d0b04cb325ed72b52
2017-04-12 18:23:43 +00:00
Siyamed Sinir
fcbc2800db Merge "Do not enforce paragraph constraint for copy ctr" into oc-dev
am: 37bfd57ead

Change-Id: I9ccf940b5e2d47bbb29fcb12bea3c20d2ea9ae69
2017-04-12 18:17:57 +00:00
TreeHugger Robot
2d1fb47916 Merge "Import translations. DO NOT MERGE" into oc-dev 2017-04-12 18:17:56 +00:00
Vladislav Kaznacheev
f619ead8d3 Revert "Make scrollbarSize in Material Design theme configurable"
This reverts commit 98329f4da372e2ab00565b88df785620856cfb65.

Bug: 35432058
Test: android.view.cts.ViewTest passes
Change-Id: I4c76450a47b581a8237108180806845f5f66ac39
2017-04-12 11:16:51 -07:00
Dianne Hackborn
24f3cd4ead Merge "Add new "work queue" feature to JobScheduler." into oc-dev am: 0a0a63c8b1
am: cba1893400

Change-Id: I67e7438a5563192391366683695c7fc4514a5bd6
2017-04-12 18:14:58 +00:00
nharold
fddf677b8b Merge changes from topic 'ipsec-api-tweaks'
* changes:
  Add FileDescriptor Versions of applyTransportModeTransform()
  IpSecManager and IpSecAlgorithm API Tweaks
2017-04-12 18:13:57 +00:00
Powei Feng
a900f39a9f Merge "Revert "Transition from Activity to Broadcast for TV Search"" into oc-dev am: f63cb49b15
am: c27853471e

Change-Id: Ib62faa847c91b8629ee9c67fa7efb020b56dae2d
2017-04-12 18:11:51 +00:00
Siyamed Sinir
37bfd57ead Merge "Do not enforce paragraph constraint for copy ctr" into oc-dev 2017-04-12 18:09:58 +00:00