Commit Graph

1161 Commits

Author SHA1 Message Date
Android (Google) Code Review
d7047b0ca1 am d6f9b9b: Merge change 529 into donut
Merge commit 'd6f9b9babae9b8ebf1fee8c98135b17e42c577f2'

* commit 'd6f9b9babae9b8ebf1fee8c98135b17e42c577f2':
  use gl.h to generate the *.in files. we are now supporting the full gl.h and glext.h apis.
2009-04-29 13:35:22 -07:00
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
9f5a54a59d am 0a9b5bb: Merge change 509 into donut
Merge commit '0a9b5bbb47a965238ca0e1e699d61d7ddd054742'

* commit '0a9b5bbb47a965238ca0e1e699d61d7ddd054742':
  Fix a media server crash (bug 1807910): part one
2009-04-29 13:11:33 -07:00
Android (Google) Code Review
f8e258ee1b am 5616a7d: Merge change 459 into donut
Merge commit '5616a7d1dea1aecc8353bab144d14446aa33391a'

* commit '5616a7d1dea1aecc8353bab144d14446aa33391a':
  TypedProperties: initial commit
2009-04-29 13:11:33 -07:00
Android (Google) Code Review
b45a609002 am 24b62d0: Merge change 462 into donut
Merge commit '24b62d0c41cf37ade751fe96a4888fbe7f61eb5a'

* commit '24b62d0c41cf37ade751fe96a4888fbe7f61eb5a':
  integrate some OpenGL ES changes back from master_gl in preparation of opening GLES to the NDK.
2009-04-29 13:11:32 -07:00
Android (Google) Code Review
5c685a948e am 9c56513: Merge change 165 into donut
Merge commit '9c5651390056cd9c2f68d5df057739528bd4128b'

* commit '9c5651390056cd9c2f68d5df057739528bd4128b':
  Squashed commit of the following:
2009-04-29 13:11:32 -07:00
Android (Google) Code Review
1e89ef82b1 am 947fe79: Merge change 483 into donut
Merge commit '947fe79e99d5536a10c5b81946d20e69d0e9d479'

* commit '947fe79e99d5536a10c5b81946d20e69d0e9d479':
  API_CHANGE: external_storage: Add SDCARD_WRITE permission with associated strings
2009-04-29 13:11:28 -07:00
Tammo Spalink
b4cf2076f9 am 0a57e5b: removed extra event log tag
Merge commit '0a57e5b730beaea75c1c1b1ca51b40c463918b4d'

* commit '0a57e5b730beaea75c1c1b1ca51b40c463918b4d':
  removed extra event log tag
2009-04-29 13:11:28 -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
Android (Google) Code Review
b4ec401085 Merge change 605
* changes:
  Add '_' to the allowable characters in a host name.
2009-04-28 04:56:52 -07: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
Andy McFadden
f3c06bb8b6 Minor updates to DDMS doc.
Fixed typos, removed stale comment.  Changed "service" to "server".
2009-04-27 10:38:50 -07: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
Android (Google) Code Review
d6f9b9baba Merge change 529 into donut
* changes:
  use gl.h to generate the *.in files. we are now supporting the full gl.h and glext.h apis.
2009-04-23 19:59:17 -07: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
Mathias Agopian
1feecd8310 use gl.h to generate the *.in files. we are now supporting the full gl.h and glext.h apis. 2009-04-23 18:05:44 -07:00
Android (Google) Code Review
0a9b5bbb47 Merge change 509 into donut
* changes:
  Fix a media server crash (bug 1807910): part one Add a factory method that creates a Camera object from a remote client
2009-04-23 15:58:38 -07:00
Fred Quintana
d9d2f1140b change the sync framework and users to understand Account 2009-04-23 15:37:45 -07:00
Android (Google) Code Review
5616a7d1de Merge change 459 into donut
* changes:
  TypedProperties: initial commit
2009-04-23 14:22:58 -07:00
James Dong
2adc2dbbd6 Fix a media server crash (bug 1807910): part one
Add a factory method that creates a Camera object from a remote client

Next:
The changes in authordriver.cpp and android_camera_input.cpp will come.
and the constructor for Camera object will be removed.
2009-04-23 14:07:23 -07:00
Android (Google) Code Review
24b62d0c41 Merge change 462 into donut
* changes:
  integrate some OpenGL ES changes back from master_gl in preparation of opening GLES to the NDK.
2009-04-23 13:48:39 -07:00
Mathias Agopian
e29254e708 integrate some OpenGL ES changes back from master_gl in preparation of opening GLES to the NDK. 2009-04-23 13:45:48 -07:00
Android (Google) Code Review
9c56513900 Merge change 165 into donut
* changes:
  Squashed commit of the following:
2009-04-23 12:23:46 -07:00
Android (Google) Code Review
947fe79e99 Merge change 483 into donut
* changes:
  API_CHANGE: external_storage: Add SDCARD_WRITE permission with associated strings
2009-04-23 11:44:10 -07:00
San Mehat
29b57e63e5 API_CHANGE: external_storage: Add SDCARD_WRITE permission with associated strings
Signed-off-by: San Mehat <san@google.com>
2009-04-23 11:40:17 -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
Tammo Spalink
0a57e5b730 removed extra event log tag 2009-04-23 10:34:11 +08:00
Android (Google) Code Review
b4bf562022 Merge change 431
* changes:
  package run_page_cycler.py into apk and add code for extraction
2009-04-22 18:51:09 -07: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
Jean-Baptiste Queru
b843ce7424 Merge donut into master 2009-04-22 18:33:17 -07:00
Jean-Baptiste Queru
0029326391 Merge donut into master 2009-04-22 18:27:14 -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
56137a2584 merge cupcake into donut 2009-04-22 17:56:58 -07:00
Dave Bort
c4d6dd0bbc TypedProperties: initial commit 2009-04-22 17:51:50 -07:00
Jean-Baptiste Queru
b73b4c73d5 Regenerate current.xml after merge 2009-04-22 17:28:41 -07:00
Jean-Baptiste Queru
74008f608a Merge donut into master 2009-04-22 17:12:34 -07:00
Android (Google) Code Review
2d6b6b2568 Merge change 289 into donut
* changes:
  Changes for new ril.h.
2009-04-22 16:44:52 -07:00
Wink Saville
a14f47f975 Changes for new ril.h.
These allow RIL.java to assume ril.cpp is interfacing
to the new CDMA capable vendor ril. At the moment we
don't have a full CDMA capabile ril so thre are some
NEWRIL:TODO's in the code base to identify these areas.
2009-04-22 14:52:11 -07:00
Robert Greenwalt
96e20409af Squashed commit of the following:
commit 012b56fc607cf243cf4b29cb2a5f172bcbe0aecd
Author: Robert Greenwalt <robdroid@android.com>
Date:   Wed Apr 22 14:31:26 2009 -0700

    Additional fixes and tests for density.

commit 91fdc8e187551ae69e0029a4325fb3ad38fe411b
Author: Robert Greenwalt <robdroid@android.com>
Date:   Tue Apr 14 14:39:00 2009 -0700

    Fix runtime resource selection logic.

    Fix isBetterThan so that o or this may be supperior at any stage.
    Used to only handle this-better or tie at each stage, biasing against o.
    Also allows reset of unit test to succeed.  Fixes bug 1709202.
2009-04-22 14:35:11 -07:00
Dirk Dougherty
644cf62660 Merge branch 'readonly-p4-donut' into donut 2009-04-22 13:39:58 -07:00
Dirk Dougherty
b08971b876 AI 147338: am: CL 147336 Remove stuff relating to the Maps ext library from the docs. Leave a pointer over to code.google.com.
Original author: ddougherty
  Merged from: //branches/cupcake/...

Automated import of CL 147338
2009-04-22 13:38:45 -07:00
Dirk Dougherty
b6f8704116 Merge branch 'readonly-p4-donut' into donut 2009-04-22 13:37:15 -07:00