Commit Graph

75824 Commits

Author SHA1 Message Date
Seigo Nonaka
05c4205a34 Merge "Change justification parameter from boolean to int." into oc-dev am: 04fc05cd66
am: c81f06186b

Change-Id: I156f5acc74bd7bda77217698dd3756e2c729a035
2017-04-04 18:45:30 +00:00
Seigo Nonaka
c81f06186b Merge "Change justification parameter from boolean to int." into oc-dev
am: 04fc05cd66

Change-Id: Ie4fcc93178abfb850068612b02cf3c82dba71377
2017-04-04 18:39:06 +00:00
TreeHugger Robot
4e4252354d Merge changes from topics 'KeyboardFocusHighlight_mUseDefaultFocusHighlight', 'KeyboardFocusHighlight', 'KeyboardFocusHighlight_DetectUnhandled'
* changes:
  Draw a default focus highlight if needed.
  Add a public API defaultFocusHighlightEnabled.
  Detect unhandled keyboard focused state.
2017-04-04 18:38:21 +00:00
TreeHugger Robot
04fc05cd66 Merge "Change justification parameter from boolean to int." into oc-dev 2017-04-04 18:29:58 +00:00
Robert Carr
6390144d2a Merge "Request layout when updating child layout params." into oc-dev am: b841b4e919
am: d190369319

Change-Id: I8bf5a74fa0f67636e04fcb7cef269eab4cbd83f6
2017-04-04 17:53:28 +00:00
Kang Li
8b0979666a Merge "Add a service to rank apps for ResolverActivity." into oc-dev
am: 6df90fa53b

Change-Id: I667b1f9d07305d58f921280f8b8fe9ede0aeea1e
2017-04-04 17:51:03 +00:00
Robert Carr
d190369319 Merge "Request layout when updating child layout params." into oc-dev
am: b841b4e919

Change-Id: Iaaa3317b0dc8c6e320aa4a8b2677bcc9f1735234
2017-04-04 17:46:16 +00:00
Kang Li
6df90fa53b Merge "Add a service to rank apps for ResolverActivity." into oc-dev 2017-04-04 17:42:32 +00:00
TreeHugger Robot
b841b4e919 Merge "Request layout when updating child layout params." into oc-dev 2017-04-04 17:36:48 +00:00
Seigo Nonaka
c802751704 Merge "Reorganize font enumeration API." into oc-dev am: 2ac9698271
am: de5fa6b3d8

Change-Id: I72a02f3f681b3b5f82cffc317fe0668e842464fe
2017-04-04 17:04:40 +00:00
Seigo Nonaka
de5fa6b3d8 Merge "Reorganize font enumeration API." into oc-dev
am: 2ac9698271

Change-Id: Ie9bdcdb8d5997db421b783475e1058027cc4bb6f
2017-04-04 16:56:29 +00:00
TreeHugger Robot
2ac9698271 Merge "Reorganize font enumeration API." into oc-dev 2017-04-04 16:49:56 +00:00
Narayan Kamath
1163568d7c Merge "Properly guard access to CloseGuard in finalizers." 2017-04-04 12:27:02 +00:00
Jorim Jaggi
f55392ccaa Merge "Schedule window animations at vsync-sf" into oc-dev am: de95d544cd
am: e6737ba6de

Change-Id: If143c49da7b43347fc402471304a44a75c200f5f
2017-04-04 09:35:37 +00:00
Jorim Jaggi
e6737ba6de Merge "Schedule window animations at vsync-sf" into oc-dev
am: de95d544cd

Change-Id: I0d6377d0cafdf33a7872ddda15d796147e0f4a60
2017-04-04 09:32:04 +00:00
Jorim Jaggi
cdfca9c3d2 Merge "Handle case when snapshot dimensions don't match" into oc-dev am: 1edadac465
am: 05ca99b43b

Change-Id: Ie5364d5617a159344d5232e48957ffd79a89a175
2017-04-04 09:32:02 +00:00
Jorim Jaggi
de95d544cd Merge "Schedule window animations at vsync-sf" into oc-dev 2017-04-04 09:26:03 +00:00
Jorim Jaggi
05ca99b43b Merge "Handle case when snapshot dimensions don't match" into oc-dev
am: 1edadac465

Change-Id: Icbe3f3c26cf65e7b12f5567a9bc40f7e0a3bd578
2017-04-04 09:23:35 +00:00
Jorim Jaggi
1edadac465 Merge "Handle case when snapshot dimensions don't match" into oc-dev 2017-04-04 09:14:38 +00:00
Adam Lesinski
bcc5b9f569 Merge "Themes: Apply themes to system_server safely" into oc-dev am: a52fc49845
am: b188c93a45

Change-Id: Idb98d85c8f98588bce7ca6480b5ac4a673050940
2017-04-04 03:41:14 +00:00
Adam Lesinski
b188c93a45 Merge "Themes: Apply themes to system_server safely" into oc-dev
am: a52fc49845

Change-Id: I85c390f99600d4f6cf75c9b3a4b1c39e7b874335
2017-04-04 03:33:42 +00:00
TreeHugger Robot
a52fc49845 Merge "Themes: Apply themes to system_server safely" into oc-dev 2017-04-04 03:25:29 +00:00
Philip P. Moltmann
872c968c0d Merge "Rename UsbRequest.enqueue to UsbRequest.queue" into oc-dev am: c56defe9c0
am: b0ed6b837e

Change-Id: I7cef506e23205de73d337b54979ed9f59d283495
2017-04-04 02:13:00 +00:00
Robert Carr
5429daaa51 Request layout when updating child layout params.
In order to clear the measure cache, we need to requestLayout
when updating the child layout params. To see why, consider the case of
a Frame or Linear layout which will measure different heights
depending on the (top/left/right/bottom)Margin parameters of it's
childrens layout params. Now imagine the following sequence of events:

1. We request a layout on the FrameLayout
2. We measure the FrameLayout and place a value in the cache.
3. Now we update the margin parameters on one of the frame layouts
   children. Because the parent already has a layout requested
   we don't call parent.requestLayout (see View.java#requestLayout),
   and thus the parent measure cache isn't cleared.
4. Now we measure the frame layout again and we incorrectly
   used the cached value.

Calling to requestLayout when the child layout params
change clears the cache properly. If the child didn't
call request layout from it's own relayout, it must mean that
a layout was already pending (step 1 in the sequence),
and so no more work should be triggered besides clearing the cache.

Bug: 33095565
Bug: 33308065
Bug: 34388764
Test: Manual case in bugs.
Change-Id: I9148f32530588e4dc859297f9658f506b38e72f0
2017-04-03 19:11:40 -07:00
Philip P. Moltmann
b0ed6b837e Merge "Rename UsbRequest.enqueue to UsbRequest.queue" into oc-dev
am: c56defe9c0

Change-Id: I1f35ccc57b721fc72fdb22f0bd98c9436b1570e8
2017-04-04 02:05:16 +00:00
Andrii Kulian
8623f89c32 Merge "Update display contents when metrics change" into oc-dev am: d6f0b0fc4f
am: de938b99fc

Change-Id: I5420f04c0d3f910ad1db3e0e5266e26de0c6f3f7
2017-04-04 02:00:22 +00:00
TreeHugger Robot
c56defe9c0 Merge "Rename UsbRequest.enqueue to UsbRequest.queue" into oc-dev 2017-04-04 01:57:23 +00:00
Andrii Kulian
de938b99fc Merge "Update display contents when metrics change" into oc-dev
am: d6f0b0fc4f

Change-Id: I808ab4d68954773ba8c8691478d9fe47e1e2378f
2017-04-04 01:49:35 +00:00
Daniel Cardenas
a66371e9be Merge "Increase visibility of FEATURE_LEANBACK_ONLY" into oc-dev am: d017221a52
am: dbcf5279ad

Change-Id: Ia98eaa934f9be88cbec1410555e35c773f6e4ff8
2017-04-04 01:47:15 +00:00
Andrii Kulian
d6f0b0fc4f Merge "Update display contents when metrics change" into oc-dev 2017-04-04 01:38:25 +00:00
Daniel Cardenas
dbcf5279ad Merge "Increase visibility of FEATURE_LEANBACK_ONLY" into oc-dev
am: d017221a52

Change-Id: Icf9271e418052931ca15c3a7727f01cfedd044c9
2017-04-04 01:38:16 +00:00
TreeHugger Robot
d017221a52 Merge "Increase visibility of FEATURE_LEANBACK_ONLY" into oc-dev 2017-04-04 01:28:43 +00:00
Hugo Benichi
d95470fa53 Merge "Move back networking policy logic into NetworkPolicyManagerService" into oc-dev am: df9cf5450c
am: 83f89047f5

Change-Id: I36ec48b9b8095cd407e5b56771227714cfec66db
2017-04-04 01:05:54 +00:00
Hugo Benichi
83f89047f5 Merge "Move back networking policy logic into NetworkPolicyManagerService" into oc-dev
am: df9cf5450c

Change-Id: I7d7b66cc1dc6888ea28e2b4d83d570fa440c29f2
2017-04-04 00:58:02 +00:00
Hugo Benichi
df9cf5450c Merge "Move back networking policy logic into NetworkPolicyManagerService" into oc-dev 2017-04-04 00:50:24 +00:00
Chad Brubaker
820ab35913 Merge "Expose animator settings to Instant Apps" into oc-dev am: d490fe0372
am: fb095d897f

Change-Id: I9e28019f15b57a636df0d9881fb03e61813374c6
2017-04-04 00:35:02 +00:00
Chad Brubaker
fb095d897f Merge "Expose animator settings to Instant Apps" into oc-dev
am: d490fe0372

Change-Id: I3a88cc331949e987462aca315e7f396d5491147b
2017-04-04 00:31:01 +00:00
TreeHugger Robot
d490fe0372 Merge "Expose animator settings to Instant Apps" into oc-dev 2017-04-04 00:23:34 +00:00
Makoto Onuki
6483c2d5fa Merge "Don't wtf() for reverse profile access; make it a warning." into oc-dev am: 5fd39fad26
am: d6da0d25cb

Change-Id: Iac4bdaf66a661218eca4a562646e4867998b5cab
2017-04-03 23:47:26 +00:00
Kang Li
90370e0b24 Add a service to rank apps for ResolverActivity.
bug: 30982298
Test: manual - shared images in Camera, texts in Messenger, and webpages
in Chrome.

Change-Id: If335c269ca54145839ad8fd4b3f9b93a74b550f8
(cherry picked from commit 35b9e30155)
2017-04-03 23:44:59 +00:00
Makoto Onuki
d6da0d25cb Merge "Don't wtf() for reverse profile access; make it a warning." into oc-dev
am: 5fd39fad26

Change-Id: I5b81cd880d505d8525a6210525c2b9c0c09b57a0
2017-04-03 23:38:55 +00:00
TreeHugger Robot
5fd39fad26 Merge "Don't wtf() for reverse profile access; make it a warning." into oc-dev 2017-04-03 23:32:00 +00:00
Evan Rosky
1025620ed5 Merge "Handle edge-case where the focus-search root is focused" into oc-dev am: fe9ce65491
am: 654281bcd1

Change-Id: Ib31d0bb871cebdf963b119ef90921922a5b51b08
2017-04-03 23:24:33 +00:00
Evan Rosky
654281bcd1 Merge "Handle edge-case where the focus-search root is focused" into oc-dev
am: fe9ce65491

Change-Id: I8232e1313e9e9babb152fcd03f1e6e224a979e52
2017-04-03 23:17:45 +00:00
Evan Rosky
fe9ce65491 Merge "Handle edge-case where the focus-search root is focused" into oc-dev 2017-04-03 23:10:56 +00:00
Daniel Cardenas
c40afac294 Increase visibility of FEATURE_LEANBACK_ONLY
Bug: 36003137
Test: Build on Fugu and CTS
Change-Id: Iab9be686a004c5c0d1fae02a33898f7ebb264b27
2017-04-03 16:06:40 -07:00
Dianne Hackborn
859a452353 Merge "Framework support to improve bg check CTS tests." into oc-dev am: 78e8ac9c14
am: 13f9bb4c0a

Change-Id: I14c6dcd5f6328e700d1a6f5c059020767732bc6b
2017-04-03 22:37:12 +00:00
Jeff Sharkey
010358f60d Merge "Revert "Deprecate EXTRA_STREAM."" into oc-dev am: a73aee4cdc
am: 39561fa9a9

Change-Id: I6031f36aa31679a143b66e7f7eced1b468648de7
2017-04-03 22:32:14 +00:00
Dianne Hackborn
13f9bb4c0a Merge "Framework support to improve bg check CTS tests." into oc-dev
am: 78e8ac9c14

Change-Id: Ibc14492d2ce3cf312f7478a6f6edaf383d26f657
2017-04-03 22:32:11 +00:00
Yohei Yukawa
f3956983a6 Merge "Warn if IMM#showSoftInputUnchecked() is called" into oc-dev am: 1061992733
am: 7f5b18356c

Change-Id: I44a3d6e304270fa1d53953aac0eaf8d42d748615
2017-04-03 22:31:13 +00:00