Commit Graph

9304 Commits

Author SHA1 Message Date
Cary Clark
1ef41605bb am d64f4a98: DO NOT MERGE fix null check
Merge commit 'd64f4a983df4fd11795e04896d8c48852f6b1777' into gingerbread-plus-aosp

* commit 'd64f4a983df4fd11795e04896d8c48852f6b1777':
  DO NOT MERGE fix null check
2010-08-25 13:53:05 -07:00
Cary Clark
d64f4a983d DO NOT MERGE fix null check
Check to see if the WebChromeClient is null.

Checked into master in change 63008

Change-Id: If2ef1889ce3633c0b35c078a46bde84982dd1eb3
http://b/2945171
2010-08-25 16:22:15 -04:00
Chih-Chung Chang
20afae5150 am 231a0005: Merge "Avoid allocating buffer every time getThumbnail is called." into gingerbread
Merge commit '231a0005654d23284ab58a2d9ea892b995988c34' into gingerbread-plus-aosp

* commit '231a0005654d23284ab58a2d9ea892b995988c34':
  Avoid allocating buffer every time getThumbnail is called.
2010-08-25 00:09:22 -07:00
Chih-Chung Chang
2ca36196ea Avoid allocating buffer every time getThumbnail is called.
Change-Id: Ia088539463e26a1242064ed7e79b0b2c12d64ced
2010-08-25 14:52:30 +08:00
Dianne Hackborn
d3cd259675 am 4af0cfad: Merge "Verify that onPause() calls its superclass." into gingerbread
Merge commit '4af0cfad5305c8827c6235ca86e7db63b534ad68' into gingerbread-plus-aosp

* commit '4af0cfad5305c8827c6235ca86e7db63b534ad68':
  Verify that onPause() calls its superclass.
2010-08-24 14:47:46 -07:00
Dianne Hackborn
4af0cfad53 Merge "Verify that onPause() calls its superclass." into gingerbread 2010-08-24 14:44:42 -07:00
Gilles Debunne
b32d0f23a8 am e2978c8d: Merge "Fix for an NPE in TextView." into gingerbread
Merge commit 'e2978c8dcafdf20c2b49999ec423cb5f76d4a583' into gingerbread-plus-aosp

* commit 'e2978c8dcafdf20c2b49999ec423cb5f76d4a583':
  Fix for an NPE in TextView.
2010-08-24 14:25:57 -07:00
Gilles Debunne
e2978c8dca Merge "Fix for an NPE in TextView." into gingerbread 2010-08-24 14:23:37 -07:00
Gilles Debunne
4e765e002f Fix for an NPE in TextView.
Change-Id: I0fca8f839cd444d9b70174078063efff5be499a3
2010-08-24 14:21:13 -07:00
Brad Fitzpatrick
6cf1a8bfb0 am b1bbe99a: Merge "Some StrictMode API changes." into gingerbread
Merge commit 'b1bbe99aaa01f321ae94f0d5ba4505e528664cc7' into gingerbread-plus-aosp

* commit 'b1bbe99aaa01f321ae94f0d5ba4505e528664cc7':
  Some StrictMode API changes.
2010-08-24 14:18:26 -07:00
Brad Fitzpatrick
b1bbe99aaa Merge "Some StrictMode API changes." into gingerbread 2010-08-24 14:15:30 -07:00
Daisuke Miyakawa
ff547a5949 am 88bff62c: Merge "Fix vCard so that it looks at IM correctly." into gingerbread
Merge commit '88bff62c35e570a0c86eb55ded79d4600730226b' into gingerbread-plus-aosp

* commit '88bff62c35e570a0c86eb55ded79d4600730226b':
  Fix vCard so that it looks at IM correctly.
2010-08-24 13:39:42 -07:00
Daisuke Miyakawa
88bff62c35 Merge "Fix vCard so that it looks at IM correctly." into gingerbread 2010-08-24 13:37:02 -07:00
Daisuke Miyakawa
4a2a2eb4cb Fix vCard so that it looks at IM correctly.
Change-Id: I3afc01e2e5f55c254606379f353b030ea297ee36
2010-08-24 13:33:25 -07:00
Dianne Hackborn
e794e9f9b7 Verify that onPause() calls its superclass.
Change-Id: Ibf48992b4445bfc726ade307aad26f3e9577c5fb
2010-08-24 12:32:10 -07:00
Brad Fitzpatrick
97461bd25c Some StrictMode API changes.
* rename setThreadBlockingPolicy to setThreadPolicy (opens the way to
  using StrictMode for non-blocking-related things in the future?)

* add allowThreadDiskWrites() and allowThreadDiskReads() to modify the
  current policy mask and return the old one.  this will allow turning
  off part of StrictMode during certain regions of code.  (for
  instance, writing to disk in Activity onPause...)

Change-Id: Ia1878153713f79299971fdab567fa15b3cb9d56c
2010-08-24 11:47:19 -07:00
Gilles Debunne
9765b2a01d am 2703a42d: When an EditText gains focus by tapping, move the insertion point where tapped.
Merge commit '2703a42d16af0e62da1bba02b6c935d98debf936' into gingerbread-plus-aosp

* commit '2703a42d16af0e62da1bba02b6c935d98debf936':
  When an EditText gains focus by tapping, move the insertion point where tapped.
2010-08-24 10:30:09 -07:00
Gilles Debunne
2703a42d16 When an EditText gains focus by tapping, move the insertion point where tapped.
The previous behavior was to move cursor at the end of the first line,
which feels weird.

Change-Id: I5a72f9871ed79ee2c521698ea642ba126537f4f9
2010-08-24 10:18:31 -07:00
Brad Fitzpatrick
0b7b980761 am d132892a: Merge "Don\'t touch the VFS during window relayout." into gingerbread
Merge commit 'd132892a75532557bb18af14eab6081704b7fa6d' into gingerbread-plus-aosp

* commit 'd132892a75532557bb18af14eab6081704b7fa6d':
  Don't touch the VFS during window relayout.
2010-08-23 23:37:17 -07:00
Brad Fitzpatrick
9088100518 Don't touch the VFS during window relayout.
yaffs2 is single-threaded and any disk access during window drawing
(or animation in this case) can cause UI stutters / unresponsiveness
for hundreds of milliseconds.

BUG=2941119

Change-Id: Ifdce8337027ab25d1ea844934fa787ffe68263c4
2010-08-23 18:30:08 -07:00
Gilles Debunne
b037da401a am 3e05a0be: Hysteresis effect in Text selection.
Merge commit '3e05a0beb2fad0b21558019d2adf6805da70e10e' into gingerbread-plus-aosp

* commit '3e05a0beb2fad0b21558019d2adf6805da70e10e':
  Hysteresis effect in Text selection.
2010-08-23 15:26:51 -07:00
Gilles Debunne
3e05a0beb2 Hysteresis effect in Text selection.
Vertical movement requires going over a given threshold to change line.
Makes it easier to move down without changing line, so that one can see the
cursor better. Also simplifies long line selection.

Change-Id: I791da500232c6e510af64c637ed994c5da9a4fea
2010-08-23 15:20:53 -07:00
Jean-Baptiste Queru
026231284c resolved conflicts for merge of 1ffd753e to gingerbread-plus-aosp
Change-Id: I2741766c359bed3040fa3b787d72483eb028fb6d
2010-08-23 14:20:47 -07:00
Mathias Agopian
0c76c7c5ee Merge "add new sensor types for handling gyro data and device orientation more efficiently." into gingerbread 2010-08-23 13:54:17 -07:00
Jean-Baptiste Queru
1ffd753ee0 Merge "Crash when powering off." 2010-08-23 13:24:19 -07:00
Kevin Powell
7a0541d6b8 add new sensor types for handling gyro data and device orientation
more efficiently.

Change-Id: Ifbcf2caae0865eccf1c9b8060342185c22145a30
2010-08-20 19:24:02 -07:00
Steve Howard
6d895fdbc0 am d2e5f95e: Merge "Make ProgressBar.setVisibility() remotable." into gingerbread
Merge commit 'd2e5f95e0eeaff3422fde29cf6e0a91ceecfefaf' into gingerbread-plus-aosp

* commit 'd2e5f95e0eeaff3422fde29cf6e0a91ceecfefaf':
  Make ProgressBar.setVisibility() remotable.
2010-08-20 19:06:23 -07:00
Steve Howard
d2e5f95e0e Merge "Make ProgressBar.setVisibility() remotable." into gingerbread 2010-08-20 19:04:35 -07:00
Jean-Baptiste Queru
c64b916ef5 resolved conflicts for merge of e7731f0a to gingerbread-plus-aosp
Change-Id: I8001a95f8c44ef0343e0a50de4bd5b5a85d41c38
2010-08-20 18:19:03 -07:00
Christian Mehlmauer
e7731f0a7f Added overload methods for DatabaseUtils.queryNumEntries
Now you can filter the count statement with a selection
and selection args
UnitTests for this new methods are added to the cts project

Change-Id: Id9233aec0eaac08839041ae7cbaba203470ad3d8
2010-08-20 18:02:09 -07:00
Jean-Baptiste Queru
f235a51939 am ec58dff0: Fix build - remove dead doc link
Merge commit 'ec58dff06693342f12f295fdb7b41cfcbaeb4f14' into gingerbread-plus-aosp

* commit 'ec58dff06693342f12f295fdb7b41cfcbaeb4f14':
  Fix build - remove dead doc link
2010-08-20 17:54:33 -07:00
Jean-Baptiste Queru
ec58dff066 Fix build - remove dead doc link
Change-Id: I72e05d41819c14bf67d721740e0d48c71eeae397
2010-08-20 17:44:14 -07:00
Steve Howard
b25ffffc31 Make ProgressBar.setVisibility() remotable.
ProgressBar overrides setVisibilty(), causing it to lose the
RemotableViewMethod annotation and making it impossible to hide a
ProgressBar in a RemoteViews.  This change adds the annotation.

Change-Id: Ic1212b99fd52f8c36bef4805bfef5e170b28f0a6
2010-08-20 17:39:26 -07:00
Jean-Baptiste Queru
0460e26a4c resolved conflicts for merge of 691be97f to gingerbread-plus-aosp
Change-Id: Ic095e7f9203eb1465ddf3c195ebf1200e9393124
2010-08-20 17:16:37 -07:00
Jean-Baptiste Queru
691be97f16 Merge "add new sensor types for handling gyro data and device orientation more efficiently." 2010-08-20 16:21:11 -07:00
Jean-Baptiste Queru
b13c9bc521 manual merge
Change-Id: Ib92a75958b857277e17f4bd0bee75744c653c942
2010-08-20 15:58:49 -07:00
Jean-Baptiste Queru
32f510e5b4 Merge "BluetoothHeadset.java: Added ACTION_VENDOR_SPECIFIC_HEADSET_EVENT, EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_CMD, EXTRA_VENDOR_SPECIFIC_HEADSET_EVENT_ARGS." 2010-08-20 15:22:33 -07:00
Kenny Root
485de781f6 am 06c81f29: Merge changes I8a257579,I82d16312 into gingerbread
Merge commit '06c81f29a61ad3568a77f111b6be93e1f437f5bd' into gingerbread-plus-aosp

* commit '06c81f29a61ad3568a77f111b6be93e1f437f5bd':
  Add AStorageManager API to NDK
  Reorganize MountService IPC
2010-08-20 15:09:58 -07:00
Kenny Root
06c81f29a6 Merge changes I8a257579,I82d16312 into gingerbread
* changes:
  Add AStorageManager API to NDK
  Reorganize MountService IPC
2010-08-20 15:07:34 -07:00
Dianne Hackborn
a3ece8bde3 am 32519259: Merge "Fix a few small battery stats problems:" into gingerbread
Merge commit '325192593b057f4360e1abddf490b4fae7d60b12' into gingerbread-plus-aosp

* commit '325192593b057f4360e1abddf490b4fae7d60b12':
  Fix a few small battery stats problems:
2010-08-20 14:13:22 -07:00
Dianne Hackborn
325192593b Merge "Fix a few small battery stats problems:" into gingerbread 2010-08-20 14:10:41 -07:00
Dianne Hackborn
99d0452ddc Fix a few small battery stats problems:
- Actually aggregate discharge amounts.
- Actually print the unplugged battery info when currently plugged in.

Change-Id: I22dd6feb73ac1364eb169d3239ce403b0755bb6c
2010-08-20 13:43:00 -07:00
Kenny Root
be857d4284 Reorganize MountService IPC
Remove auto-generated AIDL files and replace them with manually edited
.java and .cpp/.h files so that binder calls can be made from either
Java or C++.

Update the makefiles to not attempt to generate the AIDL files and also
remove the old auto-generated .java files.

Put all the storage-related C++ things in libstorage so that we don't
pollute other libraries.

Change-Id: I82d1631295452709f12ff1270f36c3100e652806
2010-08-20 13:17:12 -07:00
Dianne Hackborn
c5794ae725 am baf72cd7: Merge "DO NOT MERGE 2928156 Accessibility event\'s parcelableData property not nullified during recycling (GINGERBREAD)" into gingerbread
Merge commit 'baf72cd79c2a675c2265384eb704067ab24259a7' into gingerbread-plus-aosp

* commit 'baf72cd79c2a675c2265384eb704067ab24259a7':
  DO NOT MERGE 2928156  Accessibility event's parcelableData property not nullified during recycling (GINGERBREAD)
2010-08-20 12:55:29 -07:00
Dianne Hackborn
baf72cd79c Merge "DO NOT MERGE 2928156 Accessibility event's parcelableData property not nullified during recycling (GINGERBREAD)" into gingerbread 2010-08-20 12:53:07 -07:00
Robert Greenwalt
2b05a95bcc am 4b1bdc02: Merge "DO NOT MERGE Fixing Connectivity" into gingerbread
Merge commit '4b1bdc0209650436ebe0dad1020080cc891e97b6' into gingerbread-plus-aosp

* commit '4b1bdc0209650436ebe0dad1020080cc891e97b6':
  DO NOT MERGE Fixing Connectivity
2010-08-20 12:04:07 -07:00
Robert Greenwalt
4b1bdc0209 Merge "DO NOT MERGE Fixing Connectivity" into gingerbread 2010-08-20 12:01:56 -07:00
Dianne Hackborn
5474b0f860 am 39792d22: Fix bugs with granting permissions through onNewIntent().
Merge commit '39792d2262352ae775091876d5488d2412a2ff92' into gingerbread-plus-aosp

* commit '39792d2262352ae775091876d5488d2412a2ff92':
  Fix bugs with granting permissions through onNewIntent().
2010-08-20 11:53:29 -07:00
Dianne Hackborn
39792d2262 Fix bugs with granting permissions through onNewIntent().
It would grant the permission to the temporary ActivityRecord,
not the real one, so it never got cleaned up.

Also allow granting of permissions to services because...  well,
it would be really really useful.  And it introduces some
refactoring that we'll need to support cut/paste.

Change-Id: If521f509042e7baad7f5dc9bec84b6ba0d90ba09
2010-08-20 11:50:00 -07:00
Wu-cheng Li
346b6126d5 am 97a56269: Merge "Add camera fps range API." into gingerbread
Merge commit '97a56269d06770712f9da7a2a29385012ec9714e' into gingerbread-plus-aosp

* commit '97a56269d06770712f9da7a2a29385012ec9714e':
  Add camera fps range API.
2010-08-20 11:21:37 -07:00