OSDN Git Service

android-x86/frameworks-base.git
8 years agoMerge "Always assign leftover pixels to last weighted child" into nyc-dev
Alan Viverette [Thu, 5 May 2016 02:29:57 +0000 (02:29 +0000)]
Merge "Always assign leftover pixels to last weighted child" into nyc-dev
am: a11c21b412

* commit 'a11c21b41239c9101a2a1f4e5870b2f819d0e92d':
  Always assign leftover pixels to last weighted child

Change-Id: Ibfaa979ba23c204172015fae11a767be8a4852dc

8 years agoMerge "Always assign leftover pixels to last weighted child" into nyc-dev
Alan Viverette [Thu, 5 May 2016 02:26:44 +0000 (02:26 +0000)]
Merge "Always assign leftover pixels to last weighted child" into nyc-dev

8 years agoMerge "Don\'t resize task when dismissing docked stack" into nyc-dev
Jorim Jaggi [Thu, 5 May 2016 02:12:43 +0000 (02:12 +0000)]
Merge "Don\'t resize task when dismissing docked stack" into nyc-dev
am: 4e0114742a

* commit '4e0114742a86ba3c3c9fb9cc536823be44712c05':
  Don't resize task when dismissing docked stack

Change-Id: Id7b8e6ada280dab2d14a99df4a0447355d0270f2

8 years agoMerge "Don't resize task when dismissing docked stack" into nyc-dev
TreeHugger Robot [Thu, 5 May 2016 02:07:26 +0000 (02:07 +0000)]
Merge "Don't resize task when dismissing docked stack" into nyc-dev

8 years agodocs: Fixing bad URL in libraries TOC am: 084d99bfd4 am: d9092978cd am: 35515f4fdb
Andrew Solovay [Thu, 5 May 2016 01:04:12 +0000 (01:04 +0000)]
docs: Fixing bad URL in libraries TOC am: 084d99bfd4 am: d9092978cd am: 35515f4fdb
am: 6f9f75e106

* commit '6f9f75e1063d282c933ede862fa7ea9371a2f310':
  docs: Fixing bad URL in libraries TOC

Change-Id: I631c9d39d626e61d0abb3feabbd33c873a797f9b

8 years agodocs: Fixing bad URL in libraries TOC am: 084d99bfd4 am: d9092978cd
Andrew Solovay [Thu, 5 May 2016 01:01:58 +0000 (01:01 +0000)]
docs: Fixing bad URL in libraries TOC am: 084d99bfd4 am: d9092978cd
am: 35515f4fdb

* commit '35515f4fdb9e0c5ae4618a8b55addd2e24cf6983':
  docs: Fixing bad URL in libraries TOC

Change-Id: I930f38f695dc831983afc414799cbfc9398ff867

8 years agodocs: Fixing bad URL in libraries TOC am: 084d99bfd4
Andrew Solovay [Thu, 5 May 2016 00:59:37 +0000 (00:59 +0000)]
docs: Fixing bad URL in libraries TOC am: 084d99bfd4
am: d9092978cd

* commit 'd9092978cde2bfdb291c5a5edbec4c28404a8e0d':
  docs: Fixing bad URL in libraries TOC

Change-Id: I25103954c34a912c75e9cbbda01aeb007f03b410

8 years agodocs: Fixing bad URL in libraries TOC
Andrew Solovay [Thu, 5 May 2016 00:54:48 +0000 (00:54 +0000)]
docs: Fixing bad URL in libraries TOC
am: 084d99bfd4

* commit '084d99bfd4938689e6394a8f3bcb5d261b852f93':
  docs: Fixing bad URL in libraries TOC

Change-Id: I98fabe110ba52c1f411cf2c6ab27ae9d86997dce

8 years agoDon't resize task when dismissing docked stack
Jorim Jaggi [Thu, 5 May 2016 00:24:47 +0000 (17:24 -0700)]
Don't resize task when dismissing docked stack

Make sure to "freeze" bounds while dismissing the docked stack by
either maximizing or minimizing it.

Bug: 28196862
Change-Id: Ifcd9deda340de8bc46df949df2fa1049e2f45f92

8 years agoMerge "Add dump information for divider" into nyc-dev
Jorim Jaggi [Thu, 5 May 2016 00:05:07 +0000 (00:05 +0000)]
Merge "Add dump information for divider" into nyc-dev
am: f28b23416e

* commit 'f28b23416eb607734d255b0c5595674ee3b7b949':
  Add dump information for divider

Change-Id: I60e1131190a272c799a8807b11123aa46c999c89

8 years agoFixing issue with passing arguments to toggle recents.
Winson [Thu, 5 May 2016 00:05:05 +0000 (00:05 +0000)]
Fixing issue with passing arguments to toggle recents.
am: ae165154a2

* commit 'ae165154a2a80ef160927d81a0b898660153f25e':
  Fixing issue with passing arguments to toggle recents.

Change-Id: I2db3b70ccca755c87f3f4ae6fb928f0c65f76fd6

8 years agoFixing regression in enter-recents state.
Winson [Thu, 5 May 2016 00:05:03 +0000 (00:05 +0000)]
Fixing regression in enter-recents state.
am: d7cb517b4c

* commit 'd7cb517b4ce10fa98213da18ccdb2261fb797f7c':
  Fixing regression in enter-recents state.

Change-Id: I4cd25886dc0013cab64c83a39ef5d62437767eb1

8 years agoMerge "Add dump information for divider" into nyc-dev
Jorim Jaggi [Thu, 5 May 2016 00:00:02 +0000 (00:00 +0000)]
Merge "Add dump information for divider" into nyc-dev

8 years agoFixing issue with passing arguments to toggle recents.
Winson [Wed, 4 May 2016 22:13:36 +0000 (15:13 -0700)]
Fixing issue with passing arguments to toggle recents.

Bug: 28598762
Change-Id: I38edd34ae158abd97b28c82e700f3e020e81af75

8 years agoFixing regression in enter-recents state.
Winson [Wed, 4 May 2016 23:14:19 +0000 (16:14 -0700)]
Fixing regression in enter-recents state.

- We should always start the activity when docking to ensure that the
  launch state is set up correctly.

Bug: 28470261
Change-Id: I4aae0dedb95a1c796c72b487b6700da0754e66f3

8 years agoMerge "Send FINGERPRINT_ERROR_LOCKOUT on some devices" into nyc-dev
Jim Miller [Wed, 4 May 2016 23:55:39 +0000 (23:55 +0000)]
Merge "Send FINGERPRINT_ERROR_LOCKOUT on some devices" into nyc-dev
am: 4676868313

* commit '46768683136242de4240958708587dded637ef64':
  Send FINGERPRINT_ERROR_LOCKOUT on some devices

Change-Id: I0e53ec7c52802de58be9d69058a65e6a43a75b75

8 years agoMerge "Send FINGERPRINT_ERROR_LOCKOUT on some devices" into nyc-dev
Jim Miller [Wed, 4 May 2016 23:49:57 +0000 (23:49 +0000)]
Merge "Send FINGERPRINT_ERROR_LOCKOUT on some devices" into nyc-dev

8 years agoMerge "Update VR API docs." into nyc-dev
Ruben Brunk [Wed, 4 May 2016 23:43:50 +0000 (23:43 +0000)]
Merge "Update VR API docs." into nyc-dev
am: 01d232988a

* commit '01d232988a69dfdee7f90cebf560686e458849e4':
  Update VR API docs.

Change-Id: I1b2cc88ca390c90d42cae3736aaf986e6c0e9396

8 years agoAdd dump information for divider
Jorim Jaggi [Wed, 4 May 2016 23:43:04 +0000 (16:43 -0700)]
Add dump information for divider

Bug: 28575870
Bug: 28445644
Change-Id: Ib2137c49f1672ed2a9e7e31a5b68c22e0bb166b1

8 years agoMerge changes I4d34ed4b,Iddfbdf5c into nyc-dev
Selim Cinek [Wed, 4 May 2016 23:39:03 +0000 (23:39 +0000)]
Merge changes I4d34ed4b,Iddfbdf5c into nyc-dev
am: 17bc1fd090

* commit '17bc1fd09042f2749a1c822d32bc48eeb3b280f6':
  Fixed a bug where the pin wasn't scaled correctly
  Fixed a bug where the scrim was transparent

Change-Id: I3259a79075ece8f4159d5bc4272ce39fd37f3b5f

8 years agoMerge "Fixed an issue where the scrim could be lost" into nyc-dev
Selim Cinek [Wed, 4 May 2016 23:39:01 +0000 (23:39 +0000)]
Merge "Fixed an issue where the scrim could be lost" into nyc-dev
am: 05d61edeb2

* commit '05d61edeb271167b6a9a97aa9adf1fe7bfb9bfbf':
  Fixed an issue where the scrim could be lost

Change-Id: I72f8ed8b302d9e9542e2ae3c540f671d344b74bf

8 years agoMerge "Fixed a flickering when expanding and the notifications updates" into nyc-dev
Selim Cinek [Wed, 4 May 2016 23:38:59 +0000 (23:38 +0000)]
Merge "Fixed a flickering when expanding and the notifications updates" into nyc-dev
am: 4ad13b3340

* commit '4ad13b334057dc541168d4ffdaf61a63b5fb6864':
  Fixed a flickering when expanding and the notifications updates

Change-Id: I99cfb8a7baed888eceeacc44f12cc128d2aec6e1

8 years agoMerge changes Ic30e4de6,I34496c73,I096d3823 into nyc-dev
Selim Cinek [Wed, 4 May 2016 23:38:56 +0000 (23:38 +0000)]
Merge changes Ic30e4de6,I34496c73,I096d3823 into nyc-dev
am: 11619f4782

* commit '11619f4782507e7543b23e5aed5f7164f16b20c3':
  Fixed a bug where the content height was wrong
  Fixed the fade in animation when coming from dark
  Fixed the animation when flinging over the bottom stack

Change-Id: I07107b2694542e1b70e9813b323c026660b81589

8 years agoMerge "Made the dismissal of notifications snappier" into nyc-dev
Selim Cinek [Wed, 4 May 2016 23:38:51 +0000 (23:38 +0000)]
Merge "Made the dismissal of notifications snappier" into nyc-dev
am: 910f69e0bb

* commit '910f69e0bb7fc9a6ef880f27fe99ad3a7abbdf15':
  Made the dismissal of notifications snappier

Change-Id: Ia5a47a60d8361bcfddca365482ec236f91fe6049

8 years agoMerge "Fixed an issue where children would animate strangely when removed" into nyc-dev
Selim Cinek [Wed, 4 May 2016 23:38:45 +0000 (23:38 +0000)]
Merge "Fixed an issue where children would animate strangely when removed" into nyc-dev
am: 35a8c2f00e

* commit '35a8c2f00e1c3bb2e2cf24260682400d025a49f0':
  Fixed an issue where children would animate strangely when removed

Change-Id: Iecb054320ff101638b9d79f8b0d1f25bead30524

8 years agoMerge "Update VR API docs." into nyc-dev
Ruben Brunk [Wed, 4 May 2016 23:35:42 +0000 (23:35 +0000)]
Merge "Update VR API docs." into nyc-dev

8 years agoMerge changes I4d34ed4b,Iddfbdf5c into nyc-dev
TreeHugger Robot [Wed, 4 May 2016 23:31:31 +0000 (23:31 +0000)]
Merge changes I4d34ed4b,Iddfbdf5c into nyc-dev

* changes:
  Fixed a bug where the pin wasn't scaled correctly
  Fixed a bug where the scrim was transparent

8 years agoMerge "Fixed an issue where the scrim could be lost" into nyc-dev
TreeHugger Robot [Wed, 4 May 2016 23:30:52 +0000 (23:30 +0000)]
Merge "Fixed an issue where the scrim could be lost" into nyc-dev

8 years agoMerge "Fixed a flickering when expanding and the notifications updates" into nyc-dev
TreeHugger Robot [Wed, 4 May 2016 23:30:14 +0000 (23:30 +0000)]
Merge "Fixed a flickering when expanding and the notifications updates" into nyc-dev

8 years agoMerge changes Ic30e4de6,I34496c73,I096d3823 into nyc-dev
TreeHugger Robot [Wed, 4 May 2016 23:29:44 +0000 (23:29 +0000)]
Merge changes Ic30e4de6,I34496c73,I096d3823 into nyc-dev

* changes:
  Fixed a bug where the content height was wrong
  Fixed the fade in animation when coming from dark
  Fixed the animation when flinging over the bottom stack

8 years agoMerge "Made the dismissal of notifications snappier" into nyc-dev
Selim Cinek [Wed, 4 May 2016 23:28:42 +0000 (23:28 +0000)]
Merge "Made the dismissal of notifications snappier" into nyc-dev

8 years agoMerge "Fixed an issue where children would animate strangely when removed" into nyc-dev
Selim Cinek [Wed, 4 May 2016 23:28:18 +0000 (23:28 +0000)]
Merge "Fixed an issue where children would animate strangely when removed" into nyc-dev

8 years agoFixed a bug where the pin wasn't scaled correctly
Selim Cinek [Wed, 4 May 2016 21:13:20 +0000 (14:13 -0700)]
Fixed a bug where the pin wasn't scaled correctly

When switching between different users with different
densities, the Pin entry wasn't recreated correctly.

Change-Id: I4d34ed4b2962311f28588b13dd56838c84272edf
Fixes: 27744173

8 years agoFixed a bug where the scrim was transparent
Selim Cinek [Wed, 4 May 2016 18:39:10 +0000 (11:39 -0700)]
Fixed a bug where the scrim was transparent

When quickly pulling down during the fadeout transition
the scrim was never updated anymore. The animation is now
cancelled in that case.

Change-Id: Iddfbdf5c891732df15f22c81d6fcd4d268ce2593
Fixes: 28054515

8 years agoFixed an issue where the scrim could be lost
Selim Cinek [Wed, 4 May 2016 18:11:10 +0000 (11:11 -0700)]
Fixed an issue where the scrim could be lost

When the lockscreen camera was launched, the launch
transition flags were not correctly updated, leading
to the scrim not updating anymore.

Change-Id: Ief5f9eae4d9aacd5177d72e6902451c92552d0d1
Fixes: 28404975

8 years agoFixed a flickering when expanding and the notifications updates
Selim Cinek [Tue, 3 May 2016 23:42:50 +0000 (16:42 -0700)]
Fixed a flickering when expanding and the notifications updates

Change-Id: Idda8f5cfc61c3c561963eb3ccfffece9fbf5cde3
Fixes: 28557444

8 years agoFixed a bug where the content height was wrong
Selim Cinek [Tue, 3 May 2016 22:52:51 +0000 (15:52 -0700)]
Fixed a bug where the content height was wrong

when dragging down from a HUN the content height was
wrong.

Change-Id: Ic30e4de67625ed88942c71e68e6009b832d064ed
Fixes: 28563238

8 years agoFixed the fade in animation when coming from dark
Selim Cinek [Tue, 3 May 2016 21:25:58 +0000 (14:25 -0700)]
Fixed the fade in animation when coming from dark

Previously the fade-in wasn't happening which is now
working.

Change-Id: I34496c735043058009e9cc9bbf169ffa742a78c4
Fixes: 27534592

8 years agoFixed the animation when flinging over the bottom stack
Selim Cinek [Thu, 28 Apr 2016 21:20:39 +0000 (14:20 -0700)]
Fixed the animation when flinging over the bottom stack

The new approach is still not perfect but has way less artifacts.

Change-Id: I096d3823c5ede720bdf05558d68529e903dce5b5
Fixes: 27744811

8 years agodocs: Fixing bad URL in libraries TOC
Andrew Solovay [Wed, 4 May 2016 22:31:24 +0000 (15:31 -0700)]
docs: Fixing bad URL in libraries TOC

Also added the libraries sub-TOC to the "API Guides" TOC.

See first comment for doc stage location.

Change-Id: I06aac939e40ffad7888801ea01f6d4decd6eb4d1

8 years agoMerge "Call unlockUserKey in a synchronized section" into nyc-dev
Fyodor Kupolov [Wed, 4 May 2016 23:15:21 +0000 (23:15 +0000)]
Merge "Call unlockUserKey in a synchronized section" into nyc-dev
am: 735fa43314

* commit '735fa43314b3779df4af15cc679d00aa9de9c14c':
  Call unlockUserKey in a synchronized section

Change-Id: Ie168a80aaa2385c989067b04a4a54d0fdde277d2

8 years agoMerge "Call unlockUserKey in a synchronized section" into nyc-dev
Fyodor Kupolov [Wed, 4 May 2016 23:10:41 +0000 (23:10 +0000)]
Merge "Call unlockUserKey in a synchronized section" into nyc-dev

8 years agoMerge "Full-data restore path needs to pass along the widget metadata" into nyc-dev
Christopher Tate [Wed, 4 May 2016 22:58:14 +0000 (22:58 +0000)]
Merge "Full-data restore path needs to pass along the widget metadata" into nyc-dev
am: c7656ffcb9

* commit 'c7656ffcb99b58995f2ea00fe5ee720b4dc05696':
  Full-data restore path needs to pass along the widget metadata

Change-Id: I0e475712fdd253f5429f03c11e11649e3cda5426

8 years agoMerge "Debug traces to facilitate screen timeout debugging" into nyc-dev
Chong Zhang [Wed, 4 May 2016 22:52:50 +0000 (22:52 +0000)]
Merge "Debug traces to facilitate screen timeout debugging" into nyc-dev
am: 6afe594461

* commit '6afe594461930e83cbf5ecf181bf43fcba0060dd':
  Debug traces to facilitate screen timeout debugging

Change-Id: I6b04707b616a9251b2ebdd3b02cd5e692a479ceb

8 years agoMerge "Maybe fix issue #28457907: Pebble app crash + reboot" into nyc-dev
Dianne Hackborn [Wed, 4 May 2016 22:52:48 +0000 (22:52 +0000)]
Merge "Maybe fix issue #28457907: Pebble app crash + reboot" into nyc-dev
am: 6eb119c7cb

* commit '6eb119c7cb665211d4848c26a3c72d0835e34fed':
  Maybe fix issue #28457907: Pebble app crash + reboot

Change-Id: Ife9159aa9a689f5309e106e07455b19a456cb642

8 years agoMerge "Revert "Don\'t enforce this API - it\'s not sensitive"" into nyc-dev
Paul Lawrence [Wed, 4 May 2016 22:52:44 +0000 (22:52 +0000)]
Merge "Revert "Don\'t enforce this API - it\'s not sensitive"" into nyc-dev
am: fc0810b4d4

* commit 'fc0810b4d47b3cd679c5c761eb225be3d1351060':
  Revert "Don't enforce this API - it's not sensitive"

Change-Id: I053f17b2fa627a2ca75709c7ef7cd2306b6645de

8 years agoMerge "Full-data restore path needs to pass along the widget metadata" into nyc-dev
Chris Tate [Wed, 4 May 2016 22:52:11 +0000 (22:52 +0000)]
Merge "Full-data restore path needs to pass along the widget metadata" into nyc-dev

8 years agoMerge "Debug traces to facilitate screen timeout debugging" into nyc-dev
Chong Zhang [Wed, 4 May 2016 22:50:09 +0000 (22:50 +0000)]
Merge "Debug traces to facilitate screen timeout debugging" into nyc-dev

8 years agoMerge "Maybe fix issue #28457907: Pebble app crash + reboot" into nyc-dev
Dianne Hackborn [Wed, 4 May 2016 22:49:57 +0000 (22:49 +0000)]
Merge "Maybe fix issue #28457907: Pebble app crash + reboot" into nyc-dev

8 years agoMerge "Revert "Don't enforce this API - it's not sensitive"" into nyc-dev
Paul Lawrence [Wed, 4 May 2016 22:46:08 +0000 (22:46 +0000)]
Merge "Revert "Don't enforce this API - it's not sensitive"" into nyc-dev

8 years agoMerge "docs: Skeletal N-DP3 release notes" into mnc-io-docs am: 6cf7d79db2 am: b3a82cff5a
Andrew Solovay [Wed, 4 May 2016 22:41:06 +0000 (22:41 +0000)]
Merge "docs: Skeletal N-DP3 release notes" into mnc-io-docs am: 6cf7d79db2 am: b3a82cff5a
am: ce3e0e3607

* commit 'ce3e0e3607173cb493374fc6253c4e4854d51756':
  docs: Skeletal N-DP3 release notes

Change-Id: Ic97edf946c6495761919c5afaad40a626b4fb134

8 years agoMerge "docs: Skeletal N-DP3 release notes" into mnc-io-docs am: 6cf7d79db2
Andrew Solovay [Wed, 4 May 2016 22:38:47 +0000 (22:38 +0000)]
Merge "docs: Skeletal N-DP3 release notes" into mnc-io-docs am: 6cf7d79db2
am: b3a82cff5a

* commit 'b3a82cff5ab8fbe5930b05a1b150e44f87b25a29':
  docs: Skeletal N-DP3 release notes

Change-Id: I06227b4d50d1eb5a9e26b0847453d9523be02373

8 years agoMerge "docs: Skeletal N-DP3 release notes" into mnc-io-docs
Andrew Solovay [Wed, 4 May 2016 22:36:23 +0000 (22:36 +0000)]
Merge "docs: Skeletal N-DP3 release notes" into mnc-io-docs
am: 6cf7d79db2

* commit '6cf7d79db20d0eb7e0708e488f6cb97b6f157a6c':
  docs: Skeletal N-DP3 release notes

Change-Id: I60a0fd0841a6cbc1386539667cb735c9721baba3

8 years agoMerge "Fix View leakage from mPreSortedChildren" into nyc-dev
Chris Craik [Wed, 4 May 2016 22:30:27 +0000 (22:30 +0000)]
Merge "Fix View leakage from mPreSortedChildren" into nyc-dev
am: 4e34cd0537

* commit '4e34cd05379d1e96a5ca8081b3e3fa3b1a1cc534':
  Fix View leakage from mPreSortedChildren

Change-Id: I4a2c7016907c22bcb4ae9640aa1feb5a0f812bbb

8 years agoMerge "docs: Skeletal N-DP3 release notes" into mnc-io-docs
TreeHugger Robot [Wed, 4 May 2016 22:28:08 +0000 (22:28 +0000)]
Merge "docs: Skeletal N-DP3 release notes" into mnc-io-docs

8 years agoMerge "Fix View leakage from mPreSortedChildren" into nyc-dev
TreeHugger Robot [Wed, 4 May 2016 22:23:23 +0000 (22:23 +0000)]
Merge "Fix View leakage from mPreSortedChildren" into nyc-dev

8 years agoMerge "Disallow suspending the default dialer" into nyc-dev
Robin Lee [Wed, 4 May 2016 22:23:01 +0000 (22:23 +0000)]
Merge "Disallow suspending the default dialer" into nyc-dev
am: ecf4622618

* commit 'ecf4622618bb963d913a3e217c92da61f305d79e':
  Disallow suspending the default dialer

Change-Id: If8c5c4625c877ce222f3fcb9adeee1726bfdcc11

8 years agoMerge "Disallow suspending the default dialer" into nyc-dev
Robin Lee [Wed, 4 May 2016 22:20:23 +0000 (22:20 +0000)]
Merge "Disallow suspending the default dialer" into nyc-dev

8 years agoMerge "Don\'t keep dead window with borrowed app token visible" into nyc-dev
Wale Ogunwale [Wed, 4 May 2016 22:17:11 +0000 (22:17 +0000)]
Merge "Don\'t keep dead window with borrowed app token visible" into nyc-dev
am: ccca9fe2fe

* commit 'ccca9fe2fe589c8ccde65aa8f86bdeb24561fd32':
  Don't keep dead window with borrowed app token visible

Change-Id: I9fe63d76ad999873b8d7453c39945659dfae0061

8 years agoMerge "Don't keep dead window with borrowed app token visible" into nyc-dev
TreeHugger Robot [Wed, 4 May 2016 22:13:31 +0000 (22:13 +0000)]
Merge "Don't keep dead window with borrowed app token visible" into nyc-dev

8 years agoDebug traces to facilitate screen timeout debugging
Chong Zhang [Wed, 4 May 2016 22:06:02 +0000 (15:06 -0700)]
Debug traces to facilitate screen timeout debugging

bug: 27522448
Change-Id: I4d51be316e4aedecffb7001126849d7c6136d517

8 years agoMerge "Fix QS not collapsing after some QQS gestures" into nyc-dev
Jason Monk [Wed, 4 May 2016 22:02:06 +0000 (22:02 +0000)]
Merge "Fix QS not collapsing after some QQS gestures" into nyc-dev
am: 12b1776dde

* commit '12b1776dde23a714d705a3095c9808c68d17fe43':
  Fix QS not collapsing after some QQS gestures

Change-Id: I09a6931530c801ad88120847539f53b6b14f2227

8 years agoMerge "Fix QS not collapsing after some QQS gestures" into nyc-dev
TreeHugger Robot [Wed, 4 May 2016 21:58:17 +0000 (21:58 +0000)]
Merge "Fix QS not collapsing after some QQS gestures" into nyc-dev

8 years agoCall unlockUserKey in a synchronized section
Fyodor Kupolov [Wed, 4 May 2016 21:57:48 +0000 (14:57 -0700)]
Call unlockUserKey in a synchronized section

This will make callers of isUserRunning to wait for the unlock to finish.

Bug: 28530527
Change-Id: I272e2166cdc3df8e34c3436c9c18ba6765da0625

8 years agoMerge "Force second measure pass when there is a configuration change" into nyc-dev
Chet Haase [Wed, 4 May 2016 21:51:33 +0000 (21:51 +0000)]
Merge "Force second measure pass when there is a configuration change" into nyc-dev
am: c381c4e8e7

* commit 'c381c4e8e7b7dfc2aed0a662bf56e3d6e512df5d':
  Force second measure pass when there is a configuration change

Change-Id: I34afe7f97bc141bc4981643f61518d4bcbf29ba7

8 years agoMerge "Force second measure pass when there is a configuration change" into nyc-dev
Chet Haase [Wed, 4 May 2016 21:49:09 +0000 (21:49 +0000)]
Merge "Force second measure pass when there is a configuration change" into nyc-dev

8 years agoMerge "Fix a behavior change in "Show software keyboard"." into nyc-dev
Yohei Yukawa [Wed, 4 May 2016 21:42:43 +0000 (21:42 +0000)]
Merge "Fix a behavior change in "Show software keyboard"." into nyc-dev
am: 68c1e1935d

* commit '68c1e1935d5c3de080513a31b305eef722ee380c':
  Fix a behavior change in "Show software keyboard".

Change-Id: Ia7069eb539a9b809bc3e14514bee16149c9151c8

8 years agoMerge "Fix a behavior change in "Show software keyboard"." into nyc-dev
Yohei Yukawa [Wed, 4 May 2016 21:39:13 +0000 (21:39 +0000)]
Merge "Fix a behavior change in "Show software keyboard"." into nyc-dev

8 years agoMerge "Finish selection mode after copyto and share..." into nyc-dev
Steve McKay [Wed, 4 May 2016 21:37:39 +0000 (21:37 +0000)]
Merge "Finish selection mode after copyto and share..." into nyc-dev
am: 94e3b80d5b

* commit '94e3b80d5b3fd88f6656cb5cae813c4e63faebff':
  Finish selection mode after copyto and share...

Change-Id: If4a47f84569e1cb58eb4d0f3c8e209e78177e615

8 years agoMerge "Marking @SystemApi permissions @hide too." into nyc-dev
Amit Mahajan [Wed, 4 May 2016 21:37:29 +0000 (21:37 +0000)]
Merge "Marking @SystemApi permissions @hide too." into nyc-dev
am: 441da79d8a

* commit '441da79d8aa7b873f23227d10ecd425671b85506':
  Marking @SystemApi permissions @hide too.

Change-Id: Ic4516f40e3845b5bc4863a5b52039c2c770d68f4

8 years agoMerge "ShortcutManaegr: bug fixes" into nyc-mr1-dev
Makoto Onuki [Wed, 4 May 2016 21:28:15 +0000 (21:28 +0000)]
Merge "ShortcutManaegr: bug fixes" into nyc-mr1-dev

8 years agoAlways assign leftover pixels to last weighted child
Alan Viverette [Wed, 4 May 2016 20:59:38 +0000 (16:59 -0400)]
Always assign leftover pixels to last weighted child

Bug: 27690033
Change-Id: Ibee51d49d3f7aa923750ce330df2e1aa2156f2bd

8 years agoMerge "Finish selection mode after copyto and share..." into nyc-dev
TreeHugger Robot [Wed, 4 May 2016 20:58:37 +0000 (20:58 +0000)]
Merge "Finish selection mode after copyto and share..." into nyc-dev

8 years agoMerge "Marking @SystemApi permissions @hide too." into nyc-dev
TreeHugger Robot [Wed, 4 May 2016 20:50:14 +0000 (20:50 +0000)]
Merge "Marking @SystemApi permissions @hide too." into nyc-dev

8 years agoMerge "Merge "Make sure to pause activity before stopping" into nyc-dev am: 5f81a3f84...
Android Build Merger (Role) [Wed, 4 May 2016 20:49:15 +0000 (20:49 +0000)]
Merge "Merge "Make sure to pause activity before stopping" into nyc-dev am: 5f81a3f84c" into nyc-mr1-dev

8 years agoMerge "Make sure to pause activity before stopping" into nyc-dev
Wale Ogunwale [Wed, 4 May 2016 20:48:51 +0000 (20:48 +0000)]
Merge "Make sure to pause activity before stopping" into nyc-dev
am: 5f81a3f84c

* commit '5f81a3f84c97999f9eb19291c7b4f67ad8576c7c':
  Make sure to pause activity before stopping

Change-Id: If6888d7b1a36594045927fa1ab33c82c2899206f

8 years agoMaybe fix issue #28457907: Pebble app crash + reboot
Dianne Hackborn [Tue, 3 May 2016 23:57:54 +0000 (16:57 -0700)]
Maybe fix issue #28457907: Pebble app crash + reboot

Fix this long-standing multi-threading issue in Bundle
when multiple threads are trying to read from a Bundle
and conflict to due unparceling.

There are two critical sections this protects: writing
the bundle in to a parcel (when it is doing this from
the bundle's already parcelled representation), and
unparcelling a bundle into its map of entries.

Change-Id: I5470002f090e63dd623a573da6c204d3b5b661f4

8 years agoMerge "Add Shortcut API to Settings (1/2) b/28298258" into nyc-mr1-dev
Hyunyoung Song [Wed, 4 May 2016 20:43:08 +0000 (20:43 +0000)]
Merge "Add Shortcut API to Settings (1/2) b/28298258" into nyc-mr1-dev

8 years agoFix View leakage from mPreSortedChildren
Chris Craik [Wed, 4 May 2016 20:34:30 +0000 (13:34 -0700)]
Fix View leakage from mPreSortedChildren

bug:28553824

Change-Id: I62bfa3dcb121792dff7d00be1f4b018a99c96e1d

8 years agodocs: Skeletal N-DP3 release notes
Andrew Solovay [Wed, 4 May 2016 19:58:43 +0000 (12:58 -0700)]
docs: Skeletal N-DP3 release notes

Setting up the outline of the DP3 release notes, and bumping DP2
stuff to "archive". Updating ID tags as necessary.

See first comment for doc stage location.

bug: 28591801
Change-Id: Ide1bc24ecf8c72fee6b148e30a9b895f2b91d8c9

8 years agoDocs: Adds fugu to list of Vulkan-supported devices. am: 0677d4b715 am: 60e5bc30bb...
David Friedman [Wed, 4 May 2016 20:30:26 +0000 (20:30 +0000)]
Docs: Adds fugu to list of Vulkan-supported devices. am: 0677d4b715 am: 60e5bc30bb am: 0de8689243 am: 21a55dc82c
am: 6954edf67c

* commit '6954edf67c9e4f9717d42ddd3b424dd3164062fd':
  Docs: Adds fugu to list of Vulkan-supported devices.

Change-Id: I81493f743cc9452469d93eeee81e2b24bca813de

8 years agoMerge "Make sure to pause activity before stopping" into nyc-dev
TreeHugger Robot [Wed, 4 May 2016 20:28:49 +0000 (20:28 +0000)]
Merge "Make sure to pause activity before stopping" into nyc-dev

8 years agoDon't keep dead window with borrowed app token visible
Wale Ogunwale [Wed, 4 May 2016 20:27:18 +0000 (13:27 -0700)]
Don't keep dead window with borrowed app token visible

If the window was add by a client using another client's app token,
we don't want to keep the dead window around for this case since
this funcationality is meant for 'real' apps.

Bug: 28467642
Change-Id: Ie4fdd9f90b122439a2fbcc60085ebfdb562d5c6d

8 years agoMerge "Fix QS header size after landscape inflation" into nyc-dev
Jason Monk [Wed, 4 May 2016 20:22:16 +0000 (20:22 +0000)]
Merge "Fix QS header size after landscape inflation" into nyc-dev
am: 9ff0083647

* commit '9ff00836473dca5e91bccf109902246458b44adc':
  Fix QS header size after landscape inflation

Change-Id: I97ba6feebc4282e4dcef71e805cf06c9bd2eba55

8 years agoDocs: Adds fugu to list of Vulkan-supported devices. am: 0677d4b715 am: 60e5bc30bb...
David Friedman [Wed, 4 May 2016 20:21:53 +0000 (20:21 +0000)]
Docs: Adds fugu to list of Vulkan-supported devices. am: 0677d4b715 am: 60e5bc30bb am: 0de8689243
am: 21a55dc82c

* commit '21a55dc82c24ffb8c0d77c1980fe5acc1400001d':
  Docs: Adds fugu to list of Vulkan-supported devices.

Change-Id: I372454e0f336d4ae4703ca296e102447db247d61

8 years agoDocs: Adds fugu to list of Vulkan-supported devices. am: 0677d4b715 am: 60e5bc30bb
David Friedman [Wed, 4 May 2016 20:13:37 +0000 (20:13 +0000)]
Docs: Adds fugu to list of Vulkan-supported devices. am: 0677d4b715 am: 60e5bc30bb
am: 0de8689243

* commit '0de8689243ae0d48744b7c1584670a10febafe32':
  Docs: Adds fugu to list of Vulkan-supported devices.

Change-Id: If89adfe3f280815f26cec7048e50e4d8c9ad7b7d

8 years agoMerge "Fix QS header size after landscape inflation" into nyc-dev
Jason Monk [Wed, 4 May 2016 20:11:54 +0000 (20:11 +0000)]
Merge "Fix QS header size after landscape inflation" into nyc-dev

8 years agoFix QS header size after landscape inflation
Jason Monk [Wed, 4 May 2016 20:08:08 +0000 (16:08 -0400)]
Fix QS header size after landscape inflation

Change-Id: Ic735462d0af2437ed9e74a960ff0dc12126c30f2
Fixes: 28306834

8 years agoDocs: Adds fugu to list of Vulkan-supported devices. am: 0677d4b715
David Friedman [Wed, 4 May 2016 20:04:06 +0000 (20:04 +0000)]
Docs: Adds fugu to list of Vulkan-supported devices. am: 0677d4b715
am: 60e5bc30bb

* commit '60e5bc30bbb41f25836a8bbd2a04bc2eab4b7f8c':
  Docs: Adds fugu to list of Vulkan-supported devices.

Change-Id: Iab5e6c2b992c241de667476ce74b2bc6a2d4dac9

8 years agoShortcutManaegr: bug fixes
Makoto Onuki [Wed, 4 May 2016 19:53:37 +0000 (12:53 -0700)]
ShortcutManaegr: bug fixes

Fixes 28590035
Fixes 28586105

Change-Id: Ia11d29e4996ad5b47b279a3c04d9586695cdc0a5

8 years agoFix QS not collapsing after some QQS gestures
Jason Monk [Wed, 4 May 2016 20:00:36 +0000 (16:00 -0400)]
Fix QS not collapsing after some QQS gestures

Change-Id: I0178bb15a162f8dba19e63471d955a838eeea6c7
Fixes: 28479933

8 years agoDocs: Adds fugu to list of Vulkan-supported devices.
David Friedman [Wed, 4 May 2016 20:00:08 +0000 (20:00 +0000)]
Docs: Adds fugu to list of Vulkan-supported devices.
am: 0677d4b715

* commit '0677d4b7153327fef6b33c90c5bf61f756c1bea3':
  Docs: Adds fugu to list of Vulkan-supported devices.

Change-Id: Ida6a6972ff32917eb9367871d6ea0766cc37d05e

8 years agoMerge "Add HP and Mopria print recommendation service" into nyc-dev
Philip P. Moltmann [Wed, 4 May 2016 19:29:18 +0000 (19:29 +0000)]
Merge "Add HP and Mopria print recommendation service" into nyc-dev
am: 9e5d4e078a

* commit '9e5d4e078a93f187f6ec612734dded61372636fb':
  Add HP and Mopria print recommendation service

Change-Id: I6dd1b1dd1787282ad67d7bdd4ffbce070e6de860

8 years agoMerge "Add HP and Mopria print recommendation service" into nyc-dev
Philip P. Moltmann [Wed, 4 May 2016 19:22:56 +0000 (19:22 +0000)]
Merge "Add HP and Mopria print recommendation service" into nyc-dev

8 years agoDocs: Adds fugu to list of Vulkan-supported devices.
David Friedman [Wed, 4 May 2016 19:14:08 +0000 (12:14 -0700)]
Docs: Adds fugu to list of Vulkan-supported devices.

Change-Id: Ic61f5e20c6c950ef7333e56757a782f67bae8da1

8 years agoFix a behavior change in "Show software keyboard".
Yohei Yukawa [Wed, 4 May 2016 18:56:35 +0000 (11:56 -0700)]
Fix a behavior change in "Show software keyboard".

This bug was a corner case of stopping lying about
Configuration#keyboard when "Show software keyboard" is turned on, which
was done by my CL [1] in Android N development cycle.

Previous implementation

  if (config.keyboard != Configuration.KEYBOARD_NOKEYS) {

had relied on the fact that the system was lying about config.keyboard,
which is no longer valid.  We need to change the behavior of
InputMethodService#onShowInputRequested() depending on
Settings.Secure.SHOW_IME_WITH_HARD_KEYBOARD like we did for
InputMethodService#onEvaluateInputViewShown() in [1] to minimize the
impact on stopping lying about Configuration#keyboard.

 [1]: Id4d332e3909590c68345e10e1f2e18650efb2eb7
      7b739a802cb7d97460a0bf8a1e9774efe96fa552

Bug: 28423439
Change-Id: I8a774cbf61ac706d8446be91b17bceee57a13656

8 years agoMerge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev
Robin Lee [Wed, 4 May 2016 18:52:53 +0000 (18:52 +0000)]
Merge "Add lockdownEnabled parameter to always-on VPN API" into nyc-dev
am: 7ec93a1ee2

* commit '7ec93a1ee2d381fdcd3be271712e4179ddbf9829':
  Add lockdownEnabled parameter to always-on VPN API

Change-Id: I7e3f9edd802dfe7c98abf79dcf8f6fa14ce39c01

8 years agoAdd Shortcut API to Settings (1/2)
Hyunyoung Song [Wed, 4 May 2016 17:23:06 +0000 (10:23 -0700)]
Add Shortcut API to Settings (1/2)
b/28298258

Initial CL to simply add first time shortcuts in the beginning.

Change-Id: Ib64e3cf1b17979da1548c168cd551ae125289132

8 years agoMake sure to pause activity before stopping
Wale Ogunwale [Wed, 4 May 2016 17:24:33 +0000 (10:24 -0700)]
Make sure to pause activity before stopping

In some cases it is possible for activity manager to request
a resumed activity to stop when it's visibility changes. This
is a valid transition, however we need to make sure to pause
the activity on the client side before stopping it so lifecycle
transition works as expected.

Bug: 28574036
Change-Id: I759b38bbd1c9c3bb0475759bcb638d8223fa504d

8 years agoMerge changes I31d5260d,Ied92f558 into nyc-dev
Robin Lee [Wed, 4 May 2016 18:46:19 +0000 (18:46 +0000)]
Merge changes I31d5260d,Ied92f558 into nyc-dev
am: a5e6553917

* commit 'a5e6553917359bb662c8f2788feb3d617803d406':
  Start VPN as early as possible during startup
  Split network agent created state from connected state

Change-Id: I5fedffbf3d8f2826b94ccd2f3e1ba1f5563c43af