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

117586 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Torne (Richard Coles)
92dd5ada8a Resolved conflicts for merge of db931a3b to master 
Change-Id: I5d71df1e2272b8fc35e5f1e0346284704b9d62ff
 2013-10-15 13:48:58 +01:00
Torne (Richard Coles)
b2399f3f64 am 2101df58: am 496fd28f: am d394355d: Delete HttpHeaderTest.testCacheControlMultipleArguments. 
* commit '2101df58f975b352a289505351a029ed9fa4edbd':
  Delete HttpHeaderTest.testCacheControlMultipleArguments.
 2013-10-15 05:06:26 -07:00
Torne (Richard Coles)
a88be57087 am b372a843: am dadcc324: am 6067d1a3: Remove old WebView classes from zygote preload list. 
* commit 'b372a843d459e6b8c443e462663ab3953994a2b1':
  Remove old WebView classes from zygote preload list.
 2013-10-15 05:06:23 -07: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
Daniel Sandler
c8f6a7f7bf am 61cab9d3: am 334e3d7c: am ee8ee0ee: Merge "Put DessertCase on a diet." into klp-dev 
* commit '61cab9d3ff87278ca58cf7a8956fba6e845a4714':
  Put DessertCase on a diet.
 2013-10-15 05:05:51 -07:00
Michael Jurka
38edc67481 am a0ce8c92: am a09c20a2: am a457211a: Merge "Fix getBuiltInWallpaper method" into klp-dev 
* commit 'a0ce8c92cfd06af14962bfba120bd176c936d4f0':
  Fix getBuiltInWallpaper method
 2013-10-15 05:05:42 -07:00
Jim Miller
2836cd74a9 am fc6625db: am 2399d6a4: am 7f988c2b: Merge "Don\'t move clock when warping in PagedView" into klp-dev 
* commit 'fc6625db32412e3416287d160d2334e25a36d37f':
  Don't move clock when warping in PagedView
 2013-10-15 05:05:15 -07:00
Victoria Lease
03e6fc3e02 am 658722cb: am 26cb103e: am fb19db60: Merge "remove U+261d from MTLmr3m.ttf" into klp-dev 
* commit '658722cb0c3f1b5046a2f31155ee336afa660748':
  remove U+261d from MTLmr3m.ttf
 2013-10-15 04:03:34 -07:00
Carlos Valdivia
34f5b35feb am 8d983713: am 5505706c: am cdb9ea79: Merge "Package checks for resloving recovery tokens should be user sensitive." into klp-dev 
* commit '8d983713db4583d8062dc499efc3896aaf36d65e':
  Package checks for resloving recovery tokens should be user sensitive.
 2013-10-15 04:03:30 -07:00
Craig Mautner
6353ea33ad am 209dc77a: am 910deb71: am cf8a6ca9: Merge "Clear displayStartTime whenever starting activity." into klp-dev 
* commit '209dc77a6a6bd07f380bb2ee70169fef09ad7fa4':
  Clear displayStartTime whenever starting activity.
 2013-10-15 04:03:26 -07:00
John Spurlock
b45bdac340 am 5a87a4e3: am 30408434: am f8033360: Merge "Give IMEs the entire screen to use for measuring purposes." into klp-dev 
* commit '5a87a4e3554872dced265ee32551656f0a9643ac':
  Give IMEs the entire screen to use for measuring purposes.
 2013-10-15 04:03:20 -07:00
Svetoslav
809ddcf1c9 am a3378956: am 2c163ee4: am 1e639d2d: Merge "Update the message for unavailable printers." into klp-dev 
* commit 'a337895682d86e9d71b04562a8b6e0dae889c8ac':
  Update the message for unavailable printers.
 2013-10-15 04:03:16 -07:00
Dianne Hackborn
06d6a7548e am 9aded5ab: am 827c5af0: am e49a107a: Merge "Fix issue #11223335: APR: Lots of failures in procstats due to..." into klp-dev 
* commit '9aded5abd65a2c69090abece37a7825a52ca3af0':
  Fix issue #11223335: APR: Lots of failures in procstats due to...
 2013-10-15 04:03:09 -07:00
David Christie
fac8fbfb35 am 10661302: am 6ac67f47: am a6ffa4ef: Merge "Refresh quicksettings location tile text when language changes -b/11157526" into klp-dev 
* commit '10661302a56dd1b3e011ff9f0843ea58cdb1d576':
  Refresh quicksettings location tile text when language changes -b/11157526
 2013-10-15 04:03:05 -07:00
Michael Jurka
4c0f91c863 am 7ec3a981: am 588bfeea: am f6f545f6: Merge "Fix the build" into klp-dev 
* commit '7ec3a981107c55b4a4fd4a7f984b2dfdffe5c281':
  Fix the build
 2013-10-15 04:03:02 -07:00
Amith Yamasani
7731de8377 am 6236cfdf: am d0383e37: am 4d0f0692: Merge "Switch settings provider to use the new Settings icon" into klp-dev 
* commit '6236cfdf13d86840945f29ec4e7e38642b34eb11':
  Switch settings provider to use the new Settings icon
 2013-10-15 04:02:58 -07:00
Michael Jurka
19c71ed7ab am 21bd2e5b: am a8b20cf8: am bcfc634d: Merge "Ensure URIs have content:// scheme in WPM" into klp-dev 
* commit '21bd2e5b0a8ccd065b8bbffb845159ce59640a9a':
  Ensure URIs have content:// scheme in WPM
 2013-10-15 04:02:55 -07:00
Jeff Sharkey
91695305f2 am 881cde33: am 16c4b8c5: am ddf5a170: Merge "Relax user constraint on storage state." into klp-dev 
* commit '881cde33589859e23a0af0a08b3c59d2f90cfd10':
  Relax user constraint on storage state.
 2013-10-15 04:02:52 -07:00
Jeff Sharkey
d70d2d8ee3 am 25b99efb: am ac0cb359: am 8e656df0: Merge "Add extras to AFD, send orientation metadata." into klp-dev 
* commit '25b99efb3259c9f6d7bcdacd3cb2bafd6b1a0e63':
  Add extras to AFD, send orientation metadata.
 2013-10-15 04:02:48 -07:00
Craig Mautner
21a31f9e11 am 73b25d6a: am bd0a4143: am b3a08be2: Merge "Use dialog animations for dialog style." into klp-dev 
* commit '73b25d6ac0d310702c5f582680e415dfb773b35f':
  Use dialog animations for dialog style.
 2013-10-15 04:02:45 -07:00
Martijn Coenen
a4b206952b am e7a81e7a: am 47936bb8: am 7d91cc97: Merge "NFC card emulation API docs." into klp-dev 
* commit 'e7a81e7a87dac9460eb8faa759d2c5086ccff523':
  NFC card emulation API docs.
 2013-10-15 04:02:41 -07:00
Svetoslav Ganov
b3918ae418 am 2f807975: am f62e2629: am fe3b58fb: Merge "Update the print spooler action bar icon." into klp-dev 
* commit '2f8079753d40e7ee3f3af0d709c83c1e42480349':
  Update the print spooler action bar icon.
 2013-10-15 04:02:37 -07:00
Svetoslav
a8068cb02d am 9773b379: am 79662942: am c89e5a6a: Merge "Layout may be called with invalid print attributes." into klp-dev 
* commit '9773b379fecb7671bc02c1096ee23875d727f827':
  Layout may be called with invalid print attributes.
 2013-10-15 04:02:33 -07:00
Craig Mautner
06796ab707 am 0e10dfeb: am 2c345435: am 79a0ed58: Merge "Move the wallpaper beneath the keyguard." into klp-dev 
* commit '0e10dfebf19efd3ebe6f70800c5a09243f7da2ac':
  Move the wallpaper beneath the keyguard.
 2013-10-15 04:02:23 -07:00
Robert Greenwalt
85e4bf7fe4 am 6becff17: am 87408ffd: am f64247e4: Merge "Fix change to re-add carrier roaming details." into klp-dev 
* commit '6becff179da67fec35a26663d48f6e2e3fcaaab8':
  Fix change to re-add carrier roaming details.
 2013-10-15 04:02:20 -07:00
Adam Lesinski
e81f80ad94 am 04e2a47a: am 461f06f4: am 53a5e317: Merge "Wrap measurement optimization in targetSdk check" into klp-dev 
* commit '04e2a47ab72038672647a9994f19e1254c90413a':
  Wrap measurement optimization in targetSdk check
 2013-10-15 04:02:16 -07:00
Michael Jurka
b1fda34611 am 10f64650: am 0396d55b: am b4c3b096: Merge "Add EXIF rotation support to system wallpaper cropper" into klp-dev 
* commit '10f6465080ce141afca172effceb4f0bfe48728a':
  Add EXIF rotation support to system wallpaper cropper
 2013-10-15 04:02:12 -07:00
Wink Saville
f7a4a9db57 am f349ec0e: am d1fcafa9: am 3fd9cb15: Merge "Telephony: Read signal strength values as expected" into klp-dev 
* commit 'f349ec0e5d721dd91a20a6b6b59c9c9e280c1672':
  Telephony: Read signal strength values as expected
 2013-10-15 04:02:08 -07:00
Jim Miller
14d9a02506 am 566c4a0b: am 6915644d: am f7b75eeb: Merge "Add additional MNC overlays" into klp-dev 
* commit '566c4a0bc55958b196c6503e95112e2b288a9f4a':
  Add additional MNC overlays
 2013-10-15 04:02:04 -07:00
Vineeta Srivastava
7c65f9159a am 26e9f925: am 4967abcf: am 1680cfd8: Merge "Modify config.xml for tethering APN information." into klp-dev 
* commit '26e9f9254a87002171af53e50c8505443d73223b':
  Modify config.xml for tethering APN information.
 2013-10-15 04:01:56 -07:00
Daniel Sandler
2209092837 am c963dfb2: am 596b1f86: am dd73ee4d: Add a config resource to enable translucent bars globally. 
* commit 'c963dfb27a160d50b5ed23fd6d296aec0bd0472b':
  Add a config resource to enable translucent bars globally.
 2013-10-15 04:01:53 -07:00
Scott Main
ed7f4589c8 am c13dd15c: am 12191d2a: am 306ed4fd: am 3a920545: am 2cc953f1: am 9006c422: more documentation for SEND_RESPOND_VIA_MESSAGE 
* commit 'c13dd15c5585e829328fc2f1cd7941281ffbcf5c':
  more documentation for SEND_RESPOND_VIA_MESSAGE
 2013-10-15 04:01:49 -07:00
Christopher Tate
741f01a612 am 6b013b75: am 5c742333: am b83bba7c: Merge "Log noisily on uid vs user-handle confusion in the settings provider" into klp-dev 
* commit '6b013b753c40a8d998027b4244883e99be42a3be':
  Log noisily on uid vs user-handle confusion in the settings provider
 2013-10-15 04:01:45 -07: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)
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)
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
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