4051 Commits

Author SHA1 Message Date
Wu-cheng Li
1dc8267389 am 962f2536: Merge change I547cff66 into eclair
Merge commit '962f253665e0c5cc8a29de9e59ce3992dad02440' into eclair-plus-aosp

* commit '962f253665e0c5cc8a29de9e59ce3992dad02440':
  Add zoom functions and sendCommand.
2009-10-07 11:56:00 -07:00
Fred Quintana
dac0f7d1cd am f83d9b3f: fix build breakage
Merge commit 'f83d9b3fcd74f2528b0acc74185d2d7bdd716942' into eclair-plus-aosp

* commit 'f83d9b3fcd74f2528b0acc74185d2d7bdd716942':
  fix build breakage
2009-10-07 11:55:53 -07:00
Fred Quintana
6c0af3b245 am 5bba632d: - hide Entity and all its references - remove updateEntity and insertEntity, since they are not used - add the RawContacts.Entity class, which is used in lieu of the android.content.Entity
Merge commit '5bba632d877c2878384ff21566c8eb6a1a22f37b' into eclair-plus-aosp

* commit '5bba632d877c2878384ff21566c8eb6a1a22f37b':
  - hide Entity and all its references
2009-10-07 11:55:10 -07:00
Suchi Amalapurapu
1d16200eef am 5163cd6d: Merge change I5be3d603 into eclair
Merge commit '5163cd6d1cb664977eb4473b98657c7e92ae430e' into eclair-plus-aosp

* commit '5163cd6d1cb664977eb4473b98657c7e92ae430e':
  Make sdk version and code names static finals in PackageParser.
2009-10-07 11:54:44 -07:00
Daisuke Miyakawa
b7ea469968 am ccc214b2: Merge change I6a0b14bd into eclair
Merge commit 'ccc214b21edaaddf46960388ec4d3e3ca89a01ae' into eclair-plus-aosp

* commit 'ccc214b21edaaddf46960388ec4d3e3ca89a01ae':
  Make VCardComposer create the instance for mHandlerList.
2009-10-07 11:53:53 -07:00
Nick Pelly
4bf3a6eafc am 52cde727: Fix docs builds.
Merge commit '52cde7279bad58285704498eea57bdaf9e595b49' into eclair-plus-aosp

* commit '52cde7279bad58285704498eea57bdaf9e595b49':
  Fix docs builds.
2009-10-07 11:51:54 -07:00
Nick Pelly
f867c8ad59 am 24bb9b8a: Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
Merge commit '24bb9b8af4ff691538fe9e517e8156016b0da6cd' into eclair-plus-aosp

* commit '24bb9b8af4ff691538fe9e517e8156016b0da6cd':
  Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
2009-10-07 11:51:42 -07:00
Fred Quintana
657d919df7 am 5fbaefc3: Merge change I4db3a5b3 into eclair
Merge commit '5fbaefc3d8840aac12b16458347b3c1ddbdaf542' into eclair-plus-aosp

* commit '5fbaefc3d8840aac12b16458347b3c1ddbdaf542':
  fix a javadoc build breakage
2009-10-07 11:49:56 -07:00
Dianne Hackborn
ae9fc51765 am 68d881cf: Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Merge commit '68d881cf2d2b252f6f795cd64d43e316a1d736e5' into eclair-plus-aosp

* commit '68d881cf2d2b252f6f795cd64d43e316a1d736e5':
  Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
2009-10-07 11:49:01 -07:00
Romain Guy
3eef8ad0cd am 89c76843: Merge change I9b771df3 into eclair
Merge commit '89c768435fc48a93c0af97f9f08e57a346b0a9fd' into eclair-plus-aosp

* commit '89c768435fc48a93c0af97f9f08e57a346b0a9fd':
  Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
2009-10-07 11:48:44 -07:00
Fred Quintana
9c5fe299c1 am 24f32b32: Merge change I89c40f50 into eclair
Merge commit '24f32b32f96eab8645a3ccf429c3d5694d2134ad' into eclair-plus-aosp

* commit '24f32b32f96eab8645a3ccf429c3d5694d2134ad':
  fix a javadoc build breakage
2009-10-07 11:48:03 -07:00
Bjorn Bringert
bfc4edeb01 am 9e4c8561: Merge change I8d48149c into eclair
Merge commit '9e4c85614c861f095131ffa76e65cbba55d03d0a' into eclair-plus-aosp

* commit '9e4c85614c861f095131ffa76e65cbba55d03d0a':
  Don't reinflate search bar when dialog is already showing
2009-10-07 11:47:28 -07:00
Fred Quintana
1eeca92910 am f7ae77cd: account manager api review changes
Merge commit 'f7ae77cd67f1a3993b8e56c1af4720a7adf4e69d' into eclair-plus-aosp

* commit 'f7ae77cd67f1a3993b8e56c1af4720a7adf4e69d':
  account manager api review changes
2009-10-07 11:46:24 -07:00
Dianne Hackborn
031e4ac7dd am 48e6725c: Merge change Iaca22686 into eclair
Merge commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f' into eclair-plus-aosp

* commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f':
  Work on issue #2163789: Way too much logging
2009-10-07 11:44:12 -07:00
Wei Huang
d08049b3d8 am 6b370745: bug 2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
Merge commit '6b3707452c5921c89258371eec140b0fb76766f8' into eclair-plus-aosp

* commit '6b3707452c5921c89258371eec140b0fb76766f8':
  bug 2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
2009-10-07 11:39:59 -07:00
David Brown
9405af7e50 am 88e03757: RotarySelector widget: add callback for "grabbed" state changes.
Merge commit '88e037577f7db140e4ef88b77eefaa910e06e5f5' into eclair-plus-aosp

* commit '88e037577f7db140e4ef88b77eefaa910e06e5f5':
  RotarySelector widget: add callback for "grabbed" state changes.
2009-10-07 11:37:40 -07:00
Android (Google) Code Review
962f253665 Merge change I547cff66 into eclair
* changes:
  Add zoom functions and sendCommand.
2009-10-06 16:32:44 -04:00
Wu-cheng Li
36f68b8f24 Add zoom functions and sendCommand.
b2060030
2009-10-06 13:25:10 -07:00
Fred Quintana
f83d9b3fcd fix build breakage 2009-10-06 13:21:23 -07:00
Fred Quintana
5bba632d87 - hide Entity and all its references
- remove updateEntity and insertEntity, since they are not
  used
- add the RawContacts.Entity class, which is used in lieu of the
  android.content.Entity
2009-10-06 11:51:19 -07:00
Android (Google) Code Review
5163cd6d1c Merge change I5be3d603 into eclair
* changes:
      Make sdk version and code names static finals in PackageParser.     Remove api to set these values.     Remove an unused method in AppSecurityPermissions
2009-10-06 14:36:43 -04:00
Suchi Amalapurapu
8d5ae98549 Make sdk version and code names static finals in PackageParser.
Remove api to set these values.
    Remove an unused method in AppSecurityPermissions
2009-10-06 10:29:06 -07:00
Daisuke Miyakawa
0dd32c1b27 Make VCardComposer create the instance for mHandlerList.
Previously the creation was delayed until addHandler(), which
had been required to be called.

However, after VCardComoser's support toward PBAP stuffs,
the guarantee was not true any more.

So by creating the instance in constructor, we refrain NPE during
finalize() when PBAP uses VCardComposer.
2009-10-06 09:30:20 -07:00
Nick Pelly
52cde7279b Fix docs builds. 2009-10-06 16:10:02 +02:00
Nick Pelly
24bb9b8af4 Provide an API for apps to use a dynamic RFCOMM channel and SDP record.
Hide listenUsingRfcommOn(int channel)
Add listenUsingRfcomm(String name, ParcelUuid uuid)

The new API automatically finds a free RFCOMM channel and registers an SDP
record with the given uuid and name. The SDP record is automatically
removed when the socket is closed, or if the application dies.

Apps are prevented from registering SDP records with the uuid of system
Bluetooth profiles, such as A2DP, HFP and OPP.

Apps are prevented from removing SDP records that they did not create. This is
tracked by pid.

TODO: Provide an API for the connecting app to look up an SDP record.

Bug: 2158900
DrNo: eastham
Joke: "What did the dog say to the tree? bark."
Change-Id: Ia92f51c34615a7270a403255ad2b8faa98c4a3f5
2009-10-06 05:57:50 -07:00
Android (Google) Code Review
5fbaefc3d8 Merge change I4db3a5b3 into eclair
* changes:
  fix a javadoc build breakage
2009-10-05 20:22:27 -04:00
Fred Quintana
4db3a5b327 fix a javadoc build breakage 2009-10-05 17:19:03 -07:00
Dianne Hackborn
68d881cf2d Fix issue #2166755: BroadcastReceiver trying to return result during a non-ordered broadcast
Tell the broadcast receiver whether it is getting an initial sticky value,
so it will be quiet about attempts to do ordered broadcast stuff.

Note that the original bug being reported was not actually a crash, just
an error log.  So all we are doing here is making the log quieter.

Change-Id: Iaf1b718d82093ec1197142410a64feff47eb3859
2009-10-05 15:52:32 -07:00
Android (Google) Code Review
89c768435f Merge change I9b771df3 into eclair
* changes:
  Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
2009-10-05 18:28:26 -04:00
Romain Guy
4b057801d5 Make sure AsyncTask sens a null result to onPostExecute() when cancelled.
This is in accordance to the documentation. This bug was approved by hackbod.
The change is safe and is a single line of code.

Change-Id: I9b771df3ae2aa4f496d15e6c43b677f3245539ac
2009-10-05 14:48:04 -07:00
Android (Google) Code Review
24f32b32f9 Merge change I89c40f50 into eclair
* changes:
  fix a javadoc build breakage
2009-10-05 17:23:13 -04:00
Fred Quintana
89c40f5034 fix a javadoc build breakage 2009-10-05 14:21:53 -07:00
Android (Google) Code Review
9e4c85614c Merge change I8d48149c into eclair
* changes:
  Don't reinflate search bar when dialog is already showing
2009-10-05 16:15:14 -04:00
Bjorn Bringert
11f09bb5cd Don't reinflate search bar when dialog is already showing
Change https://android-git.corp.google.com/g/27729 started reinflating
the entire search bar every time the search source was changed, to get
around problems with bad state in AutoCompleteTextView
(http://b/issue?id=2132686). This had some side-effects if the
search dialog was already visible, as it is when selecting a
source in "More results" or when presing the search key to go to
QSB from in-app search.

This change changes the reinflation to only happen if the dialog is
not already showing.

Fixes:

http://b/issue?id=2166640
"After selecting More results from suggestions, the search box is no longer visible."

http://b/issue?id=2166675
"Calling QSB with the hardware key does not place focus in the search tab."

http://b/issue?id=2166712
"back key has unexpected behaviour in QSB after selecting "More results" from suggestions."

Change-Id: I8d48149c3e9ad97ec11c49ec7efb356f27dfe4f6
2009-10-05 21:00:53 +01:00
Fred Quintana
f7ae77cd67 account manager api review changes 2009-10-05 11:19:49 -07:00
Dianne Hackborn
bd0a81ff1c Work on issue #2163789: Way too much logging
Dr.No from mcleron.

Change-Id: Iaca2268684f83fe8757e64db0b0e047a19755311
2009-10-04 14:48:47 -07:00
Wei Huang
6b3707452c bug 2161715: add the .jpg extension to the temp sdcard image file name so MMS can read the JPEG data using a file uri.
Change-Id: I1453950e406f1991e78530795ed28e6b4a7cf8c6
2009-10-02 11:52:40 -07:00
David Brown
88e037577f RotarySelector widget: add callback for "grabbed" state changes.
This is the frameworks/base part of the fix for Bug 2158434: add a new
callback to the OnDialTriggerListener interface, so the RotarySelector can
tell the app about state changes between NOTHING_GRABBED and
LEFT_HANDLE_GRABBED and RIGHT_HANDLE_GRABBED.

BUG=2158434
DRNO=timsullivan

TESTED=regular incoming calls, call waiting calls, answering a call,
       rejecting a call.  Also verified I didn't affect the
       lock screen at all.
2009-10-02 00:30:08 -07:00
Marco Nelissen
88be4cb5ee am 9b150b74: Close the cursor before assigning a new one to the same variable.
Merge commit '9b150b74573ce506abd00c692fb42f46980441a3' into eclair-plus-aosp

* commit '9b150b74573ce506abd00c692fb42f46980441a3':
  Close the cursor before assigning a new one to the same variable.
2009-10-01 08:36:00 -07:00
Marco Nelissen
9b150b7457 Close the cursor before assigning a new one to the same variable. 2009-10-01 08:16:02 -07:00
Michael Chan
50bd2992b1 am 5a463a69: Merge change Ic2a16d4f into eclair
Merge commit '5a463a693cae501f3e65936ea96e1ca1bae5fc3f' into eclair-plus-aosp

* commit '5a463a693cae501f3e65936ea96e1ca1bae5fc3f':
  b/2148252 Fix emulator
2009-10-01 08:00:16 -07:00
Android (Google) Code Review
5a463a693c Merge change Ic2a16d4f into eclair
* changes:
  b/2148252 Fix emulator
2009-10-01 10:52:01 -04:00
Jeff Sharkey
b28e9c9ebe am c00099ef: Change intent flags for launching FastTrack.
Merge commit 'c00099ef62fc496429d0a06e580b600f61304f9c' into eclair-plus-aosp

* commit 'c00099ef62fc496429d0a06e580b600f61304f9c':
  Change intent flags for launching FastTrack.
2009-10-01 05:44:33 -07:00
Jeff Sharkey
c00099ef62 Change intent flags for launching FastTrack. 2009-10-01 05:35:59 -07:00
Bjorn Bringert
51654b562b am a6309c30: On BACK in search, hide just IME if IME is fullscreen
Merge commit 'a6309c30722ad3aee88ddc2394cea2a499168d99' into eclair-plus-aosp

* commit 'a6309c30722ad3aee88ddc2394cea2a499168d99':
  On BACK in search, hide just IME if IME is fullscreen
2009-10-01 03:02:48 -07:00
Bjorn Bringert
a6309c3072 On BACK in search, hide just IME if IME is fullscreen
Since a fullscreen IME covers the entire search dialog, there was
no discoverable way to get back to the search dialog.
Now, on BACK presses when the IME is fullscreen (e.g. in landscape
mode without hard keyboard), we dismiss only the IME.
A second BACK press will dismiss the search dialog.

Fixes http://b/issue?id=2159132

Change-Id: I8e5736d83d7c35936a718929017ea04c6214700b
2009-10-01 10:56:19 +01:00
Bjorn Bringert
38325cb2d9 am 95c98dd5: Merge change Ie69a9c0a into eclair
Merge commit '95c98dd5fd5920933231c424ff53f91adeee9503' into eclair-plus-aosp

* commit '95c98dd5fd5920933231c424ff53f91adeee9503':
  Remove globalSearch argument from triggerSearch()
2009-10-01 02:20:02 -07:00
Bjorn Bringert
b782a2f4f0 Remove globalSearch argument from triggerSearch()
API council says:

"In reviewing the new triggerSearch API, we are concerned that
applications could use the option to perform a global search to spam
the user with frequent searches.  We would like the global search
option to be removed for now (not just hidden, but removed from the
internal IPC API so that nobody can find this and abuse it).  The rest
of the API should be fine as long as it is restricted to local
searches."

Fixes http://b/editIssue?id=2158785

Change-Id: Ie69a9c0ab6373cc4427aab50606885bdede40585
2009-10-01 09:57:33 +01:00
Grace Kloba
ad43343012 am 00f60363: Merge change I2919f492 into eclair
Merge commit '00f603635d4cec4403687d8ee97aced91fb32108' into eclair-plus-aosp

* commit '00f603635d4cec4403687d8ee97aced91fb32108':
  remove cert for SampleBrowserPlugin and only check
2009-09-30 23:42:46 -07:00
Dianne Hackborn
41829e0138 am e88846ee: Semi-workaround for #2027266: app drawer showing up on the side of the screen
Merge commit 'e88846eeaf70f9f4299af9e3d54ba5dacede42b6' into eclair-plus-aosp

* commit 'e88846eeaf70f9f4299af9e3d54ba5dacede42b6':
  Semi-workaround for #2027266: app drawer showing up on the side of the screen
2009-09-30 23:42:37 -07:00