Commit Graph

374 Commits

Author SHA1 Message Date
The Android Open Source Project
8f080ec429 am f3ccf8a: Merge branch \'readonly-p4-donut\' into donut 2009-04-29 13:34:51 -07:00
Android (Google) Code Review
137b0c9d64 am 0b8ffd1: Merge change 460 into donut
Merge commit '0b8ffd17bc6641fc522db3e842a868b6cdbf6d82'

* commit '0b8ffd17bc6641fc522db3e842a868b6cdbf6d82':
  More optimization of dumpsys output.
2009-04-29 13:11:27 -07:00
Patrick Scott
e82dc42052 Parse the base64 data before creating the data stream.
This will ensure that we do not parse the data in chunks when passing it to the
LoadListener. Decoding in chunks can lead to incomplete sequences which will
lead to a failed decode.

Check for a cancelled LoadListener in StreamLoader and stop the load. This is
just a shortcut for downloaded or failed resources.

Cleanup some of the LoadListener code around resetting a few member variables.
Reset them in the status callback since that indicates a new response from the
server (or StreamLoader).
2009-04-29 14:11:27 -04:00
Android (Google) Code Review
42fba356cf Merge change 331
* changes:
  Add option for gtalk stream compression
2009-04-28 15:36:33 -07:00
Leon Scroggins
2ca912ec13 Lazily initialize the TextDialog. 2009-04-28 17:18:57 -04:00
Android (Google) Code Review
190b75733c Merge change 611
* changes:
  change the IsolatedContext to have a test version of the AccountManager that has no IBinder to the AccountManagerService.
2009-04-28 10:56:48 -07:00
Patrick Scott
f0c70a8356 Treat application/xhtml+xml as xhtml+xml instead of text/html.
Previously we had converted application/xhtml+xml to text/html because of bad
server data. Now we need to treat xhtml as xhtml to get svg to be interpreted
correctly.
2009-04-28 11:47:11 -04:00
Fred Quintana
0eabf0228a change the IsolatedContext to have a test version of the AccountManager that has no IBinder to the AccountManagerService. 2009-04-27 15:08:17 -07:00
Patrick Scott
135e24c294 Add '_' to the allowable characters in a host name.
This does not fix the underscore problem in host names but it moves it from a
Browser issue to a libc issue.
2009-04-27 16:33:36 -04:00
Android (Google) Code Review
d004ee1b0a Merge change 497
* changes:
  change the sync framework and users to understand Account
2009-04-24 12:23:57 -07:00
Cary Clark
bc2e33b5c8 don't swap out the history picture too soon
Wait until either the picture is not blank or
the progress is complete.
2009-04-24 10:43:02 -04:00
Karl Rosaen
f3ccf8a5a5 Merge branch 'readonly-p4-donut' into donut 2009-04-23 19:01:36 -07:00
Karl Rosaen
875d50a4b9 AI 147564: Merge back from search branch to donut. Notes:
- all public apis and framework changes have been reviewed by relevant folks in our branch (e.g romainguy)
  - all new public apis are @hidden; they will still get reviewed by api council once we're in git
  - other than that, it's mostly GlobalSearch and search dialog stuff, a new apps provider, and some tweaks
  to the contacts provider that was reviewed by jham

Automated import of CL 147564
2009-04-23 19:00:21 -07:00
Fred Quintana
d9d2f1140b change the sync framework and users to understand Account 2009-04-23 15:37:45 -07:00
Cary Clark
843bbb8597 reset select/copy state if key is pressed while shift is down
If a webpage suppresses keys from getting echoed back to the
browser app, then also disable select/copy when a key follows
a shift key press.

Also add in missing debug string to permit debug builds.
2009-04-23 10:40:28 -04:00
Android (Google) Code Review
0b8ffd17bc Merge change 460 into donut
* changes:
  More optimization of dumpsys output.
2009-04-22 18:33:57 -07:00
Dianne Hackborn
1d442e0d99 More optimization of dumpsys output.
There are three major classes of changes here:

- Avoid writing lines where their values are often empty, false, or some other typical thing.
- Use partial writes to the PrintWriter to avoid creating temporary strings.
- Use StringBuilder where we need to generate real String objects (and where possible cache the result).
2009-04-22 18:03:21 -07:00
Jean-Baptiste Queru
74008f608a Merge donut into master 2009-04-22 17:12:34 -07:00
Wu-cheng Li
ab5b424db3 Remove debug messages.
modified:   core/java/android/hardware/Camera.java

	modified:   camera/libcameraservice/CameraService.cpp
2009-04-22 16:22:01 +08:00
Jeff Hamilton
69c1c4983f Merge branch 'readonly-p4-master' 2009-04-21 15:17:40 -07:00
Jeff Hamilton
b0c6dbd53b AI 147255: am: CL 147253 am: CL 147250 Fix a nasty typo in the docs for ContentResolver.update(). No code changes.
Original author: jham
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 147255
2009-04-21 15:16:13 -07:00
Jeff Hamilton
be456ac934 Merge branch 'readonly-p4-donut' into donut 2009-04-21 15:14:41 -07:00
Jeff Hamilton
348c1796d4 AI 147253: am: CL 147250 Fix a nasty typo in the docs for ContentResolver.update(). No code changes.
Original author: jham
  Merged from: //branches/cupcake/...

Automated import of CL 147253
2009-04-21 15:13:18 -07:00
Andy Stadler
108ba992b2 Merge branch 'readonly-p4-master' 2009-04-21 11:58:49 -07:00
Andy Stadler
a0cce9b120 AI 147170: am: CL 147168 am: CL 147163 Copy documentation for the various search-by-voice flags that
were already listed in attrs.xml into SearchManager.java.  Add
  a (brief - no time for more) description about how to add search
  by voice to apps.
  JAVADOC ONLY - should be safe change for cupcake sdk.
  Original author: stadler
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 147170
2009-04-21 11:57:29 -07:00
Andy Stadler
407784ccac Merge branch 'readonly-p4-donut' into donut 2009-04-21 11:56:08 -07:00
Andy Stadler
e9948b27a0 Merge branch 'readonly-p4-master' 2009-04-21 11:55:49 -07:00
Andy Stadler
4c156ec6ec AI 147168: am: CL 147163 Copy documentation for the various search-by-voice flags that
were already listed in attrs.xml into SearchManager.java.  Add
  a (brief - no time for more) description about how to add search
  by voice to apps.
  JAVADOC ONLY - should be safe change for cupcake sdk.
  Original author: stadler
  Merged from: //branches/cupcake/...

Automated import of CL 147168
2009-04-21 11:54:45 -07:00
Andy Stadler
72d5de71f2 AI 147169: am: CL 147167 am: CL 147162 Emphasize in the javadoc that the "pkg" parameters to
InstrumentationTestCase and its descendants should be the
  package manager package name (not the java package name, and
  not the test package) of the package holding the Activity
  under test.
  Added similar notations to the ApiDemos call sites.
  JAVADOC ONLY - should be safe change for cupcake sdk.
  Original author: stadler
  Merged from: //branches/cupcake/...
  Original author: android-build

Automated import of CL 147169
2009-04-21 11:54:14 -07:00
Andy Stadler
080b195a05 Merge branch 'readonly-p4-donut' into donut 2009-04-21 11:53:07 -07:00
Andy Stadler
df2a463b01 AI 147167: am: CL 147162 Emphasize in the javadoc that the "pkg" parameters to
InstrumentationTestCase and its descendants should be the
  package manager package name (not the java package name, and
  not the test package) of the package holding the Activity
  under test.
  Added similar notations to the ApiDemos call sites.
  JAVADOC ONLY - should be safe change for cupcake sdk.
  Original author: stadler
  Merged from: //branches/cupcake/...

Automated import of CL 147167
2009-04-21 11:51:43 -07:00
Andreas Huber
0de7dcd126 Ensure ongoing progress updates after using the scroll ball to adjust position.
We use a single outstanding message of type SHOW_PROGRESS to refresh the progress
bar's current position as well as textual display of time and duration. This message
could get lost if the scroll ball was used to adjust the current playback position as
we entered state "mDragging" which would cause the subsequent SHOW_PROGRESS message
to be a no-op and would also cause it to not be re-enqueued.
The change refactors the seekbar logic a little and makes sure that while dragging
there isn't a pending SHOW_PROGRESS message in the queue and once dragging is over,
exactly one SHOW_PROGRESS message is reenqueued.

related to bug 1721227
2009-04-20 16:56:04 -07:00
Fred Quintana
3326920329 adding concept of features to accounts 2009-04-20 16:06:02 -07:00
Android (Google) Code Review
24a4320f9c Merge change 261
* changes:
  Enable Application Caches.
2009-04-20 10:04:34 -07:00
Andrei Popescu
60a9a7d055 Enable Application Caches. 2009-04-20 14:23:58 +01:00
Evan Millar
ac9fd3e423 Merge branch 'readonly-p4-master' 2009-04-18 23:36:20 -07:00
Evan Millar
74e258d63e AI 146854: am: CL 146853 Add kernel wakelock data to batteryinfo dump.
Original author: emillar

Automated import of CL 146854
2009-04-18 23:35:03 -07:00
Brandon Ballinger
cd63c7f89a Merge branch 'readonly-p4-master' 2009-04-18 22:05:19 -07:00
Brandon Ballinger
f1bb004cda AI 146615: am: CL 146613 Move Recognition service declarations to frameworks/base/core/java/android/speech. Hide them from public API by default (no changes to current.xml).
Original author: brandonb

Automated import of CL 146615
2009-04-18 22:04:01 -07:00
Evan Millar
4482d8c8e4 Merge branch 'readonly-p4-donut' into donut 2009-04-18 12:27:51 -07:00
Evan Millar
c64edde69d AI 146853: Add kernel wakelock data to batteryinfo dump.
BUG=1755458

Automated import of CL 146853
2009-04-18 12:26:32 -07:00
Costin Manolache
f967afde2e Add option for gtalk stream compression 2009-04-17 17:37:29 -07:00
Android (Google) Code Review
7bec074f25 Merge change 164
* changes:
  Use lower case mime type, encoding, and transfer encoding.
2009-04-17 05:26:25 -07:00
Patrick Scott
2563ed8f70 Use lower case mime type, encoding, and transfer encoding. 2009-04-17 08:23:07 -04:00
Brandon Ballinger
3385e728d8 Merge branch 'readonly-p4-donut' into donut 2009-04-16 14:33:04 -07:00
Brandon Ballinger
181a44dd81 AI 146613: Move Recognition service declarations to frameworks/base/core/java/android/speech. Hide them from public API by default (no changes to current.xml).
Automated import of CL 146613
2009-04-16 14:31:48 -07:00
Android (Google) Code Review
7a430cf152 Merge change 195
* changes:
  Make webkit's cursor draw at the correct times.
2009-04-16 06:21:10 -07:00
Leon Scroggins
63dda1c7b4 Make webkit's cursor draw at the correct times.
This change is dependent on another change to external/webkit.  Tell the WebViewCore to change its FocusController's "active" status depending upon whether the WebView has focus.  This fixes a bug where we were showing the blinking cursor when the WebView was not in focus.
2009-04-15 13:25:00 -04:00
Eric Shienbrood
51b0c74d8d Merge branch 'readonly-p4-master' 2009-04-14 15:41:38 -07:00
Eric Shienbrood
2ecc74f330 AI 146222: Manual merge of 145980 from donutburger => master.
Automated import of CL 146222
2009-04-14 15:40:20 -07:00