Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,908 Commits 3 Branches 0 Tags
e400a2900dd527370bc7238fb270e0c5c0eb70ba
Commit Graph

32835 Commits

Author SHA1 Message Date
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
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
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 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
Jeff Sharkey
0e4655800b am f53c1a68: am f82a387c: am e3924ca4: Merge "Improve OPEN/CREATE_DOC docs." into klp-dev 
* commit 'f53c1a6841b4c6a1541e9548f425e54c486031d1':
  Improve OPEN/CREATE_DOC docs.
 2013-10-15 17:30:23 -07:00
Jeff Sharkey
98f7422e6a am 9f81a1a4: am 84c8603d: am 3cf56085: Merge "Improve external storage docs on Context." into klp-dev 
* commit '9f81a1a49c4ae01fd815a5ee801764b1362b242e':
  Improve external storage docs on Context.
 2013-10-15 17:30:19 -07:00
Michael Wright
5d5d4a5840 am ee3674a0: am 19fa2122: am 6bd7603a: Merge "Force the wallpaper to reload when dimensions change" into klp-dev 
* commit 'ee3674a01bc827057618d86f2dc921485b9a1393':
  Force the wallpaper to reload when dimensions change
 2013-10-15 17:30:16 -07: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
813c8e45d9 am 2c31cf7c: am 549a9590: am 58216c26: Camera2: return CaptureResult.STATISTICS_FACES 
* commit '2c31cf7cc4d7fca56e5277df932b4e8ce671935d':
  Camera2: return CaptureResult.STATISTICS_FACES
 2013-10-15 10:20:45 -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
Torne (Richard Coles)
ccd0204e9d resolved conflicts for merge of f96b93e2 to master 
Change-Id: I28dbc39dde7bf5c8bb50cff0f6bc49a90c9c4dbe
 2013-10-15 14:04:16 +01:00
Torne (Richard Coles)
92dd5ada8a Resolved conflicts for merge of db931a3b to master 
Change-Id: I5d71df1e2272b8fc35e5f1e0346284704b9d62ff
 2013-10-15 13:48:58 +01:00
Eino-Ville Talvala
ac61e030e5 am c80477e7: am a7833f86: am bf9b087b: Merge "Camera2: Fix face rectangle coordinate mapping, and use Key.equals" into klp-dev 
* commit 'c80477e7124264ff0a61f7e972244be03fc20d42':
  Camera2: Fix face rectangle coordinate mapping, and use Key.equals
 2013-10-15 05:06:18 -07:00