Jeff Brown
b1eb620219
am 83bf4404: am 3e3296e5: am 82f31701: Merge "Log view root, input and looper state in bug reports." into klp-dev
...
* commit '83bf440440309a394f792e3d8a6acb98197d9d7c':
Log view root, input and looper state in bug reports.
2013-10-17 19:28:23 -07:00
Jeff Brown
0c00400fba
am 1a53f76d: am 86ca500e: am f10ba7c7: Merge "Make dump messages asynchronous." into klp-dev
...
* commit '1a53f76d529bb2c4af05d4cbb7d6967693345788':
Make dump messages asynchronous.
2013-10-17 19:16:40 -07:00
Jeff Brown
83bf440440
am 3e3296e5: am 82f31701: Merge "Log view root, input and looper state in bug reports." into klp-dev
...
* commit '3e3296e526663306237fe551527146286e14f4e4':
Log view root, input and looper state in bug reports.
2013-10-17 19:13:30 -07:00
Jeff Brown
1a53f76d52
am 86ca500e: am f10ba7c7: Merge "Make dump messages asynchronous." into klp-dev
...
* commit '86ca500ed14a524c467596cc7c663b88db72038d':
Make dump messages asynchronous.
2013-10-17 19:13:16 -07:00
Jeff Brown
82f3170114
Merge "Log view root, input and looper state in bug reports." into klp-dev
2013-10-18 02:08:20 +00:00
Jeff Brown
f10ba7c7dc
Merge "Make dump messages asynchronous." into klp-dev
2013-10-18 02:07:18 +00:00
Jeff Sharkey
eeb58c79c0
am 703840da: am 1a5804d7: am 0c0f1e2e: Merge "Include external storage devices in DocumentsUI." into klp-dev
...
* commit '703840da8a33c703f2d787526438c650b0318845':
Include external storage devices in DocumentsUI.
2013-10-17 18:55:22 -07:00
Jeff Sharkey
db289e0ac7
am 47938450: am 306bb90d: am 8f4c15d8: Merge "Plumb through physical device UUID and label." into klp-dev
...
* commit '47938450b4d19f60edf774c8f451d53aa110ea0b':
Plumb through physical device UUID and label.
2013-10-17 18:55:13 -07:00
Jeff Sharkey
703840da8a
am 1a5804d7: am 0c0f1e2e: Merge "Include external storage devices in DocumentsUI." into klp-dev
...
* commit '1a5804d7aa253432f37fbd5d8eb89ac363501fe9':
Include external storage devices in DocumentsUI.
2013-10-17 18:53:26 -07:00
Jeff Sharkey
47938450b4
am 306bb90d: am 8f4c15d8: Merge "Plumb through physical device UUID and label." into klp-dev
...
* commit '306bb90d97da583c3728d35073ebcb7f7ca5c467':
Plumb through physical device UUID and label.
2013-10-17 18:53:15 -07:00
Jeff Sharkey
0c0f1e2eac
Merge "Include external storage devices in DocumentsUI." into klp-dev
2013-10-18 01:46:52 +00:00
Jeff Sharkey
8f4c15d8e4
Merge "Plumb through physical device UUID and label." into klp-dev
2013-10-18 01:45:58 +00:00
Dianne Hackborn
e05df630bc
am 9039b9a7: am 63a16e0e: am 6834ae69: Merge "Fix issue #11256132 : Add density bucket for all real numbers between 0 and ∞..." into klp-dev
...
* commit '9039b9a7efd6d42e842de35d2246971e74753035':
Fix issue #11256132 : Add density bucket for all real numbers between 0 and ∞...
2013-10-17 18:32:22 -07:00
Dianne Hackborn
9039b9a7ef
am 63a16e0e: am 6834ae69: Merge "Fix issue #11256132 : Add density bucket for all real numbers between 0 and ∞..." into klp-dev
...
* commit '63a16e0e0c4a9691a35f815d5422bdf0fa72efda':
Fix issue #11256132 : Add density bucket for all real numbers between 0 and ∞...
2013-10-17 18:29:17 -07:00
Dianne Hackborn
6834ae6922
Merge "Fix issue #11256132 : Add density bucket for all real numbers between 0 and ∞..." into klp-dev
2013-10-18 01:25:00 +00:00
Dianne Hackborn
09acb7ca89
Fix issue #11256132 : Add density bucket for all real numbers between 0 and ∞...
...
Well, how about 400. 400 is a real number.
Change-Id: I29ac61b7d629d582c7b68367365a7f81fcf679a2
2013-10-17 17:28:09 -07:00
Scott Main
2e8e2000d7
am 94dc050f: am 12e067fd: am b38ad76a: additional javadoc for NfcAdapter.ReaderCallback
...
* commit '94dc050fb97d5c36c1a6c7e59f5ef6c9e7055b3c':
additional javadoc for NfcAdapter.ReaderCallback
2013-10-17 16:13:20 -07:00
Scott Main
94dc050fb9
am 12e067fd: am b38ad76a: additional javadoc for NfcAdapter.ReaderCallback
...
* commit '12e067fd38d513e3c6ad3704ada0286347d72b65':
additional javadoc for NfcAdapter.ReaderCallback
2013-10-17 16:09:27 -07:00
Alan Viverette
4732783143
am 20fbf7ea: am a74cf4f9: am 280dc0ea: Merge "Fix assorted FastScroller regressions" into klp-dev
...
* commit '20fbf7ea91c321e6e8974cc1750b86c6c456ab3c':
Fix assorted FastScroller regressions
2013-10-17 14:40:28 -07:00
Scott Main
b38ad76a82
additional javadoc for NfcAdapter.ReaderCallback
...
Change-Id: I3cad8b43d53992bb3d53920abb510456ee72afb5
2013-10-17 11:57:06 -07:00
Alan Viverette
20fbf7ea91
am a74cf4f9: am 280dc0ea: Merge "Fix assorted FastScroller regressions" into klp-dev
...
* commit 'a74cf4f962bbd8ae421b56d875f931806afa13ea':
Fix assorted FastScroller regressions
2013-10-17 11:36:46 -07:00
Alan Viverette
280dc0ea2f
Merge "Fix assorted FastScroller regressions" into klp-dev
2013-10-17 18:30:25 +00:00
Jeff Sharkey
1f706c6cd1
Include external storage devices in DocumentsUI.
...
Include volume UUID in generated document IDs to uniquely identify
volumes over time. Show volume label to users. Watch for mount
changes to update available roots.
Bug: 11175082
Change-Id: Ia151bde768587468efde0c1d97a740b5353d1582
2013-10-17 10:55:32 -07:00
Adam Powell
eb66b5d4cd
am 406e9a01: am 708bc0e2: am f80a7af0: Merge "Register receivers from ViewFlipper with an explicit Handler" into klp-dev
...
* commit '406e9a01c35e4a22e1f15b9f4ce1c4ce329f78a2':
Register receivers from ViewFlipper with an explicit Handler
2013-10-17 10:34:26 -07:00
Adam Powell
406e9a01c3
am 708bc0e2: am f80a7af0: Merge "Register receivers from ViewFlipper with an explicit Handler" into klp-dev
...
* commit '708bc0e24e503beb3b4e31eda8705357c77efcd8':
Register receivers from ViewFlipper with an explicit Handler
2013-10-17 10:31:47 -07:00
Adam Powell
f80a7af0fe
Merge "Register receivers from ViewFlipper with an explicit Handler" into klp-dev
2013-10-17 17:26:10 +00:00
Satoshi Kataoka
03e1c70802
Merge "Introduce an API to get the recommended height of the InputMethodWindow"
2013-10-17 05:24:01 +00:00
Zhijun He
0257767041
am 98d1ba4b: am 650b4616: am 6355103b: Merge "Camera2: filter bad faces" into klp-dev
...
* commit '98d1ba4bd7e9f5b504ad0b7094c639df2c399734':
Camera2: filter bad faces
2013-10-16 16:52:08 -07:00
Svetoslav
58867899b2
am 53998c0f: am 13bc41a5: am 265a099c: Merge "Add APIs for an advanced print options activity." into klp-dev
...
* commit '53998c0f503f258b65d4333e621ceda0ba4b5a5d':
Add APIs for an advanced print options activity.
2013-10-16 16:48:18 -07:00
Zhijun He
98d1ba4bd7
am 650b4616: am 6355103b: Merge "Camera2: filter bad faces" into klp-dev
...
* commit '650b4616c1a4eedcafd9cdd5fcbde94454fff069':
Camera2: filter bad faces
2013-10-16 16:47:39 -07:00
Svetoslav
53998c0f50
am 13bc41a5: am 265a099c: Merge "Add APIs for an advanced print options activity." into klp-dev
...
* commit '13bc41a52d19dc32a5a0a9b23d27a26978439010':
Add APIs for an advanced print options activity.
2013-10-16 16:43:59 -07:00
Adam Powell
b6ed2b1cff
Register receivers from ViewFlipper with an explicit Handler
...
Make sure that the BroadcastReceiver registered by ViewFlipper
enforces that messages come in on the correct (UI) thread.
Bug 11228463
Change-Id: I97f2a1c392f9c58a99afebc60170c9656bba86ad
2013-10-16 16:43:41 -07:00
Scott Main
842bc9c325
am 3d66877b: am 0763e156: am 89ec7c78: Merge "some javadoc improvements for virtual display and new meta tag name" into klp-dev
...
* commit '3d66877b93c037a81f40d896b74b507c57926c54':
some javadoc improvements for virtual display and new meta tag name
2013-10-16 16:40:25 -07:00
Zhijun He
6355103bca
Merge "Camera2: filter bad faces" into klp-dev
2013-10-16 23:39:24 +00:00
Scott Main
3d66877b93
am 0763e156: am 89ec7c78: Merge "some javadoc improvements for virtual display and new meta tag name" into klp-dev
...
* commit '0763e1565b8e82a1754b21e7c9096b525402f724':
some javadoc improvements for virtual display and new meta tag name
2013-10-16 16:36:03 -07:00
Svetoslav
265a099c10
Merge "Add APIs for an advanced print options activity." into klp-dev
2013-10-16 23:35:35 +00:00
Jeff Sharkey
5aca2b8dc4
Plumb through physical device UUID and label.
...
vold now parse out UUID and label for inserted physical devices,
and reports them to framework. Add these to hidden StorageVolume
class for use by DocumentsUI and MediaProvider.
Remove last JNI method in FileUtils!
Bug: 11175082
Change-Id: I1cfcd1ade61767b103f693319ea2600008ee2e3c
2013-10-16 16:34:21 -07:00
Zhijun He
844b3520cc
Camera2: filter bad faces
...
Filter bad face score and ids.
Bug: 11257538
Change-Id: I9beb042e8c0d2f08a3efcd2877deee036b80482f
2013-10-16 16:13:50 -07:00
Svetoslav
1c43fceaaa
Add APIs for an advanced print options activity.
...
This is the API part needed to implement support for custom print
options by a print service. Some printers have quite fancy options
and we want users to benefit using them.
bug:11241800
Change-Id: I3a9df771c0ded559b61c597c686795840d702b27
2013-10-16 15:47:44 -07:00
Michael Wright
de83ff24b8
Merge "Fix conditional for glClear call"
2013-10-16 21:09:18 +00:00
Scott Main
cc2195bb56
some javadoc improvements for virtual display and
...
new meta tag name
Change-Id: If9caba425f825652468a0f3e868f71ed1a778fb1
2013-10-16 14:08:07 -07:00
Michael Wright
6762a441ef
Fix conditional for glClear call
...
Previously the call to glClear was executed when there was no
available space (i.e. space which the Bitmap would *not* be drawn in
on the background of the launcher), rather than when there was.
Inverting the checks fixes this problem.
Also, remove unnecessary Handler since the call to updateWallpapers
is done via one-way binder interface and wrapped in a synchronize
block anyways. Putting it on the Handler just put it on the main
looper of the context that created WallpaperManager, which isn't
necessary.
Change-Id: Ic7a323303ec6e354d1ef245eec3434ff7128432d
2013-10-16 13:06:18 -07:00
Alan Viverette
e5799cbec2
Merge "Lazily create AccessibilityEvent record list"
2013-10-16 18:19:54 +00:00
Alan Viverette
502cb33f8d
Lazily create AccessibilityEvent record list
...
Change-Id: Id4e0a403da811498f2b0f748d86e330fff774154
2013-10-16 11:11:11 -07:00
Narayan Kamath
98e1797367
Remove captive portal code that has no effect.
...
Note that this CL does not change any behaviour.
At the center of this change is
CaptivePortalTracker#detectCaptivePortal(), which does nothing
except call back into ConnectivityService. Removing it allows us to
simplify code in ConnectivityService. It also allows us to remove
ConnectivityService#captivePortalCheckComplete which was only ever
called in response to this method.
While this does not change any behaviour, it preserves existing
bad behaviour, i.e, that the CAPTIVE_PORTAL_CHECK NetworkInfo
state does not correspond to actual captive portal detection.
We transition into that state and immediately (and unconditionally)
out of it and into CONNECTED.
Change-Id: Ib3797f956d2db5e3cacaaa53e899d81aa8e958af
2013-10-16 08:10:55 +00:00
Jeff Brown
9ef0997139
Make dump messages asynchronous.
...
Prevents the dump actions from being blocked by traversals.
Removed a stale comment on queueOrSendMessage and renamed it to
reflect its current implementation since it no longer has a secondary
queue. Removed an unnecessary lock as well.
Bug: 10948648
Change-Id: Ic5fcc567212fb9cc07566c12f5f419af13c2b0b1
2013-10-15 20:52:31 -07:00
Jeff Brown
5182c780a8
Log view root, input and looper state in bug reports.
...
Bug: 10948648
Change-Id: I956cce2a0fb516c02f9bbbc021f6238bcb226891
2013-10-15 20:31:52 -07:00
Jeff Sharkey
3e41d9bf41
am fc7c4b9d: am 2a48dbce: am 905c50a2: Merge "Improve DocumentsProvider and contract docs." into klp-dev
...
* commit 'fc7c4b9d7234b645adb31cb819b75ba925adab7a':
Improve DocumentsProvider and contract docs.
2013-10-15 17:55:45 -07:00
Jeff Sharkey
fc7c4b9d72
am 2a48dbce: am 905c50a2: Merge "Improve DocumentsProvider and contract docs." into klp-dev
...
* commit '2a48dbcee91a3a37dacaa96763c92f116d916a15':
Improve DocumentsProvider and contract docs.
2013-10-15 17:52:29 -07:00
Jeff Sharkey
905c50a212
Merge "Improve DocumentsProvider and contract docs." into klp-dev
2013-10-16 00:47:36 +00:00