Matthew Williams
8ef2204c8f
Refactor SyncManager rename authority->target
...
fix bug that was stopping any sync service sync from
from taking place.
Change-Id: Ib3f46d43be630d4196fbf0ca32da03b6e7a6a5b9
2013-09-13 19:22:50 -07:00
Chet Haase
ae277d89aa
am a22f4e98: am c19d683d: Merge "Build layer immediately when setting it in ViewPropertyAnimator" into klp-dev
...
* commit 'a22f4e981a668025d059ca1710403aedb6a6ac30':
Build layer immediately when setting it in ViewPropertyAnimator
2013-09-11 10:11:30 -07:00
Chet Haase
d8d3c0f0b8
am 48cad812: am a8e17653: Merge "Reversing immediately after starting animator ends it" into klp-dev
...
* commit '48cad812301421bad981ed343d84e683de2fc1f1':
Reversing immediately after starting animator ends it
2013-09-11 10:11:26 -07:00
Adam Skory
a7cda03a47
resolved conflicts for merge of 7d17de35 to master
...
Conflicts:
core/res/res/values/public.xml
Change-Id: I14b4e332be7ef27e76a2773a504cb942bd0642ef
2013-09-11 16:16:19 +01:00
Chet Haase
a22f4e981a
am c19d683d: Merge "Build layer immediately when setting it in ViewPropertyAnimator" into klp-dev
...
* commit 'c19d683d9ea5dafdd8e355dc3fa34b362bc379e9':
Build layer immediately when setting it in ViewPropertyAnimator
2013-09-11 07:17:05 -07:00
Chet Haase
48cad81230
am a8e17653: Merge "Reversing immediately after starting animator ends it" into klp-dev
...
* commit 'a8e176534cb086cdf925b0ab0fbd7c2859a1de44':
Reversing immediately after starting animator ends it
2013-09-11 07:17:02 -07:00
Chet Haase
c19d683d9e
Merge "Build layer immediately when setting it in ViewPropertyAnimator" into klp-dev
2013-09-11 14:14:06 +00:00
Chet Haase
a8e176534c
Merge "Reversing immediately after starting animator ends it" into klp-dev
2013-09-11 14:13:48 +00:00
Adam Skory
7d17de357a
am 86d9c457: Merge "Revert services assist context in KitKat" into klp-dev
...
* commit '86d9c457de3285f01552d4046a8a260c7a75147f':
Revert services assist context in KitKat
2013-09-11 04:46:13 -07:00
Adam Skory
86d9c457de
Merge "Revert services assist context in KitKat" into klp-dev
2013-09-11 11:27:50 +00:00
Adam Skory
7140a25f01
Revert services assist context in KitKat
...
Reverts extension to assist context API to query
foreground services for assist context data.
Also hides Intent.ACTION_VOICE_ASSIST because
nobody's actually using it yet.
Bug: 10461702
Change-Id: Idf6836adc659b434e11ebb2b98e8b814c94a7227
2013-09-11 12:04:58 +01:00
Marc Wilson
9ddfa0e283
am 02ff99c8: am e3af2dd7: Merge "Update documentation for speech APIs." into klp-dev
...
* commit '02ff99c83942cdeae59e2e0abdc9b1493fe87006':
Update documentation for speech APIs.
2013-09-11 03:55:52 -07:00
Marc Wilson
02ff99c839
am e3af2dd7: Merge "Update documentation for speech APIs." into klp-dev
...
* commit 'e3af2dd7a7883c5ae60fd6b9f6fb8d434e12d66a':
Update documentation for speech APIs.
2013-09-11 03:52:45 -07:00
Marc Wilson
e3af2dd7a7
Merge "Update documentation for speech APIs." into klp-dev
2013-09-11 10:50:34 +00:00
Narayan Kamath
d6b37fdf6c
Allow SSL caches to be installed directly on SSLContexts.
...
This allows clients to enable ssl session caching without
having to use SSLCertificateSocketFactory.
Change-Id: Id63b8b31f51c96e73beefe9ecc5fd0cf0a1852c6
2013-09-11 08:49:59 +00:00
Tor Norbye
78d0005027
Merge "Add @NotNull, @Nullable, and @IntDef/@StringDef annotations"
2013-09-11 01:24:02 +00:00
Amith Yamasani
41be933285
am 485d9afe: am a0a47c73: Merge "Backup and restore ringtone and notification ringtone" into klp-dev
...
* commit '485d9afe60c2e42ccccd95d7934c24c5c8b2c995':
Backup and restore ringtone and notification ringtone
2013-09-10 17:08:45 -07:00
Amith Yamasani
485d9afe60
am a0a47c73: Merge "Backup and restore ringtone and notification ringtone" into klp-dev
...
* commit 'a0a47c737951db52af4943f5737da48d30adc6fe':
Backup and restore ringtone and notification ringtone
2013-09-10 17:05:45 -07:00
Chet Haase
74d31d106b
Build layer immediately when setting it in ViewPropertyAnimator
...
Previously, withLayer() would simply set the layer type in the runnable
called in onAnimationStart(). Now we also call buildLayer(), to get it
out of the way prior to the view drawing for the first time after the
animation begins.
Issue #9422420 ViewPropertyAnimator.withLayer() should build layer immediately
Change-Id: I99923a234f7ca1ec0b6f1b0bf28b62a71ab7eb4d
2013-09-10 17:05:44 -07:00
Jeff Sharkey
d7ae147446
am bd56a17d: am af4d039f: Merge "More UX work for thumbnails, search, management." into klp-dev
...
* commit 'bd56a17df26a3c7f4e32ca3be08fbf28f625dffa':
More UX work for thumbnails, search, management.
2013-09-10 17:05:07 -07:00
Amith Yamasani
a0a47c7379
Merge "Backup and restore ringtone and notification ringtone" into klp-dev
2013-09-11 00:03:50 +00:00
Jeff Sharkey
bd56a17df2
am af4d039f: Merge "More UX work for thumbnails, search, management." into klp-dev
...
* commit 'af4d039fb3a45d4a74683a69ee48071b8338a13d':
More UX work for thumbnails, search, management.
2013-09-10 17:02:11 -07:00
Jeff Sharkey
af4d039fb3
Merge "More UX work for thumbnails, search, management." into klp-dev
2013-09-10 23:59:43 +00:00
Jeff Brown
279f3cdf70
am 9993f8ff: am dc6fd0a2: Merge "Propagate input ANR reason to activity manager log." into klp-dev
...
* commit '9993f8ff24718553c05872d9f13f4114701b3428':
Propagate input ANR reason to activity manager log.
2013-09-10 16:58:06 -07:00
Jeff Brown
9993f8ff24
am dc6fd0a2: Merge "Propagate input ANR reason to activity manager log." into klp-dev
...
* commit 'dc6fd0a20a095ac0fb544184d8a4258e80b4a14d':
Propagate input ANR reason to activity manager log.
2013-09-10 16:55:25 -07:00
Jeff Brown
dc6fd0a20a
Merge "Propagate input ANR reason to activity manager log." into klp-dev
2013-09-10 23:52:53 +00:00
Jeff Brown
bd181bb832
Propagate input ANR reason to activity manager log.
...
Make it a little easier to diagnose input dispatch timeouts by
providing the detailed reason as the ANR annotation in the log.
Bug: 10689184
Change-Id: Ie18fd9ad066b0673d1f57c030e027ad0085f4650
2013-09-10 16:44:24 -07:00
Jeff Brown
d0d99a474b
Merge "Fix crash when Looper used after quit."
2013-09-10 23:41:25 +00:00
Jeff Sharkey
4ec973925f
More UX work for thumbnails, search, management.
...
Hide non-finished downloads from normal picker UI, but keep them
around in management mode. Uses a Uri query parameter and a hidden
API on DocumentsProvider.
Scale thumbnails to fit viewport, always show MIME icon while waiting
on thumbnails, and crossfade between them. Cancel thumbnail tasks
when views are recycled.
Filter directories out of search results for now. Also leave sort
ordering from backend intact, since it's custom ranking. Fix
SearchView interaction to dismiss properly and restore across
orientation and drawer state changes.
Hide most actions when drawer is open. Invalidate RootInfo cache
when locale changes. Apply sort ordering when showing recent create
directories. Hide recent summary string when icon is enough for user
to disambiguate.
Bug: 10667184, 10665663
Change-Id: I331d3272a08c497f88dc659d9e112231cb35aa69
2013-09-10 16:40:36 -07:00
Yorke Lee
a6eba00dde
am 2f38d460: am 4459f498: Merge "Update javadocs for number presentation" into klp-dev
...
* commit '2f38d460f38efc2cadc6dce0f924fa1523123200':
Update javadocs for number presentation
2013-09-10 16:33:34 -07:00
Yorke Lee
2f38d460f3
am 4459f498: Merge "Update javadocs for number presentation" into klp-dev
...
* commit '4459f49869d85a4c88cfa311a9a2af45ecc8d056':
Update javadocs for number presentation
2013-09-10 16:30:37 -07:00
Yorke Lee
4459f49869
Merge "Update javadocs for number presentation" into klp-dev
2013-09-10 23:25:15 +00:00
Alan Viverette
b1e91e37a3
Merge "Add public attr for fragmentBreadCrumbStyle, apply in constructor"
2013-09-10 23:03:42 +00:00
Yorke Lee
49e1cf946f
Update javadocs for number presentation
...
Bug: 10461762
Change-Id: Idfd19fb5f522569afa775ce95e0ba975324a0ee2
2013-09-10 15:34:34 -07:00
Alan Viverette
aaca5d888a
Add public attr for fragmentBreadCrumbStyle, apply in constructor
...
BUG: 10680808
Change-Id: I7c22c1ff0b91892e62ea6bf6a311d33df6f13d78
2013-09-10 15:04:10 -07:00
David Braun
84166e888b
am 4cd9612c: am b776122a: Merge "Factor out read/write SMS settings seperate from send/receive." into klp-dev
...
* commit '4cd9612c3268277581589b34cc49ed04c93873b2':
Factor out read/write SMS settings seperate from send/receive.
2013-09-10 13:38:12 -07:00
David Braun
4cd9612c32
am b776122a: Merge "Factor out read/write SMS settings seperate from send/receive." into klp-dev
...
* commit 'b776122a8aa9fd082fa8aaa216c8a589d709c4c9':
Factor out read/write SMS settings seperate from send/receive.
2013-09-10 13:35:42 -07:00
David Braun
b776122a8a
Merge "Factor out read/write SMS settings seperate from send/receive." into klp-dev
2013-09-10 20:33:28 +00:00
David Braun
18966a8dd8
Factor out read/write SMS settings seperate from send/receive.
...
Change-Id: I161782b1508be433c910ec13c0b18e728bf7d2ba
2013-09-10 13:14:46 -07:00
Alan Viverette
e2c6f66921
am d54529c4: am 23819e7e: Merge "Make ListView\'s illegal state exception more helpful" into klp-dev
...
* commit 'd54529c43545faa10cac4e34e9b8d623de121e2e':
Make ListView's illegal state exception more helpful
2013-09-10 13:10:29 -07:00
Alan Viverette
d54529c435
am 23819e7e: Merge "Make ListView\'s illegal state exception more helpful" into klp-dev
...
* commit '23819e7e5d3b5e2c5d4b47b1a8133bc950e1eb82':
Make ListView's illegal state exception more helpful
2013-09-10 13:08:07 -07:00
Alan Viverette
23819e7e5d
Merge "Make ListView's illegal state exception more helpful" into klp-dev
2013-09-10 20:05:59 +00:00
Igor Murashkin
9ee3680397
am 900e04c1: am 50209368: Merge "camera2: Don\'t NPE in onStatusChanged" into klp-dev
...
* commit '900e04c1a2e0529a9a99be12222efccd5f74e306':
camera2: Don't NPE in onStatusChanged
2013-09-10 12:34:48 -07:00
Igor Murashkin
900e04c1a2
am 50209368: Merge "camera2: Don\'t NPE in onStatusChanged" into klp-dev
...
* commit '50209368626d53b1f8a4a6fdf50d280c7cf65a65':
camera2: Don't NPE in onStatusChanged
2013-09-10 12:31:47 -07:00
Igor Murashkin
5020936862
Merge "camera2: Don't NPE in onStatusChanged" into klp-dev
2013-09-10 19:29:27 +00:00
Chet Haase
b4f6d40f62
am 9f7136e9: am 59b7a4ec: Merge "Fix for transition layout suppression" into klp-dev
...
* commit '9f7136e9632a2fa4b8f8b5eaae300b5b104d7807':
Fix for transition layout suppression
2013-09-10 11:49:40 -07:00
Adam Powell
ab83c7b9b5
am 218b1163: am 6a221b3f: Fix some bizarre Spinner behavior
...
* commit '218b116344688053d3856a8ea8abc3dc241bcee1':
Fix some bizarre Spinner behavior
2013-09-10 11:49:37 -07:00
Chet Haase
9f7136e963
am 59b7a4ec: Merge "Fix for transition layout suppression" into klp-dev
...
* commit '59b7a4ec9ce6e9af3afc5a3e66c7e2f36bd74ab7':
Fix for transition layout suppression
2013-09-10 11:47:15 -07:00
Adam Powell
218b116344
am 6a221b3f: Fix some bizarre Spinner behavior
...
* commit '6a221b3f85fbe7cbfbd11b9eeb672baca27faec2':
Fix some bizarre Spinner behavior
2013-09-10 11:47:12 -07:00
Chet Haase
59b7a4ec9c
Merge "Fix for transition layout suppression" into klp-dev
2013-09-10 18:44:21 +00:00