Commit Graph

4712 Commits

Author SHA1 Message Date
Android (Google) Code Review
de9306e573 Merge change 23499 into donut
* changes:
  Fix content provider
2009-09-01 19:09:24 -07:00
Scott Main
8782fa2205 am dc516413: Merge change 23503 into donut
Merge commit 'dc5164134c507f747f1cf89c01e4fb5e724eccd4' into eclair

* commit 'dc5164134c507f747f1cf89c01e4fb5e724eccd4':
  docs only.
2009-09-01 19:07:10 -07:00
Android (Google) Code Review
245e5ecd6a Merge change 23503 into donut
* changes:
  docs only. expand the uses-feature docs
2009-09-01 19:04:15 -07:00
Scott Main
08c96ae24e am 4e0951c9: am 4e60d012: docs only. add syntax samples for all attributes and revise targetSdkVersion information.
Merge commit '4e0951c9f31c5b5a6026552ede3f47aa038b525e' into eclair-plus-aosp

* commit '4e0951c9f31c5b5a6026552ede3f47aa038b525e':
  docs only.
2009-09-01 18:49:52 -07:00
Scott Main
0478d2b74c am 4e60d012: docs only. add syntax samples for all attributes and revise targetSdkVersion information.
Merge commit '4e60d012c95f50ddd2a1ba6202e4fec3c9cfd3df' into eclair

* commit '4e60d012c95f50ddd2a1ba6202e4fec3c9cfd3df':
  docs only.
2009-09-01 18:48:34 -07:00
Fred Quintana
f22d5c327f am 04f6da35: Merge change 23376 into eclair
Merge commit '04f6da353d4e79f49ba1d4897ed617e91acc3f77' into eclair-plus-aosp

* commit '04f6da353d4e79f49ba1d4897ed617e91acc3f77':
  - don't schedule syncs that we will never dispatch
2009-09-01 17:40:49 -07:00
Android (Google) Code Review
1a863c2f3e Merge change 23376 into eclair
* changes:
  - don't schedule syncs that we will never dispatch - expedite the INITIALIZATION sync
2009-09-01 17:38:25 -07:00
Jean-Michel Trivi
adc1da20fb am b1461fb4: Merge change 23542 into eclair
Merge commit 'b1461fb4824f872faff40b206383d5e0faeda2ea' into eclair-plus-aosp

* commit 'b1461fb4824f872faff40b206383d5e0faeda2ea':
  Modify the gain after filtering to prevent TTS clipping in en-US.
2009-09-01 16:21:09 -07:00
Android (Google) Code Review
104e15eac2 Merge change 23542 into eclair
* changes:
  Modify the gain after filtering to prevent TTS clipping in en-US.
2009-09-01 16:19:14 -07:00
Wink Saville
05d195498c am 65d62c77: Add hasIccCard to IccCard and TelephonyManager.
Merge commit '65d62c774e42d8bf9a55ef50e153ffc9e277ef37' into eclair-plus-aosp

* commit '65d62c774e42d8bf9a55ef50e153ffc9e277ef37':
  Add hasIccCard to IccCard and TelephonyManager.
2009-09-01 15:58:10 -07:00
San Mehat
a60840e3f2 am 03a3327b: Merge change 23506 into eclair
Merge commit '03a3327badda54728de2ca969b31b53f5ad9ad3a' into eclair-plus-aosp

* commit '03a3327badda54728de2ca969b31b53f5ad9ad3a':
  dumpstate: Add support for apanic crash data
2009-09-01 15:42:30 -07:00
Android (Google) Code Review
f44bbdea0b Merge change 23506 into eclair
* changes:
  dumpstate: Add support for apanic crash data
2009-09-01 15:40:28 -07:00
Tom Taylor
88eed292da am 513069c3: Make a path constant
Merge commit '513069c39cd6610db2919c09abea2ff73158356a' into eclair-plus-aosp

* commit '513069c39cd6610db2919c09abea2ff73158356a':
  Make a path constant
2009-09-01 15:30:34 -07:00
Eric Fischer
75a3d0a215 Make it an error to use a bare apostrophe in aapt, and adjust warnings/errors.
In practice, no one ever writes an apostrophe in an aapt string with the
intent of using it to quote whitespace -- they always mean to include a
literal apostrophe in the string and then are surprised when they find
the apostrophe missing.  Make this an error so that it is discovered
right away instead of waiting until late in QA or after the strings have
already been sent for translation.  (And fix a recently-introduced string
that has exactly this problem.)

Silence the warning about an empty span in a string, since this seems to
annoy people instead of finding any real problems.

Make the error about having a translated string with no base string into
a warning, since this is a big pain when making changes to an application
that has already had some translations done, and the dead translations
should be removed by a later translation import anyway.
2009-09-01 15:20:30 -07:00
Grace Kloba
f3f45a4b74 am 9217c458: When we destroy a WebView, RESUME_TIMERS/PAUSE_TIMERS may be still in the queue. We need to pass them to WebViewCore as they are per process base. If we drop them, the counter in the JWebCoreJavaBridge can be out of order.
Merge commit '9217c45829da4d0c9c9dbdc6bc950c7f3e03e4f5' into eclair-plus-aosp

* commit '9217c45829da4d0c9c9dbdc6bc950c7f3e03e4f5':
  When we destroy a WebView, RESUME_TIMERS/PAUSE_TIMERS may be still in the queue.
2009-09-01 15:02:34 -07:00
Lixin Yue
dee27e53d2 am 485e6dca: Merge change 23462 into eclair
Merge commit '485e6dca960c2001349de0817c644f24ae85c6e3' into eclair-plus-aosp

* commit '485e6dca960c2001349de0817c644f24ae85c6e3':
  Add Bluetooth Device trust
2009-09-01 14:11:53 -07:00
Android (Google) Code Review
6a25ac6e54 Merge change 23462 into eclair
* changes:
  Add Bluetooth Device trust
2009-09-01 14:10:06 -07:00
jsh
80c85deddb am a01726a7: Some fixes to SMS processing in the framework.
Merge commit 'a01726a7fdd872cd8e1e8a9dfa52fb9cdbf01019' into eclair-plus-aosp

* commit 'a01726a7fdd872cd8e1e8a9dfa52fb9cdbf01019':
  Some fixes to SMS processing in the framework.
2009-09-01 13:40:15 -07:00
Evan Millar
90b7d5009b am 394c92ef: Merge change 23461 into eclair
Merge commit '394c92ef154e04fe37ac4688fc6b9cc13917db1f' into eclair-plus-aosp

* commit '394c92ef154e04fe37ac4688fc6b9cc13917db1f':
  Mimetypes in ContactsProvider2 shouldn't overlap with those in ContactsProvider
2009-09-01 13:10:35 -07:00
Android (Google) Code Review
c8993dc828 Merge change 23461 into eclair
* changes:
  Mimetypes in ContactsProvider2 shouldn't overlap with those in ContactsProvider
2009-09-01 13:09:25 -07:00
Dmitri Plotnikov
004bbafea9 am 6ff270fd: Merge change 23474 into eclair
Merge commit '6ff270fd854d7c62f857998446fccb803004f1c3' into eclair-plus-aosp

* commit '6ff270fd854d7c62f857998446fccb803004f1c3':
  Breaking sleep after yield into small quanta.
2009-09-01 13:06:04 -07:00
Android (Google) Code Review
bf6bef8982 Merge change 23474 into eclair
* changes:
  Breaking sleep after yield into small quanta.
2009-09-01 13:03:58 -07:00
Dianne Hackborn
cd22fcfb71 am d31825c6: Merge change 23403 into eclair
Merge commit 'd31825c6ff83a3e336efc97ced1b205fe65b11a9' into eclair-plus-aosp

* commit 'd31825c6ff83a3e336efc97ced1b205fe65b11a9':
  Various infrastructure to support a running services UI.
2009-09-01 12:33:07 -07:00
Android (Google) Code Review
acdf24d076 Merge change 23403 into eclair
* changes:
  Various infrastructure to support a running services UI.
2009-09-01 12:31:31 -07:00
Guang Zhu
0d6049ab38 am 87b455f5: Merge change 23469 into eclair
Merge commit '87b455f5581b3cc3edb9003592a11a1a43104109' into eclair-plus-aosp

* commit '87b455f5581b3cc3edb9003592a11a1a43104109':
  Set a default dump type for DRT as a workaround for indeterministic order in receiving dumpAsText and onPageFinish callback.
2009-09-01 12:05:47 -07:00
Android (Google) Code Review
cb01fd10ff Merge change 23469 into eclair
* changes:
  Set a default dump type for DRT as a workaround for indeterministic order in receiving dumpAsText and onPageFinish callback.
2009-09-01 12:03:39 -07:00
Daniel Sandler
96ec9e31ee am 0c91f5a3: Merge change 23464 into eclair
Merge commit '0c91f5a3b20fea1c937212c2aeec073128f6fdc3' into eclair-plus-aosp

* commit '0c91f5a3b20fea1c937212c2aeec073128f6fdc3':
  Create new hdpi versions of 1x data statusbar icons.
2009-09-01 11:51:53 -07:00
Android (Google) Code Review
28fc36b59b Merge change 23464 into eclair
* changes:
  Create new hdpi versions of 1x data statusbar icons.
2009-09-01 11:49:45 -07:00
Jean-Baptiste Queru
3f155e9686 merge from open-source master 2009-09-01 11:46:14 -07:00
Eric Fischer
c5ff11ecd5 am b7559e02: am 56205fea: Merge change 23345 into donut
Merge commit 'b7559e02803266e5fa9f4496174bc343ecd245ab' into eclair-plus-aosp

* commit 'b7559e02803266e5fa9f4496174bc343ecd245ab':
  Fix an emoji-measuring bug that caused an exception when editing a contact.
2009-09-01 11:20:35 -07:00
Eric Fischer
4ce160e5e7 am 56205fea: Merge change 23345 into donut
Merge commit '56205fea879543a50bb797016832416a8b48cabb' into eclair

* commit '56205fea879543a50bb797016832416a8b48cabb':
  Fix an emoji-measuring bug that caused an exception when editing a contact.
2009-09-01 11:18:43 -07:00
Android (Google) Code Review
7a758262de Merge change 23345 into donut
* changes:
  Fix an emoji-measuring bug that caused an exception when editing a contact.
2009-09-01 11:16:25 -07:00
Eric Laurent
45ecde990e am 46c15823: Merge change 23105 into eclair
Merge commit '46c158234dee0d1d47f06b7661150c18512dc589' into eclair-plus-aosp

* commit '46c158234dee0d1d47f06b7661150c18512dc589':
  Fix issue 2077333: The volume key will effect both ring and media vol at the same time.
2009-09-01 11:15:42 -07:00
Android (Google) Code Review
7ce2a71d9f Merge change 23105 into eclair
* changes:
  Fix issue 2077333: The volume key will effect both ring and media vol at the same time.
2009-09-01 11:14:00 -07:00
Guang Zhu
040e69d4d5 am d9942b5c: Merge change 23450 into eclair
Merge commit 'd9942b5cb1662638bb6fb57c12a06976e3c34651' into eclair-plus-aosp

* commit 'd9942b5cb1662638bb6fb57c12a06976e3c34651':
  At leaset log the layout test timeouts
2009-09-01 10:27:23 -07:00
Android (Google) Code Review
0e1151b073 Merge change 23450 into eclair
* changes:
  At leaset log the layout test timeouts
2009-09-01 10:24:38 -07:00
Cary Clark
26256ec4f7 am 169ae05f: Merge change 23439 into eclair
Merge commit '169ae05f9f5cce400dd936e2a31676b80d84b862' into eclair-plus-aosp

* commit '169ae05f9f5cce400dd936e2a31676b80d84b862':
  if exception getMessage() is null, don't add it to the error
2009-09-01 10:15:51 -07:00
Eric Laurent
988b2f8007 am b51b4098: Merge change 23438 into eclair
Merge commit 'b51b40982d06813bd3b325b4f0d1fa698ab3f897' into eclair-plus-aosp

* commit 'b51b40982d06813bd3b325b4f0d1fa698ab3f897':
  Fix issue 2091594: music chirp after disconnecting A2DP.
2009-09-01 10:14:14 -07:00
Android (Google) Code Review
1699a78614 Merge change 23439 into eclair
* changes:
  if exception getMessage() is null, don't add it to the error
2009-09-01 10:14:10 -07:00
Android (Google) Code Review
9f29120f05 Merge change 23438 into eclair
* changes:
  Fix issue 2091594: music chirp after disconnecting A2DP.
2009-09-01 09:57:53 -07:00
Grace Kloba
e35e3b7c8c am 5e2a385c: Merge change 23395 into eclair
Merge commit '5e2a385c0d95f4a99dd8c562c6d2d79aa8546030' into eclair-plus-aosp

* commit '5e2a385c0d95f4a99dd8c562c6d2d79aa8546030':
  When we get 304 and switch to cacheLoader, need to set mFromCache to be true.
2009-09-01 09:17:47 -07:00
Android (Google) Code Review
d06abf0caf Merge change 23395 into eclair
* changes:
  When we get 304 and switch to cacheLoader, need to set mFromCache to be true. So that the cache loading will not create a new mCacheResult which overwrites the old cache data.
2009-09-01 09:15:45 -07:00
Patrick Scott
e47bf8719c am 05a6f3cd: Merge change 23434 into eclair
Merge commit '05a6f3cde52e5fbbad5187615bfc87d58559161f' into eclair-plus-aosp

* commit '05a6f3cde52e5fbbad5187615bfc87d58559161f':
  Fix a docs comment to match the parameter name.
2009-09-01 07:21:59 -07:00
Android (Google) Code Review
5683fbf326 Merge change 23434 into eclair
* changes:
  Fix a docs comment to match the parameter name.
2009-09-01 07:20:18 -07:00
Cary Clark
c0c6d833b2 am 278ce05b: accelerate consecutive flings
Merge commit '278ce05b52a47a09d2177435b533f4ecb1b9c4da' into eclair-plus-aosp

* commit '278ce05b52a47a09d2177435b533f4ecb1b9c4da':
  accelerate consecutive flings
2009-09-01 06:37:47 -07:00
Eric Laurent
0643771ad0 Fix issue 2091594: music chirp after disconnecting A2DP.
In AudioFlinger::MixerThread::putTracks(), change the mFillingUpStatus flag to FS_FILLING for active tracks so that mute request is executed without ramping volume down when the track is moved from A2DP to hardware output.
Also modified AudioFlinger::setStreamOutput() so that the notification of the change is sent only once to AudioSystem.
2009-09-01 05:56:26 -07:00
Patrick Scott
0ec310d693 am 05c9ed9c: Fix the documentation for onReceivedError.
Merge commit '05c9ed9ce1d920c322ee1431cfed64541f0acf3c' into eclair-plus-aosp

* commit '05c9ed9ce1d920c322ee1431cfed64541f0acf3c':
  Fix the documentation for onReceivedError.
2009-09-01 05:40:53 -07:00
Steve Block
95cebbfc88 am 0c637113: Merge change 23427 into eclair
Merge commit '0c637113381cb49fbb83cf0e753e476d0d0d50eb' into eclair-plus-aosp

* commit '0c637113381cb49fbb83cf0e753e476d0d0d50eb':
  Moves GoogleLocationSettingManager to its correct location.
2009-09-01 05:25:16 -07:00
Android (Google) Code Review
f3d8967444 Merge change 23427 into eclair
* changes:
  Moves GoogleLocationSettingManager to its correct location.
2009-09-01 05:23:26 -07:00
Mike Lockwood
7d4547e4b7 am 84c4548d: Merge changes 23429,23430 into eclair
Merge commit '84c4548d046c7426cd346602cec18b98fdcdbf3c' into eclair-plus-aosp

* commit '84c4548d046c7426cd346602cec18b98fdcdbf3c':
  LocationManagerService: Remove caching of last known locations to flash.
  LocationManagerService: Add null pointer check and remove useless finalize() method.
2009-09-01 05:03:47 -07:00