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

47634 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jesse Wilson
94e085fda0 Merge "Don't leak JsonReaders in example code." 2011-03-16 15:48:07 -07:00
Jesse Wilson
47a2a4eaad Merge "Fix a bogus comment on LruCache.hitCount()" 2011-03-16 15:05:10 -07:00
Jesse Wilson
9d30ea0333 Don't leak JsonReaders in example code. 
Change-Id: Id81fb44e26f895d7ac6ecf87eddfa9d14c643159
 2011-03-16 15:02:48 -07:00
Jesse Wilson
a460c1871e Fix a bogus comment on LruCache.hitCount() 
Change-Id: I219b65bd73b85a414c21d4c4abe59296c9c5945a
 2011-03-16 14:57:01 -07:00
Shimeng (Simon) Wang
0ec5c78a80 am 0c4f09be: am f2532d16: am 464b690a: Pass firstLayout info to native webview when setting baseLayer. 
* commit '0c4f09be5b73bd6bf19921d907fadc50d853deaf':
  Pass firstLayout info to native webview when setting baseLayer.
 2011-03-16 14:51:21 -07:00
Shimeng (Simon) Wang
0c4f09be5b am f2532d16: am 464b690a: Pass firstLayout info to native webview when setting baseLayer. 
* commit 'f2532d16a4a2ca4dffe9bf9568fdd24475369cac':
  Pass firstLayout info to native webview when setting baseLayer.
 2011-03-16 14:49:18 -07:00
Shimeng (Simon) Wang
f2532d16a4 am 464b690a: Pass firstLayout info to native webview when setting baseLayer. 
* commit '464b690ada24428f3dff4102659048db7128835f':
  Pass firstLayout info to native webview when setting baseLayer.
 2011-03-16 14:47:32 -07:00
Shimeng (Simon) Wang
464b690ada Pass firstLayout info to native webview when setting baseLayer. 
issue: 4094300
Change-Id: I4fdbc0cee73230a731b1356f44372cd86a5c4ad1
 2011-03-16 13:56:37 -07:00
Michael Kolb
dce574a191 am 5b7a1bd7: am b0a07f0c: am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1 
* commit '5b7a1bd7906b24e92d61b967abe736cc3559bf08':
  add comment to deprecated tag
 2011-03-16 13:43:30 -07:00
Andreas Huber
9e22d68a6f am 1a47fc35: (-s ours) am 7532ae7f: am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1 
* commit '1a47fc353157bf9798c8a7425f106681e14bf4a5':
  DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
 2011-03-16 13:41:28 -07:00
Michael Kolb
5b7a1bd790 am b0a07f0c: am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1 
* commit 'b0a07f0ce54ee812f9a00cc53f43919051d563c3':
  add comment to deprecated tag
 2011-03-16 13:38:24 -07:00
Andreas Huber
1a47fc3531 am 7532ae7f: am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1 
* commit '7532ae7f79d6d849faae1a9bee171c66bd534d97':
  DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
 2011-03-16 13:36:35 -07:00
Michael Kolb
b0a07f0ce5 am 6bb2020e: Merge "add comment to deprecated tag" into honeycomb-mr1 
* commit '6bb2020e6e9914f6df3dc7d69dbd21782267fbd4':
  add comment to deprecated tag
 2011-03-16 13:34:30 -07:00
Andreas Huber
7532ae7f79 am 46956b06: Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1 
* commit '46956b0691b2a228237d17536fe4ad33a760c0af':
  DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting.
 2011-03-16 13:18:42 -07:00
Michael Kolb
6bb2020e6e Merge "add comment to deprecated tag" into honeycomb-mr1 2011-03-16 13:10:48 -07:00
Andreas Huber
46956b0691 Merge "DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting." into honeycomb-mr1 2011-03-16 13:06:52 -07:00
Michael Kolb
24e53b00b0 add comment to deprecated tag 
Change-Id: Id0c30c43abfeb9005f9b69e0a565644c7c956295
 2011-03-16 12:56:39 -07:00
Mike Lockwood
83361fe18b am 89de72d8: am 1d8b5a5e: am 75d62cee: Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1 
* commit '89de72d83a1593ceb268f9433cd10455c66fc3af':
  USB System UI:  Improve message for the "no app for USB accessory" dialog.
 2011-03-16 12:35:55 -07:00
Michael Kolb
0677d2526d am d799caa9: am 9a0df3c5: am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1 
* commit 'd799caa9a6623de4af581bebc9759272c10b6588':
  deprecate getVisibleTitleHeight
 2011-03-16 12:35:42 -07:00
Mike Lockwood
89de72d83a am 1d8b5a5e: am 75d62cee: Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1 
* commit '1d8b5a5e866f75d516dd6f03424f37b1de9a3d97':
  USB System UI:  Improve message for the "no app for USB accessory" dialog.
 2011-03-16 12:09:27 -07:00
Mike Lockwood
1d8b5a5e86 am 75d62cee: Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1 
* commit '75d62cee30557145e48d792fdce4769235daa9ce':
  USB System UI:  Improve message for the "no app for USB accessory" dialog.
 2011-03-16 12:06:58 -07:00
Andreas Huber
5bd3bb46b1 DO NOT MERGE: Fix a race condition when playing an audio-only stream and seeking before starting. 
Change-Id: I70dfdfb7c27e3c713079c359ef89a570eb600dc7
related-to-bug: 4039068
 2011-03-16 12:04:56 -07:00
Mike Lockwood
75d62cee30 Merge "USB System UI: Improve message for the "no app for USB accessory" dialog." into honeycomb-mr1 2011-03-16 12:03:39 -07:00
Jeff Brown
5949f89f3c Merge "Add 3D mode key and others." 2011-03-16 11:46:00 -07:00
Michael Kolb
d799caa9a6 am 9a0df3c5: am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1 
* commit '9a0df3c5c730ff12e050945f2bad0d86a37c5b2f':
  deprecate getVisibleTitleHeight
 2011-03-16 11:37:23 -07:00
Michael Kolb
9a0df3c5c7 am 95fd065e: Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1 
* commit '95fd065e3cef0bef723a2e624191b08bb00ce6f8':
  deprecate getVisibleTitleHeight
 2011-03-16 11:35:45 -07:00
Michael Kolb
95fd065e3c Merge "deprecate getVisibleTitleHeight" into honeycomb-mr1 2011-03-16 11:33:13 -07:00
Andreas Huber
a0933013d0 Merge "Fix a race condition when playing an audio-only stream and seeking before starting." 2011-03-16 11:32:30 -07:00
Jeff Brown
9812aed276 Add 3D mode key and others. 
Related to an AOSP change request.

Change-Id: I3f4f84b56a1af626a8783f5ecbb823eb12ba9fbe
 2011-03-16 11:31:42 -07:00
Svetoslav Ganov
4ad45c4d15 Merge "Pressed state not cleared if view is disabled in long click handler" 2011-03-16 11:13:41 -07:00
Mike Lockwood
b893916fb8 USB System UI: Improve message for the "no app for USB accessory" dialog. 
Change-Id: I72bdc3afa152ed7a0e30b1a0e8d9cb2e53ca3f29
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2011-03-16 14:10:03 -04:00
Eric Fischer
262564df96 am d40e0efb: (-s ours) am d5eb3bbb: am cc571e96: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'd40e0efb024ad2e276dbbd2eb81047dd2a1319f7':
  Import revised translations.  DO NOT MERGE
 2011-03-16 11:00:33 -07:00
Eric Fischer
d40e0efb02 am d5eb3bbb: am cc571e96: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'd5eb3bbbf2959553005df173165b6b65231798a2':
  Import revised translations.  DO NOT MERGE
 2011-03-16 10:54:33 -07:00
Eric Fischer
d5eb3bbbf2 am cc571e96: Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 
* commit 'cc571e9643865edc3f25aa133c467ace46ce8e80':
  Import revised translations.  DO NOT MERGE
 2011-03-16 10:51:56 -07:00
Andreas Huber
498422f4a2 Fix a race condition when playing an audio-only stream and seeking before starting. 
Change-Id: Id3883293caf316ce492f5eb16428c15ced82da38
related-to-bug: 4039068
 2011-03-16 10:50:18 -07:00
Eric Fischer
cc571e9643 Merge "Import revised translations. DO NOT MERGE" into honeycomb-mr1 2011-03-16 10:23:02 -07:00
Eric Fischer
326c1c7247 Import revised translations. DO NOT MERGE 
Change-Id: I654f633a58cb935a3388e5b558101912dae7fde7
 2011-03-16 10:11:58 -07:00
Kenny Root
63fce8c56d Merge "Update WakeLock-related docs to mention permissions" 2011-03-16 10:05:23 -07:00
Kenny Root
d710fb500c Update WakeLock-related docs to mention permissions 
android.permission.WAKE_LOCK permission is required to use WakeLock or
WifiLock, but nowhere is it mentioned that you must declare that
permission to use it.

Change-Id: Ib5f5294d37e39169fe5678743f380d95c4e5a842
 2011-03-16 09:38:11 -07:00
Michael Kolb
e54f66524e deprecate getVisibleTitleHeight 
Bug: 4104535

Change-Id: I8a6ef21d38a25848efa28e2c06cf2da0ff7af9c4
 2011-03-16 09:25:23 -07:00
Wei Huang
55685a6965 Merge "Add the field date_sent to keep track of the date a message was sent." 2011-03-16 08:36:14 -07:00
Mike Lockwood
92f87fb9b5 am c132f45c: am 2b2aaf2b: am ff51d29a: Merge "USB System UI: Fix string localization problems" into honeycomb-mr1 
* commit 'c132f45c5b47874746aad01156d7fb57b144e07f':
  USB System UI: Fix string localization problems
 2011-03-16 04:37:05 -07:00
Mike Lockwood
c132f45c5b am 2b2aaf2b: am ff51d29a: Merge "USB System UI: Fix string localization problems" into honeycomb-mr1 
* commit '2b2aaf2be9fb77e445574ae6c761e10cca1310b0':
  USB System UI: Fix string localization problems
 2011-03-16 04:35:23 -07:00
Mike Lockwood
2b2aaf2be9 am ff51d29a: Merge "USB System UI: Fix string localization problems" into honeycomb-mr1 
* commit 'ff51d29a0bbf7006833ad67b1aa8a52a8a9a2514':
  USB System UI: Fix string localization problems
 2011-03-16 04:33:29 -07:00
Mike Lockwood
ff51d29a0b Merge "USB System UI: Fix string localization problems" into honeycomb-mr1 2011-03-16 04:31:15 -07:00
Wu-cheng Li
3ffc993590 Merge "Improve ACTION_IMAGE_CAPTURE and ACTION_VIDEO_CAPTURE javadoc." 2011-03-16 03:08:34 -07:00
Wu-cheng Li
e7bc746e67 Improve ACTION_IMAGE_CAPTURE and ACTION_VIDEO_CAPTURE javadoc. 
Change-Id: Ib0b637ad69a559a328ac812d710b4990fd8b1a87
 2011-03-16 17:42:49 +08:00
Eric Laurent
7c7cb42742 am 9bb250bf: am a6c3ace3: am 3913c131: Merge "Improvement for issue 3489986: BT SCO volume" into honeycomb-mr1 
* commit '9bb250bfe735deb16e15dfdd6a35693558a2171e':
  Improvement for issue 3489986: BT SCO volume
 2011-03-15 23:50:45 -07:00
Romain Guy
89cc2b6422 am f8c4c128: am 0f7d2ec3: am 46fc2517: Merge "Fix performance issue in Launcher Bug #3515248" into honeycomb-mr1 
* commit 'f8c4c12802b15da068d164fd44c9b9f12e7ed916':
  Fix performance issue in Launcher Bug #3515248
 2011-03-15 23:50:43 -07:00
Justin Ho
f97e147e51 am 30d7eb02: am 6ad9cc9a: am 6764ecf8: Merge "Integrating new ADB USB debugging asset Bug: #6699FF" into honeycomb-mr1 
* commit '30d7eb02b5e9533efc41e1fc98eac5c5a6891903':
  Integrating new ADB USB debugging asset Bug: #6699FF
 2011-03-15 23:50:40 -07:00