drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
115,714 Commits 1 Branch 0 Tags
Commit Graph

34935 Commits

Author SHA1 Message Date
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
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
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 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
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
Torne (Richard Coles)
f96b93e22c Resolved conflicts for merge of c5f742d4 to klp-dev-plus-aosp 
Change-Id: Ieeb9460a66ca761ae347fecff671ce54dfbc9cdf
 2013-10-15 11:49:09 +01:00
Torne (Richard Coles)
db931a3b2b am a1ba29ac: am d892afc8: Remove support for switching WebView. 
* commit 'a1ba29acc4a6709f74fb7fefdcdb66adc71c849a':
  Remove support for switching WebView.
 2013-10-15 03:41:34 -07:00
Torne (Richard Coles)
94c0057d67 Delete the old WebView. 
Delete all the Java classes used only by the old WebView implementation,
and also sections of common classes that were only needed for the old
WebView.

Bug: 10427705
Change-Id: I02549a71104b35d86d99058c71f43e054730ec7d
 2013-10-15 11:18:51 +01:00
Torne (Richard Coles)
d892afc88d Remove support for switching WebView. 
WebViewFactory remains as an abstraction layer, but will now always
creates Chromium WebView instances.

Bug: 10427705
Change-Id: I045e43eb35462567fecd29d04e7b61902baef547
 2013-10-15 11:18:50 +01:00
Eino-Ville Talvala
c80477e712 am a7833f86: am bf9b087b: Merge "Camera2: Fix face rectangle coordinate mapping, and use Key.equals" into klp-dev 
* commit 'a7833f861e303d9dea2cf54ceb519ff937f68367':
  Camera2: Fix face rectangle coordinate mapping, and use Key.equals
 2013-10-14 23:48:29 -07:00
Eino-Ville Talvala
bf9b087be0 Merge "Camera2: Fix face rectangle coordinate mapping, and use Key.equals" into klp-dev 2013-10-15 06:41:59 +00:00
Michael Jurka
a0ce8c92cf am a09c20a2: am a457211a: Merge "Fix getBuiltInWallpaper method" into klp-dev 
* commit 'a09c20a23038c1d77ae3d511da18a377572aed0c':
  Fix getBuiltInWallpaper method
 2013-10-14 20:57:22 -07:00
Michael Jurka
a457211af5 Merge "Fix getBuiltInWallpaper method" into klp-dev 2013-10-15 03:49:13 +00:00
Michael Jurka
0539153e77 Fix getBuiltInWallpaper method 2013-10-14 20:45:02 -07:00
John Spurlock
5a87a4e355 am 30408434: am f8033360: Merge "Give IMEs the entire screen to use for measuring purposes." into klp-dev 
* commit '30408434d3c04efa2b4a18838f9dfe0b5760f4ef':
  Give IMEs the entire screen to use for measuring purposes.
 2013-10-14 19:02:03 -07:00
Dianne Hackborn
9aded5abd6 am 827c5af0: am e49a107a: Merge "Fix issue #11223335: APR: Lots of failures in procstats due to..." into klp-dev 
* commit '827c5af02de29424ea80f1ccfe525e681d0b74f0':
  Fix issue #11223335: APR: Lots of failures in procstats due to...
 2013-10-14 19:01:55 -07:00
Michael Jurka
7ec3a98110 am 588bfeea: am f6f545f6: Merge "Fix the build" into klp-dev 
* commit '588bfeeaad627985163c8bcd76d4815b1ebce13a':
  Fix the build
 2013-10-14 19:01:47 -07:00
Michael Jurka
21bd2e5b0a am a8b20cf8: am bcfc634d: Merge "Ensure URIs have content:// scheme in WPM" into klp-dev 
* commit 'a8b20cf801f841511979f440ab05b4f93a9c8ecb':
  Ensure URIs have content:// scheme in WPM
 2013-10-14 19:01:38 -07:00
Jeff Sharkey
881cde3358 am 16c4b8c5: am ddf5a170: Merge "Relax user constraint on storage state." into klp-dev 
* commit '16c4b8c5999b4365bde5ad7c2f00337cee988dab':
  Relax user constraint on storage state.
 2013-10-14 19:01:30 -07:00
Jeff Sharkey
25b99efb32 am ac0cb359: am 8e656df0: Merge "Add extras to AFD, send orientation metadata." into klp-dev 
* commit 'ac0cb3591a637533c1f0329fd00a621fbe1fd997':
  Add extras to AFD, send orientation metadata.
 2013-10-14 19:00:51 -07:00
Martijn Coenen
e7a81e7a87 am 47936bb8: am 7d91cc97: Merge "NFC card emulation API docs." into klp-dev 
* commit '47936bb8f5192496b8007009f8732a9d7194b2ac':
  NFC card emulation API docs.
 2013-10-14 19:00:44 -07:00
Adam Lesinski
04e2a47ab7 am 461f06f4: am 53a5e317: Merge "Wrap measurement optimization in targetSdk check" into klp-dev 
* commit '461f06f4037849d5075d947852306bafdf0e949c':
  Wrap measurement optimization in targetSdk check
 2013-10-14 19:00:28 -07:00
John Spurlock
f803336028 Merge "Give IMEs the entire screen to use for measuring purposes." into klp-dev 2013-10-15 01:27:42 +00:00
Eino-Ville Talvala
615b75f335 Camera2: Fix face rectangle coordinate mapping, and use Key.equals 
- Faces are reported differently from other rectangles, so the mapping
  has to be specialized for them

- Use Key.equals for key comparison.

Bug: 11206459
Change-Id: I9a2a408dad981c2911048191ec30977020953146
 2013-10-14 18:20:43 -07:00
John Spurlock
f8508272ad Give IMEs the entire screen to use for measuring purposes. 
IMEs recently gained the ability to layout out under the nav bar,
but our core measuring logic does not give height=WRAP_CONTENT windows
the entire screen height when computing desired window height.

Since IMEs can be identified by type, let them use the entire screen
height for measuring purposes, to properly handle the cases where
space is constrained, making that unaccounted-for nav bar height
important.

Bug:11215678
Change-Id: I1d0b73454c0c629e7d669b9de70641c7e8c4d333
 2013-10-14 21:06:52 -04:00
Dianne Hackborn
e49a107a24 Merge "Fix issue #11223335: APR: Lots of failures in procstats due to..." into klp-dev 2013-10-15 01:00:07 +00:00
Michael Jurka
f6f545f6a7 Merge "Fix the build" into klp-dev 2013-10-15 00:42:52 +00:00
Michael Jurka
5d1893bafb Fix the build 2013-10-14 17:40:27 -07:00
Michael Jurka
bcfc634db9 Merge "Ensure URIs have content:// scheme in WPM" into klp-dev 2013-10-15 00:27:50 +00:00
Jeff Sharkey
ddf5a170d5 Merge "Relax user constraint on storage state." into klp-dev 2013-10-15 00:25:23 +00:00
Dianne Hackborn
878deb3c7b Fix issue #11223335: APR: Lots of failures in procstats due to... 
...bad cleanup of crashing processes

We now have a special path for crashing processes, to silently
clean up their state.

Also some tweaks to Log/Slog.wtf to get better stack crawl
summaries in APR.

Change-Id: Ieced26989907a6e7615b6fa033813fced78d7474
 2013-10-14 17:15:40 -07:00
Jeff Sharkey
8e656df092 Merge "Add extras to AFD, send orientation metadata." into klp-dev 2013-10-15 00:00:20 +00:00
Adam Lesinski
bba72d13af Ensure URIs have content:// scheme in WPM 
getCropAndSetWallpaperIntent should only accept URIs with
the content:// scheme, so that the receiving application
doesn't crash opening a file it can't access.

bug:11173560
Change-Id: I855496633b646373db757e9d8e6e425568103b8b
 2013-10-14 16:51:56 -07:00