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

32480 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
e335914c7e Improve error reporting in the layoutlib class replacement test. 
Change-Id: I451253ebb902171d67683784ef7a6de65588865d
 2010-09-28 10:55:24 -07:00
Romain Guy
a2a57aa02b Merge "Display the correct expected name when loading the wrong adapter." 2010-09-28 10:35:09 -07:00
Romain Guy
5a86c4c385 Display the correct expected name when loading the wrong adapter. 
Bug #3042860

Change-Id: I5533c6b99a6aa69e05b6acf8f140b64ee5ea02f0
 2010-09-28 10:33:37 -07:00
Stephen Hines
ab98bb6e8b Fix RS bug with message ID 0. 
Clamp RSTest list to nice viewable range.

Change-Id: I0909511e16984ec78150cda17c22e22af1fa0cdb
 2010-09-28 10:28:12 -07:00
Irfan Sheriff
6db6468956 am c89dd54c: Remove logging on wifilock acquire/release 
Merge commit 'c89dd54ceeec99173d51d1196e2c03a58f120211' into gingerbread-plus-aosp

* commit 'c89dd54ceeec99173d51d1196e2c03a58f120211':
  Remove logging on wifilock acquire/release
 2010-09-28 10:26:29 -07:00
Irfan Sheriff
c89dd54cee Remove logging on wifilock acquire/release 
Bug: 3042300
Change-Id: Ia3ce184f53bdd9afee1c78bb9c294af57364f266
 2010-09-28 10:13:14 -07:00
Gil Dobjanschi
b0725a4aeb Merge "Validate Overlay and effect duration and start time." 2010-09-28 10:08:53 -07:00
Andy Stadler
cb6f29ebc6 am a16682b5: Merge "Allow touch events when clickable *or* longClickable" into gingerbread 
Merge commit 'a16682b5e8ed635910eada23272ba6548922c02e' into gingerbread-plus-aosp

* commit 'a16682b5e8ed635910eada23272ba6548922c02e':
  Allow touch events when clickable *or* longClickable
 2010-09-28 10:06:27 -07:00
repo sync . build/envsetup.sh lunch passion-en
9231e82291 am 8c665807: (-s ours) am 4fc3d2f0: DO NOT MERGE 
Merge commit '8c66580759b3085866e1f9f1ca9af1a60220e574'

* commit '8c66580759b3085866e1f9f1ca9af1a60220e574':
  DO NOT MERGE
 2010-09-28 09:30:16 -07:00
Andy Stadler
a16682b5e8 Merge "Allow touch events when clickable *or* longClickable" into gingerbread 2010-09-28 09:26:49 -07:00
Gil Dobjanschi
f8b04868e6 Validate Overlay and effect duration and start time. 
Change-Id: I3235573f9edc65f148541adacd01eb5caa0b8615
 2010-09-28 09:24:29 -07:00
Dave Sparks
7dff9dfd61 am 269dea1c: Merge "Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669. The dump function whitelists several directories as filters to the output. The mount point changed for SD card in Froyo, and we started filtering files that were open on t 
Merge commit '269dea1c48640ec2bf5a4e9de851cac2dbfbafd1' into gingerbread-plus-aosp

* commit '269dea1c48640ec2bf5a4e9de851cac2dbfbafd1':
  Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669.
 2010-09-28 08:52:23 -07:00
Dave Sparks
269dea1c48 Merge "Fix media.player dumpsys to output open/mapped files correctly. Bug 2866669. The dump function whitelists several directories as filters to the output. The mount point changed for SD card in Froyo, and we started filtering files that were open on the SD card. This fix changes the filter for the SD card, and adds the directory for data files as well." into gingerbread 2010-09-28 08:44:39 -07:00
Steve Block
31fb8b60fb Merge changes Ic62f60d9,I04a01634 
* changes:
  Provide a useful message in DumpRenderTree2 GUI when the host server is not running
  Prevent DumpRenderTree2 from crashing when the host server is not running
 2010-09-28 07:09:45 -07:00
Leon Scroggins
f2e17a8683 Hide the soft keyboard when a textfield is blurred. 
Bug: 2953257

Requires a change to external/webkit

Change-Id: I8ca82dc7cb6bc1494400f5e5c38050023c94a513
 2010-09-28 10:04:50 -04:00
Steve Block
cb98a3e621 Provide a useful message in DumpRenderTree2 GUI when the host server is not running 
Bug: 3010758
Change-Id: Ic62f60d96055e7ad1e475215ca384306cdfa859c
 2010-09-28 14:34:01 +01:00
Steve Block
898bfbd865 Prevent DumpRenderTree2 from crashing when the host server is not running 
Bug: 3010758
Change-Id: I04a01634544d223d225b264827d3cf18be74e1e0
 2010-09-28 14:21:03 +01:00
Mike Lockwood
698fcc1226 Merge changes I2491a2ce,Ie1c88bd8 
* changes:
  MtpCursor: Fix long to int truncation bug
  MtpCursor: Remove some unused variables
 2010-09-28 06:17:40 -07:00
Mike Lockwood
e11eba3c8a MtpCursor: Fix long to int truncation bug 
BUG: 2978335

Change-Id: I2491a2ce3b65afa272540090cabace52067b8534
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-28 09:14:50 -04:00
Mike Lockwood
90bbe5e486 MtpCursor: Remove some unused variables 
Change-Id: Ie1c88bd817c45fc19e34165f8d8557f00514188d
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-09-28 08:36:15 -04:00
Steve Block
42bf092c47 Update run_layout_tests.py to give a useful error if DumpRenderTree2 is not found on the device 
Bug: 3006981
Change-Id: Ie789eb726bc051305371d4958c16ceca980ea1d1
 2010-09-28 13:12:36 +01:00
Steve Block
5c23ebadd4 Update the storage locations used by the Chromium HTTP stack 
This updates the strorage locations to better match those used by the
Android HTTP stack.

The corresponding external/webkit change is
https://android-git.corp.google.com/g/70643

Bug: 3039536
Change-Id: Ia7ea68d1472e96788a7fbaa6e8f7aa1ee51b3fb0
 2010-09-28 12:32:05 +01:00
Hung-ying Tyan
f7e13400b2 am 624d5b4e: SIP: add DisconnectCause.SERVER_ERROR 
Merge commit '624d5b4e8c20516516d0bff74479b9f5abdfe61c' into gingerbread-plus-aosp

* commit '624d5b4e8c20516516d0bff74479b9f5abdfe61c':
  SIP: add DisconnectCause.SERVER_ERROR
 2010-09-27 23:58:08 -07:00
Hung-ying Tyan
624d5b4e8c SIP: add DisconnectCause.SERVER_ERROR 
and fix how SipErrorCode.SERVER_ERROR is determinted from server response, not
from local exceptions.

http://b/issue?id=3041332

Change-Id: Idce67e29858d5c7573b98b7fa1fac074913d71d6
 2010-09-28 14:54:13 +08:00
Adam Powell
1d9fc8c504 Merge "Temporary hack to make context menu text visible on holo dialogs." 2010-09-27 23:17:34 -07:00
Adam Powell
e4679f1ed2 Temporary hack to make context menu text visible on holo dialogs. 
Real fix for this to come. MenuBuilder needs to not hardcode themes
and dialogs shouldn't either.

Change-Id: I393969acd1ef6956d7299cb2eff46708ce812d1d
 2010-09-27 23:12:39 -07:00
Chung-yih Wang
4a64afd288 am 24547592: Fix the startAudio order for 3-way calls. 
Merge commit '245475925eff61ee76bde58de69253a889e39d0a' into gingerbread-plus-aosp

* commit '245475925eff61ee76bde58de69253a889e39d0a':
  Fix the startAudio order for 3-way calls.
 2010-09-27 22:58:59 -07:00
Adam Powell
81eeecc305 Merge "Fix some text styling for Holo.Light" 2010-09-27 22:29:15 -07:00
Adam Powell
385fe872ab Fix some text styling for Holo.Light 
Change-Id: Ia082c12b2b0cef044170ba92e9f837bd38516c8e
 2010-09-27 22:26:03 -07:00
Hung-ying Tyan
400f12b4dd Fix build. 
Change-Id: Iae02fabe42013705592f75748388daf8fa5ed54e
 2010-09-28 13:01:49 +08:00
Chung-yih Wang
245475925e Fix the startAudio order for 3-way calls. 
Change-Id: Ib387b4b1f641f9bf52dd6007d23aee08f0925811
 2010-09-28 12:46:04 +08:00
Hung-ying Tyan
a57afb6a6c resolved conflicts for merge of 2a36a778 to master 
Change-Id: Ia70adeef06afddd29c827405fb5657bf9f5a29a3
 2010-09-28 12:17:44 +08:00
Hung-ying Tyan
159cceaae2 am 368d796e: Fix build. 
Merge commit '368d796e2e28ecd738362c7a4566cb3eb219ab26' into gingerbread-plus-aosp

* commit '368d796e2e28ecd738362c7a4566cb3eb219ab26':
  Fix build.
 2010-09-27 21:09:56 -07:00
Hung-ying Tyan
368d796e2e Fix build. 
Change-Id: I30f2615bc080db2c672e0391fd8bc735de17fcbf
 2010-09-28 12:05:40 +08:00
Gilles Debunne
747eb00eef am 4e9243d5: (-s ours) am 8d7057df: Merge "Updated assets in status bar. DO NOT MERGE." into gingerbread 
Merge commit '4e9243d55ce183542c74550e503ea583643599a0'

* commit '4e9243d55ce183542c74550e503ea583643599a0':
  Updated assets in status bar. DO NOT MERGE.
 2010-09-27 21:03:40 -07:00
Nick Kralevich
b740491871 am d0cb228b: am 23142acf: Merge "squeeze a few more bits of randomness into /dev/random" into gingerbread 
Merge commit 'd0cb228b9af0b67fa3372ee075287e7409249550'

* commit 'd0cb228b9af0b67fa3372ee075287e7409249550':
  squeeze a few more bits of randomness into /dev/random
 2010-09-27 21:03:30 -07:00
Winson Chung
4d5a8b5587 am 55ee8f93: am 44e8ff99: Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings. 
Merge commit '55ee8f9329b4e99427dddc692e3d8ff10d9c9eef'

* commit '55ee8f9329b4e99427dddc692e3d8ff10d9c9eef':
  Adding a new intent to allow for apps (Launcher) to jump to the All Apps tab in the settings.
 2010-09-27 21:03:17 -07:00
Eric Fischer
9ad750c502 am 7063eb10: (-s ours) am dc36da51: Merge "Trim unwanted whitespace from translations. DO NOT MERGE" into gingerbread 
Merge commit '7063eb104657d1fa3f5e030b4657a9541ec6b054'

* commit '7063eb104657d1fa3f5e030b4657a9541ec6b054':
  Trim unwanted whitespace from translations.  DO NOT MERGE
 2010-09-27 21:03:02 -07:00
Gilles Debunne
2e86b2df05 am 63555e36: (-s ours) am 0ba5b647: Merge "Revert previous status bar assets. DO NOT MERGE." into gingerbread 
Merge commit '63555e36c9dd9b38624ae275ffc3f598a5112057'

* commit '63555e36c9dd9b38624ae275ffc3f598a5112057':
  Revert previous status bar assets. DO NOT MERGE.
 2010-09-27 21:02:41 -07:00
Chris Palmer
27be57a231 am d4f1436d: (-s ours) am 143e6109: DO NOT MERGE Clarify the explanation of Android\'s security design. 
Merge commit 'd4f1436d6abf60bb299cc57330f7fc37cb161853'

* commit 'd4f1436d6abf60bb299cc57330f7fc37cb161853':
  DO NOT MERGE Clarify the explanation of Android's security design.
 2010-09-27 21:02:20 -07:00
Jeff Brown
26d5786fb1 am 9c37447e: Merge "Fix pointer index when splitting secondary pointers." into gingerbread 
Merge commit '9c37447e5c3555e4063777e4ef82e355e57f4c68' into gingerbread-plus-aosp

* commit '9c37447e5c3555e4063777e4ef82e355e57f4c68':
  Fix pointer index when splitting secondary pointers.
 2010-09-27 21:00:44 -07:00
Jeff Brown
9c37447e5c Merge "Fix pointer index when splitting secondary pointers." into gingerbread 2010-09-27 20:57:02 -07:00
Jeff Brown
9a01d0519f Fix pointer index when splitting secondary pointers. 
Change-Id: Ib01e810ea5b64501b1303000bbef0f0a1db2114e
 2010-09-27 20:54:28 -07:00
Wu-cheng Li
de8652cbc1 resolved conflicts for merge of 191a25e1 to master 
Change-Id: I6f4940e337a992bf84e50bc1d22432593937499c
 2010-09-27 20:50:22 -07:00
Kenny Root
cc8f44bc81 am e7dd4e38: am 04a426f5: Merge "Use buffered I/O during certificate parsing" into gingerbread 
Merge commit 'e7dd4e38c47f2f7760d1ce4f86d6321e17f98d1d'

* commit 'e7dd4e38c47f2f7760d1ce4f86d6321e17f98d1d':
  Use buffered I/O during certificate parsing
 2010-09-27 20:32:56 -07:00
Dianne Hackborn
64bbbb471e resolved conflicts for merge of a8bce7c8 to master 
Change-Id: I34526a3aed6591639e1a1bff8f42e0c5d8e328cc
 2010-09-27 20:25:20 -07:00
Hung-ying Tyan
1738252a59 am 32346522: Merge "Don\'t enter DISCONNECTING state when the call/connection is not alive" into gingerbread 
Merge commit '3234652242f54e3366e7c74e5a0cf0a7da5871b4' into gingerbread-plus-aosp

* commit '3234652242f54e3366e7c74e5a0cf0a7da5871b4':
  Don't enter DISCONNECTING state when the call/connection is not alive
 2010-09-27 19:26:11 -07:00
Hung-ying Tyan
3234652242 Merge "Don't enter DISCONNECTING state when the call/connection is not alive" into gingerbread 2010-09-27 19:23:35 -07:00
Vasu Nori
9b8a51e9d3 Merge "fix this: closing database twice fails with IllegalStateException" 2010-09-27 18:29:18 -07:00
Dharmaray Kundargi
eb1817844f Merge "work on review comments and code formating. Removed white spaces" 2010-09-27 18:28:00 -07:00