Jorim Jaggi
ffbc117229
am f30c5f56: am 93a25f77: am fba92611: am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev
...
* commit 'f30c5f56187fed6452d557a44df8b63d8eb130a2':
Add callback to voice interaction session for lockscreen shown
2015-07-23 22:06:29 +00:00
Jorim Jaggi
f30c5f5618
am 93a25f77: am fba92611: am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev
...
* commit '93a25f77bb4b4aeb7b3a1313fe3117f4c9781dc8':
Add callback to voice interaction session for lockscreen shown
2015-07-23 21:48:48 +00:00
Jorim Jaggi
fba926118e
am fcf9acb9: am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev
...
* commit 'fcf9acb95a536f939a418529f642e60f51f5886a':
Add callback to voice interaction session for lockscreen shown
2015-07-23 19:20:27 +00:00
Tim Volodine
08a38b68e9
Merge "Revert "Invoke geolocation permissions callback with denied state by default.""
2015-07-23 17:27:27 +00:00
Tim Volodine
0bb7d2e467
Revert "Invoke geolocation permissions callback with denied state by default."
...
This reverts commit 954d1333c4 .
The revert is due to apps calling super.onGeolocationPermissionsShowPrompt see b/22685046
Change-Id: I2a9f42b432a010828a0cafaee064480bb0f91cbe
2015-07-23 17:16:16 +00:00
Filip Gruszczynski
0867d26270
Merge "Fix NPE when requesting outsets for detached view."
2015-07-23 16:05:48 +00:00
Tomasz Mikolajewski
3f78e175ac
Add COLUMN_CAPACITY_BYTES column to DocumentsContract.
...
Alternatives were considered:
- COLUMN_CAPACITY dounds more like real english sentence, but it is
inconsistent with consistent with COLUMN_AVAILABLE_BYTES.
- COLUMN_USED_BYTES is consistent with COLUMN_AVAILABLE_BYTES but we rarely
care about used bytes, more about total capacity. Such information is also
rarely exposed by backends, and would have to be computed, so misleading.
BUG=None
Change-Id: Ic1ff3eb8fc9ec12cc79ee78c490f361f77cb4706
2015-07-23 18:06:11 +09:00
Tomasz Mikolajewski
a375a99884
Add support for efficient move within a document provider.
...
Currently moving files even within the same document provider causes
reading and writing all of the bytes, which is very inefficient for all
network based solutions, eg. Drive where moving even huge files can be
instant.
This CL adds an optional moveDocument method to the DocumentProvider as
well as DocumentContract so providers can implement an efficient way of
moving things. If not implemented, we would fallback to moving by
streaming.
BUG=None
Change-Id: I74d6754f96cbafa749a04ca9aebf2e0e2b64b515
2015-07-23 16:00:05 +09:00
Tomasz Mikolajewski
74fe1816e8
Add support for efficient copy within a document provider.
...
Currently copying files even within the same document provider causes
reading and writing all of the bytes, which is very inefficient for all
network based solutions, eg. Drive where copying even huge files can be
instant.
This CL adds an optional copyDocument method to the DocumentProvider as
well as DocumentContract so providers can implement an efficient way of
copying things. If not implemented, we would fallback to copying by
streaming.
BUG=None
Change-Id: I8f2b2c0c834717f07d42f8247cd1fc025e82239a
2015-07-23 13:43:49 +09:00
Filip Gruszczynski
31d300f914
Fix NPE when requesting outsets for detached view.
...
Outsets are used during measure/layout pass, but this can be called on a
view that is not currently attached.
This is a cherry pick that somehow didn't get through to master.
Bug: 21602590
Change-Id: I23e3acc45ca4bf7684d8913f839e29e8e9e94d78
2015-07-22 15:46:06 -07:00
Jorim Jaggi
fcf9acb95a
am 20df6234: Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev
...
* commit '20df62345910ad390a3bb321990987757db0831d':
Add callback to voice interaction session for lockscreen shown
2015-07-22 20:22:56 +00:00
Steve McKay
3b409d01b9
Push equals impl into SparseBooleanArray.
...
Also, implement hashcode, because it is naughty to not.
Change-Id: I2042dac6840cf07027871783a7b6763578fa805d
2015-07-22 11:53:14 -07:00
Steve McKay
0ab6b0e824
Merge "Update DirectoryFragment to use RecyclerView."
2015-07-22 18:20:33 +00:00
Steve McKay
4b3a13c1d0
Update DirectoryFragment to use RecyclerView.
...
Add MultiSelectMaanger class to manager selection on a RecyclerView instance.
There are several outstanding issues that still need to be addressed
surrounding Grid mode as the GridLayout manager doesn't support
automatic column count calculation.
Also, we're missing the puddle effect on touch...
And probably other stuff. But it all *mostly* works.
Oh, also. Footers are currently commented out.
Add traditional unit tests for MultiSelectManager.
BUG: 22225617
Change-Id: I3cd26a10683f42053556d463a5d2f0d2a0bbde84
2015-07-21 17:30:32 -07:00
Jorim Jaggi
20df623459
Merge "Add callback to voice interaction session for lockscreen shown" into mnc-dev
2015-07-21 22:46:30 +00:00
Jorim Jaggi
c1244a2995
Merge "Touch, wake and unlock" into mnc-dev
2015-07-21 21:53:11 +00:00
Fyodor Kupolov
a48c0304bf
am cc432cc0: am 5211528b: am 67cd2fc5: am cf6500b9: am 55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev
...
* commit 'cc432cc08919cec386213f993b36bfdc5adf6ed0':
Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
2015-07-21 21:49:41 +00:00
Svetoslav
373ee3811f
am 2cf699c5: am aeb34f1a: am 161314fa: am 358af143: am 81adda25: Merge "Always create nodes for views backed by an adapter." into mnc-dev
...
* commit '2cf699c5314a89e02127cc7e2535cdb7ea385162':
Always create nodes for views backed by an adapter.
2015-07-21 21:43:10 +00:00
Fyodor Kupolov
cc432cc089
am 5211528b: am 67cd2fc5: am cf6500b9: am 55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev
...
* commit '5211528b9d1f51dca284d40e8d63dc3bc9527ac7':
Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
2015-07-21 21:31:44 +00:00
Fyodor Kupolov
67cd2fc5eb
am cf6500b9: am 55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev
...
* commit 'cf6500b9bae461107d5c0c58de511df907d19fb3':
Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
2015-07-21 21:05:01 +00:00
Fyodor Kupolov
cf6500b9ba
am 55a116d0: Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev
...
* commit '55a116d00ca3f7b84a6af1c5c3472323ad5bc6ca':
Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
2015-07-21 20:50:24 +00:00
Fyodor Kupolov
55a116d00c
Merge "Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction" into mnc-dev
2015-07-21 20:32:28 +00:00
Svetoslav
2cf699c531
am aeb34f1a: am 161314fa: am 358af143: am 81adda25: Merge "Always create nodes for views backed by an adapter." into mnc-dev
...
* commit 'aeb34f1a516b9094a7552b8bb473756ab6079694':
Always create nodes for views backed by an adapter.
2015-07-21 19:53:51 +00:00
Jorim Jaggi
19695d9711
Add callback to voice interaction session for lockscreen shown
...
Bug: 22402726
Change-Id: Iaf83e2f2b0389d74b6ecf480aa91a34443803f7b
2015-07-21 12:35:16 -07:00
Svetoslav
161314fa54
am 358af143: am 81adda25: Merge "Always create nodes for views backed by an adapter." into mnc-dev
...
* commit '358af143454fdcda120e90840b6ca835bebc4120':
Always create nodes for views backed by an adapter.
2015-07-21 19:30:37 +00:00
Svetoslav
358af14345
am 81adda25: Merge "Always create nodes for views backed by an adapter." into mnc-dev
...
* commit '81adda25b396ee3db794bc9a7946b579d01c2aa0':
Always create nodes for views backed by an adapter.
2015-07-21 19:12:13 +00:00
Fyodor Kupolov
53019287fd
Updated JavaDoc for DISALLOW_MODIFY_ACCOUNTS restriction
...
Bug: 21521860
Change-Id: I0c2659f84589a77432317fbc89d49716027577d3
2015-07-21 12:06:14 -07:00
Svetoslav
81adda25b3
Merge "Always create nodes for views backed by an adapter." into mnc-dev
2015-07-21 19:01:19 +00:00
Raph Levien
d8563ddb6a
am c48d2f78: am ab30f486: am fa8570bc: am 7026617e: am 1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev
...
* commit 'c48d2f780f5ef14af574f3c3d6668cb03470e50d':
Respect style boundaries when measuring text
2015-07-21 18:02:42 +00:00
Raph Levien
c48d2f780f
am ab30f486: am fa8570bc: am 7026617e: am 1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev
...
* commit 'ab30f486ba553d547aac0ff48d87cf307de2871d':
Respect style boundaries when measuring text
2015-07-21 17:49:07 +00:00
Raph Levien
fa8570bcd2
am 7026617e: am 1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev
...
* commit '7026617e74cc1753ae7c1846e005dc7b3286170d':
Respect style boundaries when measuring text
2015-07-21 17:17:49 +00:00
Raph Levien
7026617e74
am 1fcb6d3a: Merge "Respect style boundaries when measuring text" into mnc-dev
...
* commit '1fcb6d3ae27ac95388eb036d124bd4bd0c6559cc':
Respect style boundaries when measuring text
2015-07-21 17:04:36 +00:00
Raph Levien
1fcb6d3ae2
Merge "Respect style boundaries when measuring text" into mnc-dev
2015-07-21 16:55:39 +00:00
Alan Viverette
543bd5e131
am c447689d: am 872cb95c: am 9362d96a: am 783b3d9d: am 001f1e7e: Merge "Add missing invalidation check to drawable cache" into mnc-dev
...
* commit 'c447689d2770a5f09bbef19a3097236f4a8e7445':
Add missing invalidation check to drawable cache
2015-07-21 00:16:12 +00:00
Dianne Hackborn
b4a3d4df6f
am d9c5769e: am 0f8d156e: am 5c97a4ba: am 609cb585: am a7ce2344: Merge "Fix issue #22564918 : Request is inactive" into mnc-dev
...
* commit 'd9c5769e1b0b9fd6044876e5f8af640a16dcd7c3':
Fix issue #22564918 : Request is inactive
2015-07-21 00:15:44 +00:00
Roozbeh Pournader
0792925da2
am edd2e67c: am 2dc20d7a: am 293eca69: am 32f7527d: am 2dc6ebbe: Merge "Fix default value of stereoReset() in the documentation." into mnc-dev
...
* commit 'edd2e67cf217de075ee7184e080e17859c72d523':
Fix default value of stereoReset() in the documentation.
2015-07-21 00:14:57 +00:00
Keisuke Kuroyanagi
2305f99d01
am abe22377: am 7423ca03: am d49c3b65: am 00eb5767: am 437eb6ce: Merge "Fix: Wrong suggestion popup position in extract mode." into mnc-dev
...
* commit 'abe22377262a2aadbeb3b64d8bc10916b0256d6d':
Fix: Wrong suggestion popup position in extract mode.
2015-07-21 00:14:50 +00:00
Roozbeh Pournader
bd04eaa950
am 6f5bf717: am e5b23381: am e043a74b: am 91bb9d0a: am 9bdb7bfd: Merge "Bidi-wrap the results of format[Short]FileSize()." into mnc-dev
...
* commit '6f5bf7170281b29ef1080fb02328715e08e19d8d':
Bidi-wrap the results of format[Short]FileSize().
2015-07-21 00:13:59 +00:00
Jorim Jaggi
740452e875
Touch, wake and unlock
...
- Add onFingerprintAcquired, so Keyguard can grab a wakelock to prevent
the device from sleeping.
- If we get a successful fingerprint, wake the device up, immediately
dismiss the keyguard and tell PWM that we kicked off our frame that
will represent the correct state.
- PWM then waits for this frame to be drawn, and then turns on the
screen, which results in unlocking directly to the previsouly
opened app.
Bug: 21855614
Change-Id: I5f43df17fa5e4e9c6a6392eef4a4590b07df4f96
2015-07-20 23:52:20 +00:00
Alan Viverette
c447689d27
am 872cb95c: am 9362d96a: am 783b3d9d: am 001f1e7e: Merge "Add missing invalidation check to drawable cache" into mnc-dev
...
* commit '872cb95cf211b6d30c8ac6f7670bbd5de19d33cb':
Add missing invalidation check to drawable cache
2015-07-20 23:47:01 +00:00
Dianne Hackborn
d9c5769e1b
am 0f8d156e: am 5c97a4ba: am 609cb585: am a7ce2344: Merge "Fix issue #22564918 : Request is inactive" into mnc-dev
...
* commit '0f8d156efa70b4bd3025c1a666d20801bd2485f6':
Fix issue #22564918 : Request is inactive
2015-07-20 23:30:54 +00:00
Raph Levien
ea2b4a40f7
Respect style boundaries when measuring text
...
The existing implementation of handleText() in TextLine laid out
text to the end of the context. However, in cases where the text is
broken into multiple style spans, it's only valid to lay out up to
the end of the style span. This can lead to inconsistent
measurements, especially in the presence of legitimate zero-width
characters such as bidi control characters and zero width space.
This patch changes the invocation of getRunAdvance to measure only
within the style span.
Bug: 22589743
Change-Id: I027f5e77db27ddf9596ef20adcad7e62a82b41de
2015-07-20 16:22:01 -07:00
Alan Viverette
9362d96a26
am 783b3d9d: am 001f1e7e: Merge "Add missing invalidation check to drawable cache" into mnc-dev
...
* commit '783b3d9d0954f7bba5f69ed7a15af61c55af7cfc':
Add missing invalidation check to drawable cache
2015-07-20 23:15:19 +00:00
Dianne Hackborn
5c97a4bad5
am 609cb585: am a7ce2344: Merge "Fix issue #22564918 : Request is inactive" into mnc-dev
...
* commit '609cb5853362a742870b70d1234afdae62e2ff62':
Fix issue #22564918 : Request is inactive
2015-07-20 23:01:48 +00:00
Alan Viverette
783b3d9d09
am 001f1e7e: Merge "Add missing invalidation check to drawable cache" into mnc-dev
...
* commit '001f1e7eb35630df24d53298c1a3d2de055d7ce9':
Add missing invalidation check to drawable cache
2015-07-20 22:59:33 +00:00
Qiwen Zhao
06e260b8db
Merge commit '01fda527'
...
Change-Id: I08b5e7e8576f463c00be12879b465fa9c8cda8f5
2015-07-20 15:52:23 -07:00
Alan Viverette
001f1e7eb3
Merge "Add missing invalidation check to drawable cache" into mnc-dev
2015-07-20 22:44:47 +00:00
Dianne Hackborn
609cb58533
am a7ce2344: Merge "Fix issue #22564918 : Request is inactive" into mnc-dev
...
* commit 'a7ce23440328e63f36a4add05199aa84ff04032d':
Fix issue #22564918 : Request is inactive
2015-07-20 22:44:13 +00:00
Dianne Hackborn
a7ce234403
Merge "Fix issue #22564918 : Request is inactive" into mnc-dev
2015-07-20 22:34:49 +00:00
Roozbeh Pournader
edd2e67cf2
am 2dc20d7a: am 293eca69: am 32f7527d: am 2dc6ebbe: Merge "Fix default value of stereoReset() in the documentation." into mnc-dev
...
* commit '2dc20d7ab2bce9ff9e309b599424963711ece718':
Fix default value of stereoReset() in the documentation.
2015-07-20 22:08:16 +00:00