2111 Commits

Author SHA1 Message Date
Leon Scroggins
213a31c7d5 Fix some Java mistakes found by FindBugs.
Use Integer.valueOf() instead of new Integer()
Eliminate unused fields in InvokeListBox
Make FocusNode, HitTestRequest, and ExtendedZoomControls
static inner classes.
2009-05-21 16:49:32 -07:00
Android (Google) Code Review
51ec709aee Merge change 1940
* changes:
  handle OTR messages by storing them in an in-memory table; remove groupchat message urls since we can get to messages by thread ids.
2009-05-21 10:08:09 -07:00
Android (Google) Code Review
9b1e1400df am 8c690ea9: Merge change 2182 into donut
Merge commit '8c690ea9976d644db3c96eddbbbd2d50eac56913'

* commit '8c690ea9976d644db3c96eddbbbd2d50eac56913':
  location: Replace ILocationCollector interface with new ILocationProvider method
2009-05-21 09:42:38 -07:00
Android (Google) Code Review
a59fa9b6cb am db79edc5: Merge change 2168 into donut
Merge commit 'db79edc5dc39e103356cad8781148a8794520bc5'

* commit 'db79edc5dc39e103356cad8781148a8794520bc5':
  Fix permission hole in camera service. Some debugging code was added
2009-05-21 09:42:24 -07:00
Android (Google) Code Review
9178bd31ae am 3343af5f: Merge change 1863 into donut
Merge commit '3343af5fdb10ace9e593d042fedcd9b42e322a95'

* commit '3343af5fdb10ace9e593d042fedcd9b42e322a95':
  Center the progress message for GoogleWebContentHelper (bug #1548858).
2009-05-21 09:42:17 -07:00
Android (Google) Code Review
8c690ea997 Merge change 2182 into donut
* changes:
  location: Replace ILocationCollector interface with new ILocationProvider method
2009-05-21 08:52:25 -07:00
Mike Lockwood
fd6e5f0dda location: Replace ILocationCollector interface with new ILocationProvider method
This change replaces ILocationCollector with a more general mechanism that
passes locations received from a provider to all other providers.
The network location provider now uses this to implement the location collector.
In the future, this could be used to inject network locations to the GPS
as aiding data.

This change also removes the now obsolete permission INSTALL_LOCATION_COLLECTOR.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-21 11:28:20 -04:00
Android (Google) Code Review
db79edc5dc Merge change 2168 into donut
* changes:
  Fix permission hole in camera service. Some debugging code was added to CameraService::onTransact() method during development. Later on the entire onTransact() method was #ifdef'd out, which inadvertently omitted the permissions check code. This change restores the code.
2009-05-21 07:55:39 -07:00
Android (Google) Code Review
3343af5fdb Merge change 1863 into donut
* changes:
  Center the progress message for GoogleWebContentHelper (bug #1548858).
2009-05-21 04:43:31 -07:00
Android (Google) Code Review
cd7bd8cd81 am f9c7d9a7: Merge change 2147 into donut
Merge commit 'f9c7d9a75b2355d8ad8282d9b4cf817c77ea8b10'

* commit 'f9c7d9a75b2355d8ad8282d9b4cf817c77ea8b10':
  Add support to SuggestionsAdapter to query the 'working' status
2009-05-20 22:44:21 -07:00
Android (Google) Code Review
183baba8d1 am c1c82509: Merge change 2163 into donut
Merge commit 'c1c82509fb78403a969040cf057a66cbe3bfa538'

* commit 'c1c82509fb78403a969040cf057a66cbe3bfa538':
  Fix permission hole for RECORD_AUDIO created when we moved the MediaRecorder
2009-05-20 22:44:17 -07:00
Android (Google) Code Review
931eb39552 am bb7b7b31: Merge change 2152 into donut
Merge commit 'bb7b7b316a6a15f4df6af3c62a293920c68c7b00'

* commit 'bb7b7b316a6a15f4df6af3c62a293920c68c7b00':
  make sure to fail to software when the h/w renderer cannot be initialized
2009-05-20 22:44:06 -07:00
The Android Open Source Project
bb59a9f428 Merge commit 'f479aa0900e9a85afdc78b1048684e37579ebf23'
Conflicts:
	api/current.xml
	core/res/res/values/public.xml
2009-05-20 22:41:10 -07:00
Android (Google) Code Review
f9c7d9a75b Merge change 2147 into donut
* changes:
  Add support to SuggestionsAdapter to query the 'working' status of its underlying cursor and update a spinner in the search dialog accordingly.
2009-05-20 20:34:49 -07:00
Dave Sparks
b1f3b8f7cb Fix permission hole in camera service. Some debugging code was added
to CameraService::onTransact() method during development. Later on
the entire onTransact() method was #ifdef'd out, which inadvertently
omitted the permissions check code. This change restores the code.
2009-05-20 20:02:59 -07:00
Android (Google) Code Review
c1c82509fb Merge change 2163 into donut
* changes:
  Fix permission hole for RECORD_AUDIO created when we moved the MediaRecorder implementation to the mediaserver process. The permission check was previously enforced only at the AudioRecord binder interface for clients not in the same process. This change adds an additional check when the client tries to set the audio source. Bug 1868334
2009-05-20 19:57:12 -07:00
Dave Sparks
6690dc5454 Fix permission hole for RECORD_AUDIO created when we moved the MediaRecorder
implementation to the mediaserver process. The permission check was previously
enforced only at the AudioRecord binder interface for clients not in the same
process. This change adds an additional check when the client tries to set
the audio source.
Bug 1868334
2009-05-20 19:20:31 -07:00
Android (Google) Code Review
bb7b7b316a Merge change 2152 into donut
* changes:
  make sure to fail to software when the h/w renderer cannot be initialized
2009-05-20 18:00:01 -07:00
Mathias Agopian
16da7959a0 make sure to fail to software when the h/w renderer cannot be initialized 2009-05-20 17:58:36 -07:00
Romain Guy
d6154db472 am 7269d9ac: Tweak the Gestures Overlay demo. This shortens the fade duration to make it more usable and also adds a longer pause before the fade. This change also introduce a new compile-time setting to decide whether or not the overlay should steal the events from the underlying ListView. It is now off by default, per discussion with hackbod. It feel a little bit better but it may vary from user to user so studies will be necessary.
Merge commit '7269d9ac10d4c6ed5086b9f5677821e8d4382390'

* commit '7269d9ac10d4c6ed5086b9f5677821e8d4382390':
  Tweak the Gestures Overlay demo. This shortens the fade duration to make it more usable and also adds a longer pause before the fade. This change also introduce a new compile-time setting to decide whether or not the overlay should steal the events from the underlying ListView. It is now off by default, per discussion with hackbod. It feel a little bit better but it may vary from user to user so studies will be necessary.
2009-05-20 17:36:03 -07:00
The Android Open Source Project
3df6270d45 Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-05-20 17:34:17 -07:00
Mike LeBeau
1480eb27f5 Add support to SuggestionsAdapter to query the 'working' status
of its underlying cursor and update a spinner in the search dialog
accordingly.
2009-05-20 17:22:13 -07:00
Android (Google) Code Review
db2b8015a9 Merge change 2138 into donut
* changes:
  Add padding to public.xml to avoid breaking from auto-merges.
2009-05-20 17:06:48 -07:00
Romain Guy
7269d9ac10 Tweak the Gestures Overlay demo. This shortens the fade duration to make it more usable and also adds a longer pause before the fade. This change also introduce a new compile-time setting to decide whether or not the overlay should steal the events from the underlying ListView. It is now off by default, per discussion with hackbod. It feel a little bit better but it may vary from user to user so studies will be necessary. 2009-05-20 16:58:44 -07:00
Dianne Hackborn
f479aa0900 Add padding to public.xml to avoid breaking from auto-merges. 2009-05-20 16:30:59 -07:00
Android (Google) Code Review
1854d7fc79 am b204d4f1: Merge change 2136 into donut
Merge commit 'b204d4f12773ec67c7f0ded41cb111018f154476'

* commit 'b204d4f12773ec67c7f0ded41cb111018f154476':
  First pass at cleaning up the gestures code.
2009-05-20 16:14:18 -07:00
Android (Google) Code Review
8fe20fc21e am aa983388: Merge change 1932 into donut
Merge commit 'aa9833885d89d42a0cd0b4202485e67b63d51412'

* commit 'aa9833885d89d42a0cd0b4202485e67b63d51412':
  Qualify a type and add some explanatory comments.
2009-05-20 16:14:16 -07:00
Android (Google) Code Review
d9832c8ee8 am 009b32dc: Merge change 2109 into donut
Merge commit '009b32dc8b9c32160e02a63b60636854f0ceb86f'

* commit '009b32dc8b9c32160e02a63b60636854f0ceb86f':
  Add option for gtalk stream compression
2009-05-20 16:14:13 -07:00
Romain Guy
190ca2a578 am a6cd4e03: Fix NPE at boot.
Merge commit 'a6cd4e03e6bde0c4b76ad7290eb2c527398478d1'

* commit 'a6cd4e03e6bde0c4b76ad7290eb2c527398478d1':
  Fix NPE at boot.
2009-05-20 16:14:08 -07:00
The Android Open Source Project
15b5b8b87e Merge commit 'fe0daa7da8608fd83c580ee62240463b5b84afde' 2009-05-20 16:12:27 -07:00
Android (Google) Code Review
b204d4f127 Merge change 2136 into donut
* changes:
  First pass at cleaning up the gestures code.
2009-05-20 15:37:45 -07:00
Android (Google) Code Review
aa9833885d Merge change 1932 into donut
* changes:
  Qualify a type and add some explanatory comments.
2009-05-20 15:28:36 -07:00
Nick Pelly
f5e17310d1 Remove Database.java API.
This provided SDP functionality to Java, but is not currently used by any Apps.

I will shortly be providing SDP functionality in a new API, but it will be
quite different to this one, and in the mean-time keeping this stale code
updated with other API changes is a pain.
2009-05-20 15:24:14 -07:00
Android (Google) Code Review
009b32dc8b Merge change 2109 into donut
* changes:
  Add option for gtalk stream compression
2009-05-20 15:22:02 -07:00
Romain Guy
c534727972 First pass at cleaning up the gestures code. 2009-05-20 15:10:45 -07:00
Romain Guy
a6cd4e03e6 Fix NPE at boot. 2009-05-20 15:09:21 -07:00
Android (Google) Code Review
fe0daa7da8 Merge change 2115 into donut
* changes:
  bring the native_handle stuff back from master_gl
2009-05-20 15:00:24 -07:00
Mathias Agopian
9890815e42 bring the native_handle stuff back from master_gl 2009-05-20 14:33:23 -07:00
Joe Onorato
57ee738a51 am 5595a937: this might fix the build
Merge commit '5595a93722cc440cee712a73b268c9f61399d876'

* commit '5595a93722cc440cee712a73b268c9f61399d876':
  this might fix the build
2009-05-20 14:21:14 -07:00
Joe Onorato
5595a93722 this might fix the build 2009-05-20 14:18:11 -07:00
Android (Google) Code Review
0376fe43e6 am 2d10ba33: Merge change 2111 into donut
Merge commit '2d10ba33190c2ff1b24d6c48dd621c55a25bf2cc'

* commit '2d10ba33190c2ff1b24d6c48dd621c55a25bf2cc':
  GPS: Add support for forcing NTP time and XTRA data injection.
2009-05-20 14:11:34 -07:00
Android (Google) Code Review
2d10ba3319 Merge change 2111 into donut
* changes:
  GPS: Add support for forcing NTP time and XTRA data injection.
2009-05-20 14:00:24 -07:00
Mike Lockwood
93bc44d721 GPS: Add support for forcing NTP time and XTRA data injection.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-05-20 16:58:22 -04:00
Dianne Hackborn
9d248d4ab4 am d62ad4f1: Fix issue #1859814: Add android.os.Build.MANUFACTURER
Merge commit 'd62ad4f120e92fd597f44caf125ac853ac0ea11c'

* commit 'd62ad4f120e92fd597f44caf125ac853ac0ea11c':
  Fix issue #1859814: Add android.os.Build.MANUFACTURER
2009-05-20 13:26:02 -07:00
Dianne Hackborn
d62ad4f120 Fix issue #1859814: Add android.os.Build.MANUFACTURER 2009-05-20 13:21:59 -07:00
Android (Google) Code Review
1f7f391af2 am 4174e268: Merge change 2094 into donut
Merge commit '4174e2682f4eb6ea35c84e35810312967ea7e233'

* commit '4174e2682f4eb6ea35c84e35810312967ea7e233':
  Fixes #1866819.\nTextView sets the bounds of its compound drawables to contain only the width and the height of the drawables. This causes View.invalidateDrawable() to invalidate the compound drawables at location (0, 0) within the view, thus invalidating the wrong part of the View. This prevents animation from running correctly when using animated drawable. This change overrides invalidateDrawable() in TextView to take into account the real position of the compound drawable.
2009-05-20 13:15:11 -07:00
Android (Google) Code Review
4174e2682f Merge change 2094 into donut
* changes:
  Fixes #1866819.\nTextView sets the bounds of its compound drawables to contain only the width and the height of the drawables. This causes View.invalidateDrawable() to invalidate the compound drawables at location (0, 0) within the view, thus invalidating the wrong part of the View. This prevents animation from running correctly when using animated drawable. This change overrides invalidateDrawable() in TextView to take into account the real position of the compound drawable.
2009-05-20 13:13:42 -07:00
Costin Manolache
b84905662f Add option for gtalk stream compression 2009-05-20 13:12:36 -07:00
Wei Huang
0ba58de236 handle OTR messages by storing them in an in-memory table; remove groupchat message urls since we can get to messages by thread ids. 2009-05-20 13:07:37 -07:00
Android (Google) Code Review
3fb0640428 am f209b46c: Merge change 2092 into donut
Merge commit 'f209b46c52dc25fbd2c08b14824de9845cc64b07'

* commit 'f209b46c52dc25fbd2c08b14824de9845cc64b07':
  Make sure smsHeader != null before using it.
2009-05-20 13:02:17 -07:00