Commit Graph

32316 Commits

Author SHA1 Message Date
Svetoslav Ganov
8a51e2f48c am a53e1f81: am 23757527: Merge "Hide the print dialog if the printing activity is destroyed." into klp-dev
* commit 'a53e1f81380c018705dc56ee82ec2db155f23489':
  Hide the print dialog if the printing activity is destroyed.
2013-10-18 17:32:57 -07:00
Svetoslav Ganov
237575278d Merge "Hide the print dialog if the printing activity is destroyed." into klp-dev 2013-10-19 00:26:44 +00:00
Scott Main
24512c8586 am 6f756e56: am 96844ed8: fix javadoc link
* commit '6f756e561a835d2508b8da71f23075ab7bd1060b':
  fix javadoc link
2013-10-18 14:54:11 -07:00
Scott Main
96844ed886 fix javadoc link
Change-Id: I509fb12393ee0b8bf78ff4110fc18420739f7c58
2013-10-18 14:43:02 -07:00
Svetoslav Ganov
858a1850e2 Hide the print dialog if the printing activity is destroyed.
1. For an app to print it creates a PrintDocumentAdapter implementation
   which is passed to the print dialog activity. If the activity that
   created the adapter is destroyed then the adapter, which may rely on
   the activity state, may be in an invalid state. For example, an app
   creates an adapter and calls print resuting in the app activity and
   the print dialog activity being stacked. Now the user rotates the
   device which triggers the recreating of the activity stack (assume the
   app does not handle rotation). The recreated print dialog activity
   receives the intent that originally created it with containing the
   adapter that was constructed in the context of the old, now destroyed,
   app activity instance.

   To handle this we are limiting an app to be able to print only from
   and activity and when this activity is destroyed we mark the adapter
   as invalid which will result in hiding the print dialog activity. Note
   that if the app process is killed we already handle this in the print
   dialog activiy by registering a death recipient on the adapter binder.

2. In the PrintManager.PrintDocumentAdapterDelegate some of the state is
   accessed only on the main thread and some from miltiple threads. The
   code was trying to avoid locking for state that is not accessed by
   multiple threads but this is error prone and the benefit does not
   justify the complexity and added fragility. Now grabbing a lock all
   the time.

3. The PrintJobConfigActivity waits for it to bind to the print spooler
   service before instantiating its print controller and editor. However,
   these can be accessed by invoking some of the activity cycle callbacks.
   This change is adding null checks for the case where the activity
   callbacks are called before the binding to the spooler is completed.

bug:11242661

Change-Id: Id906b3170e4f0a0553772dfa62686f06fdca0eaf
2013-10-18 13:12:06 -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
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
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
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
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
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
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
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
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
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
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
Jeff Sharkey
f53c1a6841 am f82a387c: am e3924ca4: Merge "Improve OPEN/CREATE_DOC docs." into klp-dev
* commit 'f82a387cc7e82a18622465e62370e2c4203839f1':
  Improve OPEN/CREATE_DOC docs.
2013-10-15 17:15:44 -07:00
Jeff Sharkey
9f81a1a49c am 84c8603d: am 3cf56085: Merge "Improve external storage docs on Context." into klp-dev
* commit '84c8603da051638b41baabef54bcc0f4cbef9735':
  Improve external storage docs on Context.
2013-10-15 17:15:40 -07:00
Michael Wright
ee3674a01b am 19fa2122: am 6bd7603a: Merge "Force the wallpaper to reload when dimensions change" into klp-dev
* commit '19fa212251542ac8f24ec0b24316bb08417cb44e':
  Force the wallpaper to reload when dimensions change
2013-10-15 17:15:35 -07:00
Alan Viverette
f9af7b250e Fix assorted FastScroller regressions
Fixes the following bugs:
- Don't show preview if text is empty, e.g. whitespace
- Avoid transitioning decor from DRAGGING to DRAGGING
- Restore original font size
- Restore thumb position adjustment for last row

BUG: 11207575
Change-Id: I72fc031d1fd22a41d81e7f52ca0856cf82d1be27
2013-10-15 17:09:35 -07:00
Jeff Sharkey
e3924ca486 Merge "Improve OPEN/CREATE_DOC docs." into klp-dev 2013-10-15 23:45:10 +00:00
Jeff Sharkey
3cf56085f1 Merge "Improve external storage docs on Context." into klp-dev 2013-10-15 23:44:54 +00:00
Jeff Sharkey
e8c00d8ed4 Improve DocumentsProvider and contract docs.
Bug: 10567557
Change-Id: I71e7f7ad172e9986e58b9c9533b1c948c5530397
2013-10-15 16:44:22 -07:00
Michael Wright
6bd7603a56 Merge "Force the wallpaper to reload when dimensions change" into klp-dev 2013-10-15 23:40:14 +00:00
Jeff Sharkey
adef88a0a9 Improve OPEN/CREATE_DOC docs.
Bug: 10936473
Change-Id: I4378aaaf927f114982191efd4f9887dad075390d
2013-10-15 13:54:47 -07:00
Michael Wright
b9fca99971 Force the wallpaper to reload when dimensions change
Currently it's possible for the home application to suggest new
wallpaper dimensions and the WallpaperService to request the bitmap
between when the new dimensions have been propagated and the old
bitmap has been forgotten. This leads to the WallpaperService
drawing a Bitmap with the old dimensions into a Surface with the new
dimensions.

By forcing the WallpaperManager to forget the old Bitmap immediately
before we reload it, we can ensure that we always have a Bitmap of
the correct size.

Bug: 10853302
Change-Id: I298ac5f3f8bcde54eeb1e45d21bf2ba3cbb618c9
2013-10-15 13:03:44 -07:00
Jeff Sharkey
6feb50b826 Improve external storage docs on Context.
Bug: 10461652
Change-Id: I42a3d887418e126f9dc2a9be8060a8eedd425f8e
2013-10-15 13:01:33 -07:00
Zhijun He
2c31cf7cc4 am 549a9590: am 58216c26: Camera2: return CaptureResult.STATISTICS_FACES
* commit '549a95902a20c8a96167215982c282264e47d3ed':
  Camera2: return CaptureResult.STATISTICS_FACES
2013-10-15 10:18:44 -07:00
Zhijun He
58216c2650 Camera2: return CaptureResult.STATISTICS_FACES
Changes included in this CL:

- remove the WAR for face detect mode null case.
- make the sanity check assert to warnings.
- make number of faces to be the minimal length of face metadata array length to
avoid out of bound access, since we relax the sanity check.

Bug: 11206459
Change-Id: Ifd9f7f79617039c1b3ad631f202b48076d775e09
2013-10-15 07:46:53 -07:00