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

115853 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Svetoslav Ganov
5a736fcd20 Merge "Adding a missing resource file." into klp-dev 2013-10-15 17:17:31 +00:00
Zhijun He
549a95902a am 58216c26: Camera2: return CaptureResult.STATISTICS_FACES 
* commit '58216c2650c9536f93467d6ab347ca3f7720dedd':
  Camera2: return CaptureResult.STATISTICS_FACES
 2013-10-15 10:15:37 -07:00
John Spurlock
1ed453a26e Update resource name for renamed string. 
Fix translations for recently renamed string.

Also remove old name from symbols.xml.  The resource is no
longer referenced in code, and will break builds without
translations.

Bug:11062108
Change-Id: I61977cb1ee5298947b3ee48b5fbd0354727253c0
 2013-10-15 11:47:09 -04: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
The Android Automerger
a5ce15dfce merge in klp-release history after reset to klp-dev 2013-10-15 06:00:53 -07:00
Torne (Richard Coles)
13e9158bc2 am 885a301b: am 4a534e00: Merge "Delete BrowserTestPlugin." into klp-dev 
* commit '885a301b65cb33f2d6c65c4d9e7d43714ffd5db4':
  Delete BrowserTestPlugin.
 2013-10-15 05:06:44 -07:00
Jason Monk
cc4d2e0fa5 am b46eb904: am c09e5911: Merge "Fix error when PAC set rapidly" into klp-dev 
* commit 'b46eb9042b25d9b35ae2e05aba7063c8ee4f006c':
  Fix error when PAC set rapidly
 2013-10-15 05:06:40 -07:00
Torne (Richard Coles)
885a301b65 am 4a534e00: Merge "Delete BrowserTestPlugin." into klp-dev 
* commit '4a534e00d83e6b41862ea54ca4f6a84d3e105585':
  Delete BrowserTestPlugin.
 2013-10-15 05:03:37 -07:00
Jason Monk
b46eb9042b am c09e5911: Merge "Fix error when PAC set rapidly" into klp-dev 
* commit 'c09e59110272d2613763a54a57e7da7c9f87f369':
  Fix error when PAC set rapidly
 2013-10-15 05:03:30 -07:00
Torne (Richard Coles)
4a534e00d8 Merge "Delete BrowserTestPlugin." into klp-dev 2013-10-15 11:48:17 +00:00
Jason Monk
c09e591102 Merge "Fix error when PAC set rapidly" into klp-dev 2013-10-15 11:15:01 +00:00
Torne (Richard Coles)
2eac50bf63 Delete BrowserTestPlugin. 
The new WebView doesn't support plugins.

Bug: 10427705
Change-Id: I4678bf4771d402bec882193c7a2f3d05d918f042
 2013-10-15 12:05:13 +01: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)
c5f742d4de am 94c0057d: Delete the old WebView. 
* commit '94c0057d67c2e0a4b88a4f735388639210260d0e':
  Delete the old WebView.
 2013-10-15 03:39:48 -07:00
Torne (Richard Coles)
a1ba29acc4 am d892afc8: Remove support for switching WebView. 
* commit 'd892afc88d3c67a7fe1c9550bfa7a452051d031d':
  Remove support for switching WebView.
 2013-10-15 03:39:45 -07:00
Torne (Richard Coles)
2101df58f9 am 496fd28f: am d394355d: Delete HttpHeaderTest.testCacheControlMultipleArguments. 
* commit '496fd28fd186120de912bc0a6610ccda60edd912':
  Delete HttpHeaderTest.testCacheControlMultipleArguments.
 2013-10-15 03:33:33 -07:00
Torne (Richard Coles)
496fd28fd1 am d394355d: Delete HttpHeaderTest.testCacheControlMultipleArguments. 
* commit 'd394355d75ba4526adf3509a9e5d8d63acf86a7c':
  Delete HttpHeaderTest.testCacheControlMultipleArguments.
 2013-10-15 03:30:49 -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
Torne (Richard Coles)
d394355d75 Delete HttpHeaderTest.testCacheControlMultipleArguments. 
This test depends on internals of the old WebView to work which have
already been removed. It doesn't appear to be testing anything useful.

Bug: 10427705
Change-Id: I5e93b212c33f22776050b6e1ec639e23f41a1d4a
 2013-10-15 11:18:08 +01:00
Torne (Richard Coles)
b372a843d4 am dadcc324: am 6067d1a3: Remove old WebView classes from zygote preload list. 
* commit 'dadcc32487828419c948dbcd2dc3f6cad251d950':
  Remove old WebView classes from zygote preload list.
 2013-10-15 03:13:35 -07:00
Torne (Richard Coles)
dadcc32487 am 6067d1a3: Remove old WebView classes from zygote preload list. 
* commit '6067d1a3c7033f6714a60ac02a6b08d6568fe217':
  Remove old WebView classes from zygote preload list.
 2013-10-15 03:09:52 -07:00
Torne (Richard Coles)
6067d1a3c7 Remove old WebView classes from zygote preload list. 
Don't preload java classes used only by the old WebView implementation.

Bug: 10427705
Change-Id: I1378ab564ef2d173e08806c30d1deb6020d65ba8
 2013-10-15 10:45:18 +01:00
Svetoslav Ganov
2d996fb687 Adding a missing resource file. 
This is a resource file cotaining the media sizes for the Catalan
locale. Without it the print spooler crashes all the time for that
locale since it cannot construct the PDF printer correctly.

bug:11226380

Change-Id: I7fa9c9bf4ed073e5f4ddf0d0fe9de4998e3467d4
 2013-10-15 00:18:13 -07: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
a7833f861e am bf9b087b: Merge "Camera2: Fix face rectangle coordinate mapping, and use Key.equals" into klp-dev 
* commit 'bf9b087be081ff04df569c03c55e2daab47913cd':
  Camera2: Fix face rectangle coordinate mapping, and use Key.equals
 2013-10-14 23:45:20 -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
Daniel Sandler
61cab9d3ff am 334e3d7c: am ee8ee0ee: Merge "Put DessertCase on a diet." into klp-dev 
* commit '334e3d7c3c8ca9042a57f287d82a3460ab496806':
  Put DessertCase on a diet.
 2013-10-14 21:49:31 -07:00
Daniel Sandler
334e3d7c3c am ee8ee0ee: Merge "Put DessertCase on a diet." into klp-dev 
* commit 'ee8ee0eeb8d61ab80981356c1a5683ae294f5233':
  Put DessertCase on a diet.
 2013-10-14 21:46:03 -07:00
Daniel Sandler
ee8ee0eeb8 Merge "Put DessertCase on a diet." into klp-dev 2013-10-15 04:44:05 +00:00
Daniel Sandler
f9f63355e3 Put DessertCase on a diet. 
- store desserts as ALPHA_8, saving 75% of bitmap memory
- run DessertCase in its own process, avoiding bloating
  systemui every time the daydream or platlogo activity run
- lock orientation in DessertCase to stop thrashing around
  when the device is rotated

Bug: 10918599
Change-Id: Ia2fb0696b903ae355c75b53d3a0c45b70784d00c
 2013-10-15 00:34:10 -04: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
a09c20a230 am a457211a: Merge "Fix getBuiltInWallpaper method" into klp-dev 
* commit 'a457211af55b2ad5bc58f4228ceb147ac22c92b0':
  Fix getBuiltInWallpaper method
 2013-10-14 20:51:29 -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
Jim Miller
fc6625db32 am 2399d6a4: am 7f988c2b: Merge "Don\'t move clock when warping in PagedView" into klp-dev 
* commit '2399d6a4f0d14e118ab706777753d3e2a5657dbc':
  Don't move clock when warping in PagedView
 2013-10-14 19:08:04 -07:00
Victoria Lease
658722cb0c am 26cb103e: am fb19db60: Merge "remove U+261d from MTLmr3m.ttf" into klp-dev 
* commit '26cb103ecbcc1b18c4b08bbf219d29e604132626':
  remove U+261d from MTLmr3m.ttf
 2013-10-14 19:02:23 -07:00
Carlos Valdivia
8d983713db am 5505706c: am cdb9ea79: Merge "Package checks for resloving recovery tokens should be user sensitive." into klp-dev 
* commit '5505706cfabd62edbbc5e326f129bc5a16ca9b55':
  Package checks for resloving recovery tokens should be user sensitive.
 2013-10-14 19:02:15 -07:00
Craig Mautner
209dc77a6a am 910deb71: am cf8a6ca9: Merge "Clear displayStartTime whenever starting activity." into klp-dev 
* commit '910deb7155352c8d95e6351fc3efd4eac6b463a5':
  Clear displayStartTime whenever starting activity.
 2013-10-14 19:02:12 -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
Svetoslav
a337895682 am 2c163ee4: am 1e639d2d: Merge "Update the message for unavailable printers." into klp-dev 
* commit '2c163ee4eb1e1ec835bba1c906e4ba1f86983c46':
  Update the message for unavailable printers.
 2013-10-14 19:02:00 -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
David Christie
10661302a5 am 6ac67f47: am a6ffa4ef: Merge "Refresh quicksettings location tile text when language changes -b/11157526" into klp-dev 
* commit '6ac67f4714de56c1d638e2bdb22990a6fec91e7f':
  Refresh quicksettings location tile text when language changes -b/11157526
 2013-10-14 19:01:51 -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
Amith Yamasani
6236cfdf13 am d0383e37: am 4d0f0692: Merge "Switch settings provider to use the new Settings icon" into klp-dev 
* commit 'd0383e37bdd7fe909ee4dc0477c73a7342aa7e4e':
  Switch settings provider to use the new Settings icon
 2013-10-14 19:01:42 -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
Craig Mautner
73b25d6ac0 am bd0a4143: am b3a08be2: Merge "Use dialog animations for dialog style." into klp-dev 
* commit 'bd0a4143302834c3d1a1343e82f6d4da7888308e':
  Use dialog animations for dialog style.
 2013-10-14 19:00:47 -07:00