Commit Graph

2778 Commits

Author SHA1 Message Date
Android (Google) Code Review
9793c45993 am 3e1663a2: Merge change 7536 into donut
Merge commit '3e1663a2539ff0b939193304cfb601f6b134af7d'

* commit '3e1663a2539ff0b939193304cfb601f6b134af7d':
  fix FILE* version of ZipUtils::inflateToBuffer
2009-07-16 17:54:01 -07:00
Android (Google) Code Review
7f608f0345 am 8e3c3f64: Merge change 7514 into donut
Merge commit '8e3c3f6461b53dc587ba92b3fe8cfbeb985f8514'

* commit '8e3c3f6461b53dc587ba92b3fe8cfbeb985f8514':
  Only parse search suggestions that look like HTML
2009-07-16 17:53:57 -07:00
Android (Google) Code Review
ea7b049543 am 5380aa29: Merge change 7512 into donut
Merge commit '5380aa29470274de5b3e445d577ef0834cfacb71'

* commit '5380aa29470274de5b3e445d577ef0834cfacb71':
  Get rid of drawing hacks for search dialog suggestions
2009-07-16 17:53:53 -07:00
Bjorn Bringert
cb471dd228 am ee716fa2: Make sure SearchDialog.mSearchable != null in key handlers
Merge commit 'ee716fa2b03666622a73f8cc54dae4afd091353d'

* commit 'ee716fa2b03666622a73f8cc54dae4afd091353d':
  Make sure SearchDialog.mSearchable != null in key handlers
2009-07-16 17:53:48 -07:00
Android (Google) Code Review
2bc671d78c am c93af6dc: Merge change 7441 into donut
Merge commit 'c93af6dc5bc78f02d4ee549890da12dc669fc2fe'

* commit 'c93af6dc5bc78f02d4ee549890da12dc669fc2fe':
  Allow system colors in <font> tags
2009-07-16 17:53:44 -07:00
Android (Google) Code Review
795e8f42c9 am 0d039ba3: Merge change 7508 into donut
Merge commit '0d039ba328a59fc81280fbecf68aad2d2cba7234'

* commit '0d039ba328a59fc81280fbecf68aad2d2cba7234':
  keystore: Fix a compile warning.
2009-07-16 17:53:40 -07:00
Android (Google) Code Review
da1bafd604 Merge change 7633
* changes:
  Fix conflict with automatic DPI support on high density devices by forcing bitmap loading to not be scaled.
2009-07-16 17:49:05 -07:00
Android (Google) Code Review
7e1bb6da48 Merge change 7587
* changes:
  Fixes merge conflict.
2009-07-16 15:17:55 -07:00
Android (Google) Code Review
bd081ebd0c Merge change 7590
* changes:
  Update rollo and renderscript to the new ACC compiler interface.
2009-07-16 15:09:38 -07:00
Jean-Baptiste Queru
77de619c05 Merge commit 'goog/readonly-korg-master' into merge_korg_master
* commit 'goog/readonly-korg-master':
  Fixed Android issue #400, where the Intent documentation was inaccurate in a number of places, undoubtedly causing untold grief to innumerable masses.
  Bug Fixed for libagl.
2009-07-16 14:54:11 -07:00
Jean-Baptiste Queru
b2fb847ff4 merge-ignore changes that were already in or that are not relevant
Merge commit '7ecccee0d0c32ee472c9a74f4ccb8b152b074402' into HEAD
2009-07-16 13:47:28 -07:00
Android (Google) Code Review
3b5fb5dcf1 Merge change 7567
* changes:
  Send all battery broadcasts with REGISTERED_ONLY_BEFORE_BOOT
2009-07-16 13:45:46 -07:00
Android (Google) Code Review
a70bb07534 Merge change 7491
* changes:
  Update rollo with new interactivity model.
2009-07-16 12:58:54 -07:00
Android (Google) Code Review
a7bf26ebec Merge change 7534
* changes:
  Show the password in browser password fields.
2009-07-16 12:33:32 -07:00
Android (Google) Code Review
0ff870e5df Merge change 7536 into donut
* changes:
  fix FILE* version of ZipUtils::inflateToBuffer
2009-07-16 12:06:55 -07:00
Android (Google) Code Review
2103bf2999 Merge change 7399
* changes:
  Partial implementation of the parsing of Parcel into Metadata.
2009-07-16 11:55:45 -07:00
Doug Zongker
0de50495d6 fix FILE* version of ZipUtils::inflateToBuffer
This can't have ever worked; a successful fread() was returning 1
instead of getSize.
2009-07-16 11:27:13 -07:00
Android (Google) Code Review
349f7c0e75 Merge change 6954
* changes:
  New test player stub to load mock native players.
2009-07-16 11:25:11 -07:00
Android (Google) Code Review
d372c3308e Merge change 7332
* changes:
  Squashed commit of the following:
2009-07-16 10:30:56 -07:00
Android (Google) Code Review
68585ed4b3 Merge change 7522
* changes:
  EventHub: Add support for excluding devices from being opened by as a keyboard.
2009-07-16 10:22:33 -07:00
Android (Google) Code Review
f7f4c2c099 Merge change 7526
* changes:
  Implement the carrier specified OTASP numbers
2009-07-16 10:12:13 -07:00
Android (Google) Code Review
331e8dc34d am 8a733e8f: Merge change 7473 into donut
Merge commit '8a733e8fa2b2e6c1404ca536da645e897405eb5f'

* commit '8a733e8fa2b2e6c1404ca536da645e897405eb5f':
  Fixes #1844366. Prevents window leak in Spinner.
2009-07-16 09:54:48 -07:00
Mike Lockwood
b441106276 EventHub: Add support for excluding devices from being opened by as a keyboard.
This will be used to avoid unnecessarily listening to data from sensors
that function as event devices.

Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-07-16 11:51:42 -04:00
Android (Google) Code Review
7151edd5d8 Merge change 7494
* changes:
  remove libagl's dependency on gralloc_priv.h
2009-07-16 07:33:14 -07:00
Android (Google) Code Review
ae7e313b2e Merge change 7493
* changes:
  resolved conflicts for merge of 8e0fb366 to master
2009-07-16 07:33:14 -07:00
Android (Google) Code Review
52284ae6f7 Merge change 7514 into donut
* changes:
  Only parse search suggestions that look like HTML
2009-07-16 06:32:52 -07:00
Android (Google) Code Review
610614fbfd Merge change 7512 into donut
* changes:
  Get rid of drawing hacks for search dialog suggestions
2009-07-16 06:08:59 -07:00
Android (Google) Code Review
f744f97e8b Merge change 7441 into donut
* changes:
  Allow system colors in <font> tags
2009-07-16 00:06:23 -07:00
Android (Google) Code Review
274bd90210 Merge change 7508 into donut
* changes:
  keystore: Fix a compile warning.
2009-07-15 23:55:58 -07:00
Chia-chi Yeh
23c7adc5e9 keystore: Fix a compile warning. 2009-07-16 14:45:11 +08:00
Mathias Agopian
f13901eaa9 remove libagl's dependency on gralloc_priv.h 2009-07-15 18:53:32 -07:00
jsh
d515c152b5 resolved conflicts for merge of 8e0fb366 to master 2009-07-15 18:42:47 -07:00
Android (Google) Code Review
80a9b58cc6 Merge change 7490
* changes:
  Fix master build errors post merge with master_gl branch.
2009-07-15 18:34:24 -07:00
Android (Google) Code Review
7d2f6d653a Merge change 7489
* changes:
  More test app work
2009-07-15 18:34:11 -07:00
Android (Google) Code Review
9bba261aeb Merge change 7480
* changes:
  Make sync not start until setup wizard is done.
2009-07-15 18:28:16 -07:00
Android (Google) Code Review
d3df08b81d am 82b283a9: Merge change 7451 into donut
Merge commit '82b283a9bf8e3508e1b5c6d4b6b8cae04597b83c'

* commit '82b283a9bf8e3508e1b5c6d4b6b8cae04597b83c':
  Include 'calling_package' extra for uses of in-app voice search so that
2009-07-15 18:15:01 -07:00
Android (Google) Code Review
aff5e2b1ae am 6ce4236d: Merge change 7401 into donut
Merge commit '6ce4236d70c8543021bb521731ac9f05d22b3002'

* commit '6ce4236d70c8543021bb521731ac9f05d22b3002':
  Adding missing addEarcon method. Not having this was a bug as
2009-07-15 18:14:38 -07:00
Android (Google) Code Review
cb82349770 am b9bae58e: Merge change 7402 into donut
Merge commit 'b9bae58ecba8a25cc54dfd119a9edbeed6f230de'

* commit 'b9bae58ecba8a25cc54dfd119a9edbeed6f230de':
  Added fade-in out animation for compatible apps
2009-07-15 18:14:33 -07:00
Android (Google) Code Review
31ddd8e2b7 am c122824f: Merge change 7396 into donut
Merge commit 'c122824f48266c5df1b1b3a0a915619e5963ed7a'

* commit 'c122824f48266c5df1b1b3a0a915619e5963ed7a':
  Run background threads associated with filtering at background priority.
2009-07-15 18:14:28 -07:00
Android (Google) Code Review
a8e591572c am 66f60875: Merge change 7421 into donut
Merge commit '66f608758b59517d7db2168806f9764edd28ae1f'

* commit '66f608758b59517d7db2168806f9764edd28ae1f':
  Clamp app widget updates from updatePeriodMillis to a minimum of 30 minutes.
2009-07-15 18:14:18 -07:00
Android (Google) Code Review
e3a1493ad8 am 5a76ae46: Merge change 7406 into donut
Merge commit '5a76ae46854ac449f94e1f75ef13ce035e4c65cd'

* commit '5a76ae46854ac449f94e1f75ef13ce035e4c65cd':
  Update Searchables test with new GlobalSearch name
2009-07-15 18:14:12 -07:00
Android (Google) Code Review
fdc66086fd Merge change 7482
* changes:
  Fix a bug introduced in obex cleanup
2009-07-15 18:10:09 -07:00
Android (Google) Code Review
53212b87a4 Merge change 7473 into donut
* changes:
  Fixes #1844366. Prevents window leak in Spinner.
2009-07-15 17:02:25 -07:00
Android (Google) Code Review
2e769a11a6 Merge change 7359 into donut
* changes:
  Minor tweak to CDMA_SUBSCRIPTION.
2009-07-15 16:58:11 -07:00
Android (Google) Code Review
5fdd6ed871 Merge change 7435
* changes:
  Ensure that everything gets backed up at least once
2009-07-15 15:38:59 -07:00
Android (Google) Code Review
d7e9b85380 Merge change 7451 into donut
* changes:
  Include 'calling_package' extra for uses of in-app voice search so that the server can tailor recognition to an individual app.
2009-07-15 15:33:46 -07:00
Android (Google) Code Review
a05aed9231 am 37b939a6: Merge change 7395 into donut
Merge commit '37b939a63742c9a0cea4e6982bfb0581def45d6d'

* commit '37b939a63742c9a0cea4e6982bfb0581def45d6d':
  Move the silent ringtone to ringtones/notifications, so it can be used for both.
2009-07-15 14:39:48 -07:00
Grace Kloba
45c203822b resolved conflicts for merge of 21d769da to master 2009-07-15 14:38:20 -07:00
Android (Google) Code Review
c1a0318b7c Merge change 7381
* changes:
  Remove all our old high priority knowledge since WebCore will manage it.
2009-07-15 14:10:23 -07:00
Android (Google) Code Review
7c38f9fbb0 Merge change 7419
* changes:
  Standby A2DP audio hardware interface when disabling A2DP.
2009-07-15 13:58:02 -07:00