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

12384 Commits

Author SHA1 Message Date
Eric Fischer
625c2f8d6b Merge "Fix a bug where paragraph styles could leak onto an adjacent empty line." 2010-08-05 15:51:54 -07:00
Adam Powell
a55191fe8f DO NOT MERGE Fix a bug that could cause flings to last too long using a Scroller 
Change-Id: Ia176cdb029201dbad193d2d213d3cf6e16fbee63
 2010-08-05 15:50:31 -07:00
Scott Main
005e2400b5 Merge "fix xml sample error" into froyo 2010-08-05 15:49:08 -07:00
Scott Main
307351a22d fix xml sample error 
Change-Id: Ifd188a5866382a79c2c9de94c0682b707baffdcf
 2010-08-05 15:44:26 -07:00
Eric Fischer
74d31ef2b2 Fix a bug where paragraph styles could leak onto an adjacent empty line. 
When the text ends with an empty line, the getSpans() call to retrieve
styles for it would also retrieve the styles of the preceding line.
Add a special case to detect and prevent this.

Change-Id: I888131cacce6bf45e68c53c931ebe8d58db0b7a9
 2010-08-05 15:29:36 -07:00
Eric Rowe
3417024b03 am 5c0f1e0a: am f9ea8ec5: am 982f1521: Merge "Checkin initial bluetooth stress tests." into froyo 
Merge commit '5c0f1e0a870b5792bbc0456eef6fd21642db3798'

* commit '5c0f1e0a870b5792bbc0456eef6fd21642db3798':
  Checkin initial bluetooth stress tests.
 2010-08-05 15:25:26 -07:00
Eric Rowe
5c0f1e0a87 am f9ea8ec5: am 982f1521: Merge "Checkin initial bluetooth stress tests." into froyo 
Merge commit 'f9ea8ec57e1e1d5654f57c22f514954e242833d2' into gingerbread-plus-aosp

* commit 'f9ea8ec57e1e1d5654f57c22f514954e242833d2':
  Checkin initial bluetooth stress tests.
 2010-08-05 15:18:22 -07:00
Eric Rowe
f9ea8ec57e am 982f1521: Merge "Checkin initial bluetooth stress tests." into froyo 
Merge commit '982f1521a662d274eca1216707d874f148396ac6' into gingerbread

* commit '982f1521a662d274eca1216707d874f148396ac6':
  Checkin initial bluetooth stress tests.
 2010-08-05 15:10:15 -07:00
Oscar Montemayor
7a1778afcd Merge "Fix for bug 2890320 Browser crashes, after adding bookmark. Simplified locking scheme in Proxy's getProxy(..) method. Also modified ContentObserver creation to be done from any thread." 2010-08-05 15:07:03 -07:00
Oscar Montemayor
6f71b42bc4 Fix for bug 2890320 Browser crashes, after adding bookmark. 
Simplified locking scheme in Proxy's getProxy(..) method.
Also modified ContentObserver creation to be done from any thread.

Change-Id: I54edb56a86796f08a1310cf1ae1d1f0c42a0cbc8
 2010-08-05 14:49:28 -07:00
Eric Rowe
982f1521a6 Merge "Checkin initial bluetooth stress tests." into froyo 2010-08-05 14:49:22 -07:00
Eric Rowe
14db8d9978 Checkin initial bluetooth stress tests. 
Bluetooth stress tests include stress tests for enabling/disabling bluetooth,
making the device discoverable/undiscoverable, and starting and stopping scans.

Change-Id: Ic8ba09475ffe5551717438673e0ed3f4bd17cf2f
 2010-08-05 14:45:44 -07:00
Dianne Hackborn
90d5e8c08b Fix build. 
Change-Id: I18c0af97c7e204f023cea77e3e5d08eb37596222
 2010-08-05 14:28:57 -07:00
Mike Lockwood
507a4ea340 Merge "Clean up error handling in custom sqlite function dispatching" 2010-08-05 12:53:37 -07:00
Mike Lockwood
c5bb8d8de5 Clean up error handling in custom sqlite function dispatching 
Change-Id: I54036bb5defd8c887a9b878e012f0b1d4afe9966
Signed-off-by: Mike Lockwood <lockwood@android.com>
 2010-08-05 15:51:31 -04:00
Dianne Hackborn
9f53119b72 First pass at a new clipboard API. 
ClipboardManager was in android.text(!!) so it needed to be moved
up to android.content to have access to the richer data types we
now need.

ClippedData is the data representation.  Still needs a lot of
fleshing out to allow holding more than one data type at a time
and perhaps conversions between them.  (MIME-oriented interrogation
and conversion will be done through ContentProvider, which needs
to grow an ability to report multiple MIME types and accept a
desired MIME type when a stream is being opened.)

Change-Id: Ifa51bedcd084a677813b255d171804e8496b0cb5
 2010-08-05 12:28:20 -07:00
Kenny Root
c44f1ffbfa am 983d4583: am dec43a10: Merge "Fix up PackageManager tests" into gingerbread 
Merge commit '983d4583e7bb1788d377296fe34babc1956c0a3c'

* commit '983d4583e7bb1788d377296fe34babc1956c0a3c':
  Fix up PackageManager tests
 2010-08-05 12:09:10 -07:00
Daniel Sandler
b5c22f7236 am 811d66f1: am 9b87770f: Merge "Fix crash when startForeground posts a broken Notification." into gingerbread 
Merge commit '811d66f1496b64b02c117e8d992db99e9e6cdc8d'

* commit '811d66f1496b64b02c117e8d992db99e9e6cdc8d':
  Fix crash when startForeground posts a broken Notification.
 2010-08-05 12:08:25 -07:00
Scott Main
ab847c44d0 am c9de8c34: am 97c2d840: am 8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class 
Merge commit 'c9de8c34a32af1b305b49096ee96da4c35acd2e8'

* commit 'c9de8c34a32af1b305b49096ee96da4c35acd2e8':
  fix some doc errors in the resources;
 2010-08-05 12:08:02 -07:00
Chet Haase
bc9151bcad Merge "Add new API to Animator to allow seeking of animations" 2010-08-05 11:53:34 -07:00
Jaikumar Ganesh
56b6fcaa7a am c4ed734b: am 737998f5: Merge "Add Blocked Device property." into gingerbread 
Merge commit 'c4ed734bd87c61f60ae5e23afb8d5eb2cde12b2c'

* commit 'c4ed734bd87c61f60ae5e23afb8d5eb2cde12b2c':
  Add Blocked Device property.
 2010-08-05 11:45:44 -07:00
Chet Haase
5d7b50b800 Add new API to Animator to allow seeking of animations 
Change-Id: I3960030f54814ed0ef6fb6853061c64ab3b4dd1c
 2010-08-05 11:45:04 -07:00
Dmitri Plotnikov
2ef9d2538f Changing the protocol for Directory registration. 
Change-Id: I1ba51d4198617121a9a5f86d22e91dfa9917c94b
 2010-08-05 11:27:44 -07:00
Kenny Root
ce845d7301 am c5183aca: am c68bcc32: Merge "Only allow one movePackage operation in-flight" into gingerbread 
Merge commit 'c5183acae55e08f4bfcb58aa122a200863748a63'

* commit 'c5183acae55e08f4bfcb58aa122a200863748a63':
  Only allow one movePackage operation in-flight
 2010-08-05 10:47:15 -07:00
Brian Carlstrom
1b7e4d5adc am 4ae1e382: Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread 
Merge commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af' into gingerbread-plus-aosp

* commit '4ae1e382f4b6c5bb9e757f35f82ad48dc02c32af':
  Tracking merge of dalvik-dev to gingerbread
 2010-08-05 10:40:45 -07:00
Brian Carlstrom
4ae1e382f4 Merge "Tracking merge of dalvik-dev to gingerbread" into gingerbread 2010-08-05 10:35:53 -07:00
Kenny Root
983d4583e7 am dec43a10: Merge "Fix up PackageManager tests" into gingerbread 
Merge commit 'dec43a102226de55307de20d5779e20a435be8b1' into gingerbread-plus-aosp

* commit 'dec43a102226de55307de20d5779e20a435be8b1':
  Fix up PackageManager tests
 2010-08-05 10:04:59 -07:00
Kenny Root
d7b421b4de Fix up PackageManager tests 
PackageManagerTests was trying to mount and unmount the media without
waiting for the correct state to arrive. It was proceeding with any
state transition.

Some tests had their own volume mounting and unmounting code that was
flawed, so switch it to the more robust mountMedia() and unmountMedia()
implementations.

Change-Id: If464927bb09dd15cb040c6cce195a6ad8452de95
 2010-08-05 08:40:09 -07:00
Daniel Sandler
0f0b11c871 Basic support for notification payloads in the panel. 
Line-item veto is there, but allows you to cancel some
notifications you probably shouldn't be canceling. (Should
hide the "X" in those cases.)

No preference given to "sticky" notifications, because
there's no such thing yet.

Notifications are now limited to 4 visible icons, per spec.
The implementation is a total hack for now.

Change-Id: Ibdf433ae94189117f983c510fe5e0cff0bf5c44c
 2010-08-05 09:34:50 -04:00
Brian Carlstrom
3c7c351a62 Tracking merge of dalvik-dev to gingerbread 
git cherry-pick --no-commit f77cf7f0
git cherry-pick --no-commit c8f503b5285e30c1a881d0ba860ba9021f57d113
git cherry-pick --no-commit 570bb561
git cherry-pick --no-commit e2417541
git cherry-pick --no-commit e4d81f25bd4dc1a5c909b56ab56a56406290da30
git cherry-pick --no-commit 5e8a587d

Change-Id: I101a385d43f3e0f4ce5352217f92ef67a3908c88
 2010-08-04 23:47:38 -07:00
Daniel Sandler
811d66f149 am 9b87770f: Merge "Fix crash when startForeground posts a broken Notification." into gingerbread 
Merge commit '9b87770f53c55a313a7fdc6f553265aabbde3446' into gingerbread-plus-aosp

* commit '9b87770f53c55a313a7fdc6f553265aabbde3446':
  Fix crash when startForeground posts a broken Notification.
 2010-08-04 20:36:09 -07:00
Daniel Sandler
9b87770f53 Merge "Fix crash when startForeground posts a broken Notification." into gingerbread 2010-08-04 20:33:32 -07:00
Oscar Montemayor
8063589c6c Removed extra parameter tag in JavaDocs 
Change-Id: I0bc6f201d12a95a7c96b3fac90688d113a554d22
 2010-08-04 18:34:12 -07:00
Oscar Montemayor
f7c851749d Merge "Fix for SDK breakage with hidden field." 2010-08-04 18:28:43 -07:00
Oscar Montemayor
ac54fb9da1 Fix for SDK breakage with hidden field. 
Change-Id: If66c31b8823a886e9a0853b63ef9bbdf25dc9a71
 2010-08-04 18:24:14 -07:00
Scott Main
c9de8c34a3 am 97c2d840: am 8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class 
Merge commit '97c2d840a10813164d82571775a3566637d6c5de' into gingerbread-plus-aosp

* commit '97c2d840a10813164d82571775a3566637d6c5de':
  fix some doc errors in the resources;
 2010-08-04 18:05:26 -07:00
Scott Main
97c2d840a1 am 8dd87ad9: fix some doc errors in the resources; add link to resource docs for ColorStateList class 
Merge commit '8dd87ad9440bc63bc312b06f292adcd2642b1c41' into gingerbread

* commit '8dd87ad9440bc63bc312b06f292adcd2642b1c41':
  fix some doc errors in the resources;
 2010-08-04 18:02:25 -07:00
Adam Powell
8e552630e7 Let action modes overlay window content 
Change-Id: Ic0512c3e6338e1de15facec0a6650f9da9808a24
 2010-08-04 17:42:44 -07:00
Scott Main
8dd87ad944 fix some doc errors in the resources; 
add link to resource docs for ColorStateList class

Change-Id: I7f59bfd136d5bd3c2ea066b6123ee13ccd57f502
 2010-08-04 17:33:33 -07:00
Oscar Montemayor
2cd1dbe50d Merge "Fix for bug 2890320 Browser crashes, after adding bookmark. Fixed Proxy class locking and dealing with empty exclusion lists." 2010-08-04 17:15:25 -07:00
Manuel Roman
96183e16e4 Merge "add shutdown() to ContentProvider & call in ProviderTestCase*.tearDown" 2010-08-04 16:42:55 -07:00
Oscar Montemayor
c4c9df3d71 Merge "Device Policy Manager changes to enable Global Proxy." 2010-08-04 16:25:01 -07:00
Irfan Sheriff
8525f5dc4a Merge "Avoid hostname lookup in NetworkProperties" 2010-08-04 16:07:13 -07:00
Oscar Montemayor
b8f66019ad Fix for bug 2890320 Browser crashes, after adding bookmark. 
Fixed Proxy class locking and dealing with empty exclusion lists.

Change-Id: I2cfcc099961aa3eec388a7457f40b0b2236f84c8
 2010-08-04 16:07:02 -07:00
Oscar Montemayor
69238c6a37 Device Policy Manager changes to enable Global Proxy. 
Change-Id: I8489df7d28e4c5312e10d5cecc8e2a182413a034
 2010-08-04 16:01:56 -07:00
Irfan Sheriff
1cf56ab9c6 Avoid hostname lookup in NetworkProperties 
Bug: 2870816
Change-Id: Iba98d7d25da5068051dba19aa04702cc93b7cc05
 2010-08-04 15:15:49 -07:00
Chet Haase
bb688d6f37 Merge "Fix NPE in onAnimationEnd when using Sequencer.after(long)" 2010-08-04 13:58:52 -07:00
Patrick Dubroy
40771bc433 Fix NPE in onAnimationEnd when using Sequencer.after(long) 2010-08-04 13:49:39 -07:00
Vasu Nori
0c9e14aa4a add shutdown() to ContentProvider & call in ProviderTestCase*.tearDown 
Change-Id: I3dd69b6907d68b7c1184139f22297ab92337f043
 2010-08-04 13:34:34 -07:00
Jeff Hamilton
31d95db2cc Improve the documentation for the browser provider, and a few small cleanups. 
Change-Id: If6eb918ce4cdb09f74bd7eaaedf265d7981365ee
 2010-08-04 15:26:25 -05:00