Commit Graph

4032 Commits

Author SHA1 Message Date
Grace Kloba
11782b9052 am 7fd7534b: Merge change I5101c2b1 into eclair-mr2
Merge commit '7fd7534b58b523851e932f8b1bde61532b738e8a' into eclair-mr2-plus-aosp

* commit '7fd7534b58b523851e932f8b1bde61532b738e8a':
  Extend the date time to handle the case where the
2009-10-05 13:03:34 -07:00
Android (Google) Code Review
7fd7534b58 Merge change I5101c2b1 into eclair-mr2
* changes:
  Extend the date time to handle the case where the month is in the full name.
2009-10-05 14:49:38 -04:00
Fred Quintana
fe9d00bc9c am bf13850b: am f7ae77cd: account manager api review changes
Merge commit 'bf13850bed17d994077d1e6226b6330dd960bf26' into eclair-mr2-plus-aosp

* commit 'bf13850bed17d994077d1e6226b6330dd960bf26':
  account manager api review changes
2009-10-05 11:46:07 -07:00
Fred Quintana
bf13850bed am f7ae77cd: account manager api review changes
Merge commit 'f7ae77cd67f1a3993b8e56c1af4720a7adf4e69d' into eclair-mr2

* commit 'f7ae77cd67f1a3993b8e56c1af4720a7adf4e69d':
  account manager api review changes
2009-10-05 11:34:43 -07:00
Fred Quintana
f7ae77cd67 account manager api review changes 2009-10-05 11:19:49 -07:00
Grace Kloba
5101c2b1f1 Extend the date time to handle the case where the
month is in the full name.

Fix http://b/issue?id=2164680
2009-10-05 10:56:39 -07:00
Patrick Scott
8e20e88ba6 Merge branch 'eclair-plus-aosp' of ssh://android-git.corp.google.com:29418/platform/frameworks/base into eclair-mr2-plus-aosp 2009-10-05 10:13:51 -07:00
Dianne Hackborn
492eb109ff am 48e6725c: Merge change Iaca22686 into eclair
Merge commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f' into eclair-mr2

* commit '48e6725c828a8d420d43925b0c9a9a915a8c4e2f':
  Work on issue #2163789: Way too much logging
2009-10-04 15:41:35 -07:00
Wei Huang
0200394a0d 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-mr2

* 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-04 15:19:08 -07:00
David Brown
fdc8c7826a am 88e03757: RotarySelector widget: add callback for "grabbed" state changes.
Merge commit '88e037577f7db140e4ef88b77eefaa910e06e5f5' into eclair-mr2

* commit '88e037577f7db140e4ef88b77eefaa910e06e5f5':
  RotarySelector widget: add callback for "grabbed" state changes.
2009-10-04 15:17:18 -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
Android (Google) Code Review
fde23e398e Merge change Ic66f68a7 into eclair-mr2
* changes:
  Fix a null pointer exception caught by the monkey.
2009-10-02 16:35:51 -04:00
Android (Google) Code Review
9eca703d08 Merge change I499a9541 into eclair-mr2
* changes:
  setupRedirect() can throw. Catch it and signal the error.
2009-10-02 16:28:11 -04:00
Leon Scroggins
c66f68a787 Fix a null pointer exception caught by the monkey.
Fix http://b/issue?id=2162334
2009-10-02 15:17:31 -04:00
Grace Kloba
499a954182 setupRedirect() can throw. Catch it and signal the error.
Fix http://b/issue?id=2163139
2009-10-02 12:17:25 -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
Patrick Scott
86806ce11a Process synchronous requests in the same RequestQueue.
Use a dedicated Connection to process a synchronous request using the main
RequestQueue and on the WebCore thread.

HttpConnection, HttpsConnection, Connection:
    No need for ConnectionManager, just pass the proxy host to
    HttpsConnection. In Connection.clearPipe, empty should be set to true if the
    RequestFeeder does _not_ have a request for the host. I don't think that
    broke anything but it is incorrect.
ConnectionThread:
    Refactor the proxy selection into ConnectionManager.getConnection
RequestHandle:
    Add a new constructor that takes a Connection argument. Add processRequest
    to process a single request on that Connection.
RequestQueue:
    Add determine host to select between the request's host and the proxy. Add
    queueSynchronousRequest to make a new request that operates on a private
    connection. Add SyncFeeder to handle RequestFeeder.requeueRequest if the
    request fails.
Network: Use the new RequestQueue api to handle a synchronous request.

Bug: 1315832
2009-10-02 14:51:55 -04: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
Romain Guy
18d1255ebe Prevents memory leaks by correctly detaching views in AbsListView.
AbsListView can reject views from the recycler's scrap heap but when that
happens the rejected view is not detached from the parent. This can be pretty
bad in the case of TextView since it prevents them from unregistering their
OnPreDrawListeners.
2009-10-01 15:39:42 -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
Android (Google) Code Review
00f603635d Merge change I2919f492 into eclair
* changes:
  remove cert for SampleBrowserPlugin and only check signature for the release build.
2009-10-01 02:37:18 -04:00
Dianne Hackborn
943c8e7de6 am 29e4a3c5: Update from API review.
Merge commit '29e4a3c566f435c32f0b95e4ac8e8b33cac6faba' into eclair-plus-aosp

* commit '29e4a3c566f435c32f0b95e4ac8e8b33cac6faba':
  Update from API review.
2009-09-30 23:27:41 -07:00
Dianne Hackborn
e88846eeaf Semi-workaround for #2027266: app drawer showing up on the side of the screen
(when booted while docked)

This isn't really a fix, but we now have the activity report the configuration
it actually launched in, so the activity manager will later adjust it if
needed.  Should help us recover from hitting the race in this particular case.

Change-Id: I3bb83a48c2d692b4cb1822d8ae7d924cfa9187b2
2009-09-30 23:25:53 -07:00
Jim Miller
d42a7152aa am d9b6f14a: Adjust opacity for inactive dimple in rotary widget
Merge commit 'd9b6f14a6926dce7ad3d98e6e30b503c69c904c0' into eclair-plus-aosp

* commit 'd9b6f14a6926dce7ad3d98e6e30b503c69c904c0':
  Adjust opacity for inactive dimple in rotary widget
2009-09-30 23:22:57 -07:00
Dianne Hackborn
29e4a3c566 Update from API review.
Change-Id: I16b1c566f91167aac9615ac59dd297a154c828ea
2009-09-30 23:21:02 -07:00
Jim Miller
d9b6f14a69 Adjust opacity for inactive dimple in rotary widget 2009-09-30 22:50:01 -07:00
Evan Millar
cbbfd38fc5 am 9901e38a: Merge change I7a39c564 into eclair
Merge commit '9901e38a962012d56accbc9b6259f9997bcd9c31' into eclair-plus-aosp

* commit '9901e38a962012d56accbc9b6259f9997bcd9c31':
  Fix docs error
2009-09-30 22:33:29 -07:00
Android (Google) Code Review
9901e38a96 Merge change I7a39c564 into eclair
* changes:
  Fix docs error
2009-10-01 01:27:16 -04:00
Evan Millar
772722e4b7 Fix docs error
Change-Id: I7a39c5643cf6351bac47ccafff37fd32a668b9f5
2009-09-30 22:24:07 -07:00
Robert Greenwalt
1412308467 am a1323c77: Merge change Iaf08eabc into eclair
Merge commit 'a1323c77b961ae1b9cfaf5305e05780b07e88226' into eclair-plus-aosp

* commit 'a1323c77b961ae1b9cfaf5305e05780b07e88226':
  Reduce the ConnectivityManager logging.
2009-09-30 22:18:54 -07:00
Ray Chen
a6715ca6f9 am f09edd60: Merge change Id60fa26a into eclair
Merge commit 'f09edd60376f6ad755ebaaf0c1f89f561f78468c' into eclair-plus-aosp

* commit 'f09edd60376f6ad755ebaaf0c1f89f561f78468c':
  Fix issue 2152541	thumbnail images stretched.
2009-09-30 22:18:41 -07:00
Android (Google) Code Review
a1323c77b9 Merge change Iaf08eabc into eclair
* changes:
  Reduce the ConnectivityManager logging.
2009-10-01 01:14:38 -04:00
Evan Millar
65114403bf am 5042f7ea: Unhide ContactsContract#QuickContact and fix sdk build
Merge commit '5042f7eae6baa6fa4f93248361e94eeb6894f90f' into eclair-plus-aosp

* commit '5042f7eae6baa6fa4f93248361e94eeb6894f90f':
  Unhide ContactsContract#QuickContact and fix sdk build
2009-09-30 22:13:29 -07:00
Android (Google) Code Review
f09edd6037 Merge change Id60fa26a into eclair
* changes:
  Fix issue 2152541	thumbnail images stretched.
2009-10-01 01:12:35 -04:00
Robert Greenwalt
1ef95f9eed Reduce the ConnectivityManager logging.
Same great info, just fewer chars.
2009-09-30 22:10:41 -07:00
Ray Chen
ef093cd6c4 Fix issue 2152541 thumbnail images stretched. 2009-09-30 22:05:33 -07:00
Grace Kloba
2919f49273 remove cert for SampleBrowserPlugin and only check
signature for the release build.
2009-09-30 21:52:56 -07:00
Evan Millar
5042f7eae6 Unhide ContactsContract#QuickContact and fix sdk build
Change-Id: I60fdeb6d0625996d76a10f0a623c9f474337758d
2009-09-30 21:49:02 -07:00
Grace Kloba
ff9af3f3ee am 9d33d953: Merge change I07729abd into eclair
Merge commit '9d33d953a04eb9288c8b842610baf24c164346aa' into eclair-plus-aosp

* commit '9d33d953a04eb9288c8b842610baf24c164346aa':
  Keep the scrollbar on during TOUCH_MOVE events even
2009-09-30 21:48:02 -07:00