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 Sharkey
cc8f710a50
Include system packages in packages.list.
...
This provides group membership to the FUSE daemon, since system
packages like NFC and Bluetooth hold sdcard_rw.
Bug: 10610659
Change-Id: I7428e999cfa4087ffe220b9d8bd80827191ab997
2013-09-10 16:57:24 -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
Craig Mautner
3f339d8193
am 88cfdae6: am cdd82540: Merge "When waiting for activity to finish don\'t reset" into klp-dev
...
* commit '88cfdae667bd85931c1bf81781a54472a8fe3ac7':
When waiting for activity to finish don't reset
2013-09-10 15:17:23 -07:00
Craig Mautner
88cfdae667
am cdd82540: Merge "When waiting for activity to finish don\'t reset" into klp-dev
...
* commit 'cdd82540f2f98e7b4374fdd81e771eb217a27573':
When waiting for activity to finish don't reset
2013-09-10 15:14:42 -07:00
Craig Mautner
cdd82540f2
Merge "When waiting for activity to finish don't reset" into klp-dev
2013-09-10 22:11:58 +00: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
John Reck
2f93af4574
am 53760b4a: am 874ae2ad: Merge "Fix scissor for functor invocation" into klp-dev
...
* commit '53760b4a97fb2f88e94da73d647ff80221b3c454':
Fix scissor for functor invocation
2013-09-10 14:08:12 -07:00
John Reck
53760b4a97
am 874ae2ad: Merge "Fix scissor for functor invocation" into klp-dev
...
* commit '874ae2adf8c24c4b9d68f781239a95ad047e212a':
Fix scissor for functor invocation
2013-09-10 14:05:32 -07:00
John Reck
874ae2adf8
Merge "Fix scissor for functor invocation" into klp-dev
2013-09-10 21:03:48 +00:00
Tim Murray
efb6beb438
am 19c727bb: am 895a4375: Merge "Fix FontRenderer bug." into klp-dev
...
* commit '19c727bbc6371924bfd2f85e804b5b6b093a8413':
Fix FontRenderer bug.
2013-09-10 14:03:39 -07:00
Tim Murray
19c727bbc6
am 895a4375: Merge "Fix FontRenderer bug." into klp-dev
...
* commit '895a43751fcf4f33e5437963d75d05c2cd754520':
Fix FontRenderer bug.
2013-09-10 14:01:53 -07:00
Tim Murray
895a43751f
Merge "Fix FontRenderer bug." into klp-dev
2013-09-10 21:00:37 +00:00
Tim Murray
7a454ba5fe
Fix FontRenderer bug.
...
bug 10691313
Change-Id: Icd5341a3c2066e337911f040ddc935c48c8d7cd1
2013-09-10 13:46:49 -07:00
John Reck
25d2f7bc1f
Fix scissor for functor invocation
...
Bug: 10677765
enableScissor() must precede setScissorFromClip() as
otherwise setScissorFromClip() doesn't do anything.
Also make sure to call setScissorFromClip() if
enableScissor() returns true as enableScissor() calls
resetScissor() if the scissor state has changed.
Change-Id: I9226b20bb256c92066aae344e4e6407540b6eae9
2013-09-10 20:45:29 +00: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
Jason Monk
96f098ea01
am b28da848: am e6b4163f: Merge "Verify inputs to PAC resolving." into klp-dev
...
* commit 'b28da8489619bafcc0206d3e3b725af91134a6b4':
Verify inputs to PAC resolving.
2013-09-10 13:34:32 -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
Jason Monk
b28da84896
am e6b4163f: Merge "Verify inputs to PAC resolving." into klp-dev
...
* commit 'e6b4163f38c18072ef89ec593d4647c581dd9a8a':
Verify inputs to PAC resolving.
2013-09-10 13:32:08 -07:00
Jason Monk
e6b4163f38
Merge "Verify inputs to PAC resolving." into klp-dev
2013-09-10 20:27:23 +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
Zhijun He
b87857b50b
am 487a8fc9: am 82d11f8e: Merge "MediaMuxer: Add setLocation API" into klp-dev
...
* commit '487a8fc9d487a68159c57b4de896ba7be88f1c2b':
MediaMuxer: Add setLocation API
2013-09-10 12:48:13 -07:00
Zhijun He
487a8fc9d4
am 82d11f8e: Merge "MediaMuxer: Add setLocation API" into klp-dev
...
* commit '82d11f8e94e38e434cb6bc5e3e8d87250956fa1c':
MediaMuxer: Add setLocation API
2013-09-10 12:43:59 -07:00
Zhijun He
82d11f8e94
Merge "MediaMuxer: Add setLocation API" into klp-dev
2013-09-10 19:41:11 +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
Kenny Root
8b79730e21
am 3ae0ffe9: am 0611f477: am 90e42717: Merge changes I5d2be3c5,I9017256b
...
* commit '3ae0ffe9c65fc8aee4ce46a5c7fb30747bd4c2fa':
Add argument to binder call to check key types
Use hostname verifier directly instead of instance
2013-09-10 11:58:35 -07:00
Kenny Root
3ae0ffe9c6
am 0611f477: am 90e42717: Merge changes I5d2be3c5,I9017256b
...
* commit '0611f47721e32e5386884881b055fde6eec5e3c0':
Add argument to binder call to check key types
Use hostname verifier directly instead of instance
2013-09-10 11:54:32 -07:00
Kenny Root
0611f47721
am 90e42717: Merge changes I5d2be3c5,I9017256b
...
* commit '90e42717e590e2f7d2fb7270daae589a97271c63':
Add argument to binder call to check key types
Use hostname verifier directly instead of instance
2013-09-10 11:52:16 -07:00
Kenny Root
90e42717e5
Merge changes I5d2be3c5,I9017256b
...
* changes:
Add argument to binder call to check key types
Use hostname verifier directly instead of instance
2013-09-10 18:50:02 +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
Kenny Root
0b83f9c805
Add argument to binder call to check key types
...
Before there was only one key type supported, so we didn't need to query
a key type. Now there is DSA, EC, and RSA, so there needs to be another
argument.
(cherry picked from commit b91773bce1126d28a93f73fbef18f3a79245f24e)
Bug: 10600582
Change-Id: I5d2be3c514ff7404a90df76dc263484c5f226e6f
2013-09-10 18:49:40 +00:00