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

12111 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Patrick Scott
26e7c40cfa am 5a6d521d: am 656c037c: Fix the youtube placeholder. 
Merge commit '5a6d521d9c348e35bb8b849d1fd5bea4db94a269'

* commit '5a6d521d9c348e35bb8b849d1fd5bea4db94a269':
  Fix the youtube placeholder.
 2009-10-13 16:59:49 -07:00
Cary Clark
018c02edab am 13d5b998: am 3e88ddc5: Select plugin objects with focusCandidate 
Merge commit '13d5b998c876e7f8b98b9e9c7440aa66cab1099d'

* commit '13d5b998c876e7f8b98b9e9c7440aa66cab1099d':
  Select plugin objects with focusCandidate
 2009-10-13 16:59:39 -07:00
Zheng BaoZhong
416dd8e60a am 360f21cd: am a4adc798: Merge change I409d9b4a into eclair-mr2 
Merge commit '360f21cdfccb5039cabb3c519b6b9b598aec1dca'

* commit '360f21cdfccb5039cabb3c519b6b9b598aec1dca':
  Wifi: Fix runtime crash in when scan results contain KSC 5601 SSID
 2009-10-13 16:59:28 -07:00
Jeff Hamilton
edd3d917af am a4b0c0d0: am 5d93de73: am 6dc3f4e5: Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such. 
Merge commit 'a4b0c0d00c80aa409ceb3f372cead2928fd4b601'

* commit 'a4b0c0d00c80aa409ceb3f372cead2928fd4b601':
  Now that Eclair has been defined as API revision 5 mark Build.VERSION_CODES.ECLAIR as such.
 2009-10-13 16:59:15 -07:00
Fred Quintana
ee4bc47afd am 0074e8f2: am a5e44bbd: am 083a50a3: Merge change I66693ea2 into eclair 
Merge commit '0074e8f2e085cd84c40a6eb3dbf61dc29ed2cc8c'

* commit '0074e8f2e085cd84c40a6eb3dbf61dc29ed2cc8c':
  fix sync exponential backoff for expedited syncs
 2009-10-13 16:59:05 -07:00
Jack Palevich
25022e0182 am cd0d9603: am 1bb55501: Merge change I85f598e0 into eclair-mr2 
Merge commit 'cd0d9603c3e54b484ec5046538f336f57a3678bf'

* commit 'cd0d9603c3e54b484ec5046538f336f57a3678bf':
  Prevent transparent region from getting out of sync with Surface Flinger
 2009-10-13 16:58:56 -07:00
Dianne Hackborn
8500fb921b am 81efcdfe: am 8a98a26a: am ee110be0: Fix issue #2179891: Need to update 5.xml 
Merge commit '81efcdfee658710bd267e6f335d7cf505224492b'

* commit '81efcdfee658710bd267e6f335d7cf505224492b':
  Fix issue #2179891: Need to update 5.xml
 2009-10-13 16:58:40 -07:00
Romain Guy
2220fee45c am 27d84fb6: am ecc6f877: am 8eb955b9: Merge change I5e482bbc into eclair 
Merge commit '27d84fb6161d3c6ce6f08ef48bf4681c334bef89'

* commit '27d84fb6161d3c6ce6f08ef48bf4681c334bef89':
  Add new RenderScript sample: ImageProcessing.
 2009-10-13 16:58:28 -07:00
Eric Fischer
5684f24282 am 297c781b: (-s ours) am 8ec1ba6d: am c08efb27: (-s ours) Import revised translations. DO NOT MERGE 
Merge commit '297c781b921e9f48bdbba5bc0a4abd3e12edb98e'

* commit '297c781b921e9f48bdbba5bc0a4abd3e12edb98e':
  Import revised translations.  DO NOT MERGE
 2009-10-13 16:58:18 -07:00
Daisuke Miyakawa
27333ed424 am a9a42a67: am ca103c16: Merge change I6ce46417 into eclair-mr2 
Merge commit 'a9a42a673f62a01fad6d7b82ba8c5f6493760c78'

* commit 'a9a42a673f62a01fad6d7b82ba8c5f6493760c78':
  Clean-up vCard code.
 2009-10-13 16:53:00 -07:00
Grace Kloba
1cdbf0f210 am 947a9157: am 94ab3b6d: Expose WebViewClient of WebView. 
Merge commit '947a915743c9ece5dfb7e39e585d9ff372e57244'

* commit '947a915743c9ece5dfb7e39e585d9ff372e57244':
  Expose WebViewClient of WebView.
 2009-10-13 16:52:38 -07:00
Leon Scroggins
e4fc845754 am b3e3352f: am 70ca3c25: File upload. 
Merge commit 'b3e3352fee7d2d81711f06c0bb37e91cb4db405a'

* commit 'b3e3352fee7d2d81711f06c0bb37e91cb4db405a':
  File upload.
 2009-10-13 16:51:00 -07:00
Android (Google) Code Review
f3e022f9d5 Merge change I3f59d859 
* changes:
  Reimport translations.
 2009-10-13 19:50:02 -04:00
Eric Fischer
da1d0a679c Reimport translations. 
Change-Id: I3f59d859605c2744a4a10d06139bc366cc21cf8e
 2009-10-13 16:29:59 -07:00
Jeff Sharkey
a78a9d4c93 Correct non-opaque list separator assets. 
Fixes http://b/2186076
 2009-10-13 16:28:53 -07:00
Dan Egnor
7393bbff7f Framework-side DropBox service that maintains a size-bounded 
queue of data chunks (sort of a blob-oriented logcat).

In the future, this will be coupled with a revised checkin service that
would actually upload this data.
 2009-10-13 16:17:50 -07:00
Eric Fischer
bd6c80f689 Import revised translations. DO NOT MERGE 2009-10-13 16:03:48 -07:00
Jack Palevich
65cc9418af am 332c7934: Merge change I69e21f5f into eclair-mr2 
Merge commit '332c793432be71d40473fed803123165c57197cd' into eclair-mr2-plus-aosp

* commit '332c793432be71d40473fed803123165c57197cd':
  GLDual test application.
 2009-10-13 15:04:12 -07:00
Doug Zongker
a973eaea45 am b5b67779: Merge change I7fa8c508 into eclair-mr2 
Merge commit 'b5b6777903d85349cf4baa07a54e1629551ea712' into eclair-mr2-plus-aosp

* commit 'b5b6777903d85349cf4baa07a54e1629551ea712':
  make erase-password-on-SIM-change optional
 2009-10-13 15:04:05 -07:00
Android (Google) Code Review
332c793432 Merge change I69e21f5f into eclair-mr2 
* changes:
  GLDual test application.
 2009-10-13 17:57:50 -04:00
Jack Palevich
69e21f5f6e GLDual test application. 
Draws two images at once, one GL based, one GL2 based.
 2009-10-13 14:56:00 -07:00
Daisuke Miyakawa
cb640c4130 am 403b5cd4: am 6e15a70c: Merge change I1fb066b0 into eclair-mr2 
Merge commit '403b5cd405dee554bbd1a467112fc90cdf2af308'

* commit '403b5cd405dee554bbd1a467112fc90cdf2af308':
  Rename VCardTest.java to VCardImportTest.java.
 2009-10-13 14:29:09 -07:00
Ray Chen
0236486486 am 7c86fc06: am 23a2d92f: Merge change Ib01005ea into eclair-mr2 
Merge commit '7c86fc066a010ed50877ee3066d542f873d762c2'

* commit '7c86fc066a010ed50877ee3066d542f873d762c2':
  Avoid extracting EXIF data for non-JPEG images.
 2009-10-13 14:28:59 -07:00
Andreas Huber
3eb188256a am 861c462c: am 9b8f9477: Fixing the build. 
Merge commit '861c462c521db2ca54924c3e6a8563784db98b53'

* commit '861c462c521db2ca54924c3e6a8563784db98b53':
  Fixing the build.
 2009-10-13 14:28:45 -07:00
Andreas Huber
e25adeaf41 am e1ba4226: am 936fff36: Merge change Ib64cab41 into eclair-mr2 
Merge commit 'e1ba422636937ee1ca84938d018282344d319543'

* commit 'e1ba422636937ee1ca84938d018282344d319543':
  Split the ColorConverter off SoftwareRenderer, metadata support in stagefright.
 2009-10-13 14:28:35 -07:00
Robert Greenwalt
c834b53f42 am c2bc31b4: am 2515cf85: am 98e0b146: Make PhoneStateListeners not call TelephonyManager 
Merge commit 'c2bc31b45e14b1ea261492ee531ed5bb2aac12d4'

* commit 'c2bc31b45e14b1ea261492ee531ed5bb2aac12d4':
 2009-10-13 14:27:25 -07:00
Grace Kloba
8838849203 am 4496a3fe: am a1c0506e: am 1184313c: Setting WebCore cache limit depending on the memory class. 
Merge commit '4496a3fecabb26671e745c2b6edcb54989f8c045'

* commit '4496a3fecabb26671e745c2b6edcb54989f8c045':
 2009-10-13 14:27:14 -07:00
David Krause
1215c57ed8 am a614b948: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit 'a614b948e18189adfe8e2553754db574ecb3fd7a'

* commit 'a614b948e18189adfe8e2553754db574ecb3fd7a':
  Make PhoneStateListeners not call TelephonyManager
  Setting WebCore cache limit depending on the memory class.
 2009-10-13 14:27:04 -07:00
Android (Google) Code Review
b5b6777903 Merge change I7fa8c508 into eclair-mr2 
* changes:
  make erase-password-on-SIM-change optional
 2009-10-13 17:26:48 -04:00
Robert Greenwalt
317d1c9e97 am 770d5c4f: am 64d54042: Merge change I61c08260 into eclair 
Merge commit '770d5c4f0093a65d20b22f14082911697f9f9b9e' into eclair-mr2-plus-aosp

* commit '770d5c4f0093a65d20b22f14082911697f9f9b9e':
  Futher reduce the logging of EriManager.
 2009-10-13 14:21:14 -07:00
Robert Greenwalt
770d5c4f00 am 64d54042: Merge change I61c08260 into eclair 
Merge commit '64d54042ff5c2c736a65f200296dbc3bceaa9029' into eclair-mr2

* commit '64d54042ff5c2c736a65f200296dbc3bceaa9029':
  Futher reduce the logging of EriManager.
 2009-10-13 14:11:54 -07:00
Android (Google) Code Review
64d54042ff Merge change I61c08260 into eclair 
* changes:
  Futher reduce the logging of EriManager.
 2009-10-13 17:07:10 -04:00
Robert Greenwalt
61c082603f Futher reduce the logging of EriManager. 
There was another log statement that was poluting radio logs.

bug: 2180891
 2009-10-13 13:53:22 -07:00
Doug Zongker
b80d1d0cc8 am afbf8afa: Merge change I564b5b00 into eclair-mr2 
Merge commit 'afbf8afa858a78b66c19f11cfda030e913b34085' into eclair-mr2-plus-aosp

* commit 'afbf8afa858a78b66c19f11cfda030e913b34085':
  add "junk path" -k option to aapt
 2009-10-13 13:47:54 -07:00
Android (Google) Code Review
afbf8afa85 Merge change I564b5b00 into eclair-mr2 
* changes:
  add "junk path" -k option to aapt
 2009-10-13 16:41:21 -04:00
Doug Zongker
dbe7a68cc1 add "junk path" -k option to aapt 
Adds a "junk path" option to aapt so that you can do:

   aapt add -k archive.zip path/to/some.file

and have the file stored in the zip under the name "some.file"
(without the path).  Needed so that we can use 'aapt add' in place of
'zip -j' when building jar files, which will lead to smaller
incremental OTAs.
 2009-10-13 13:33:31 -07:00
Ken Shirriff
947c45b295 am b10036b3: Merge change Iaa321588 into eclair-mr2 
Merge commit 'b10036b39003b6961c57f87f65236c1d5d0d1e52' into eclair-mr2-plus-aosp

* commit 'b10036b39003b6961c57f87f65236c1d5d0d1e52':
  Add "deleted" row to Events table.
 2009-10-13 13:15:35 -07:00
Android (Google) Code Review
b10036b390 Merge change Iaa321588 into eclair-mr2 
* changes:
  Add "deleted" row to Events table.
 2009-10-13 16:10:32 -04:00
Doug Zongker
7fa8c508e0 make erase-password-on-SIM-change optional 
Make this "feature" controlled by a system property so it can be
enabled only for carriers that want it.
 2009-10-13 13:02:49 -07:00
Leon Scroggins
7fd752af75 am 5a4f64fc: Merge change Id5ba82a1 into eclair-mr2 
Merge commit '5a4f64fcbf0382f33e9f79e6d0497113b972690e' into eclair-mr2-plus-aosp

* commit '5a4f64fcbf0382f33e9f79e6d0497113b972690e':
  Prevent getFile from copying when the file is too large.
 2009-10-13 12:17:53 -07:00
Dan Egnor
d23024b05c am 371071c1: am e9d8f545: am 6903d5ce: Merge change Iee649a81 into eclair 
Merge commit '371071c195138312a8829c198b24b7cb41bf7bc2'

* commit '371071c195138312a8829c198b24b7cb41bf7bc2':
 2009-10-13 12:11:40 -07:00
Jeff Sharkey
ef7739d453 am 6815a67c: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit '6815a67c5322cbde7768330fd12882d955abdd2a'

* commit '6815a67c5322cbde7768330fd12882d955abdd2a':
  Add LAST_KMSG_KB variable, used to tune the size of /proc/last_kmsg uploads.
 2009-10-13 12:11:28 -07:00
Daisuke Miyakawa
463285bfa4 am a6a96cf4: am c93b88cf: Remove redundant comment. As of now, we cannot guarantee anything toward external developers. 
Merge commit 'a6a96cf40e6e5349715ca6d2c81602d72d37da24'

* commit 'a6a96cf40e6e5349715ca6d2c81602d72d37da24':
  Remove redundant comment. As of now, we cannot guarantee anything toward external developers.
 2009-10-13 12:11:11 -07:00
Daisuke Miyakawa
7a6ba0f442 am 258bc9cb: am 5a016488: Merge commit \'refs/changes/08/29008/8\' of ssh://dmiyakawa@android-git.corp.google.com:29418/platform/frameworks/base into cleanup_import 
Merge commit '258bc9cb44f637d9ea1377d81a995bec2bd10a1d'

* commit '258bc9cb44f637d9ea1377d81a995bec2bd10a1d':
  Develop ContentResolver-based unit tests for vCard importer and fix vCard code
 2009-10-13 12:11:01 -07:00
Jim Miller
b4b79dc0db am 65f0f97a: am b1fdb1d3: am ad60e7fe: Merge change I9485aec1 into eclair 
Merge commit '65f0f97aa700df38a6183b97f7bb8c6f82367285'

* commit '65f0f97aa700df38a6183b97f7bb8c6f82367285':
 2009-10-13 12:10:41 -07:00
Dianne Hackborn
9a5fb4916e am 43ebb2d9: am 81aaf56f: am 2c6c5e6e: Fix issue #2176944: Need API so browser, others can determine memory size of device 
Merge commit '43ebb2d91518cac40c43ceb098fcf11b92959d31'

* commit '43ebb2d91518cac40c43ceb098fcf11b92959d31':
 2009-10-13 12:10:32 -07:00
Dianne Hackborn
26ae62e810 am 198dcc9d: am 0c35e6ff: am d10d02f5: Merge change I490e01ba into eclair 
Merge commit '198dcc9d6f6ce1d6582d67e342f3833af4afe33b'

* commit '198dcc9d6f6ce1d6582d67e342f3833af4afe33b':
 2009-10-13 12:10:23 -07:00
Dianne Hackborn
8485380aaa am d3332dd1: am 479e8004: am 89becd79: Fix issue #2177262: Improve animations 
Merge commit 'd3332dd1135571723c891a672fe51b9b27f66282'

* commit 'd3332dd1135571723c891a672fe51b9b27f66282':
 2009-10-13 12:10:13 -07:00
James Dong
ead92ef490 am 6195432b: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 
Merge commit '6195432b6fde3cda4bc7e2406c8f2975795933a7'

* commit '6195432b6fde3cda4bc7e2406c8f2975795933a7':
  Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen
  Fix issue #2176944: Need API so browser, others can determine memory size of device
  Fix issue #2177262: Improve animations
  Fix issue #2174566: HOT STABILITY: NPE in activity manager
 2009-10-13 12:10:02 -07:00
Android (Google) Code Review
5a4f64fcbf Merge change Id5ba82a1 into eclair-mr2 
* changes:
  Prevent getFile from copying when the file is too large.
 2009-10-13 15:09:18 -04:00