Commit Graph

7803 Commits

Author SHA1 Message Date
2f389aa3ac Merge "Fix test breakage in vCard exporter." 2010-01-04 20:51:08 -08:00
1301341f13 Fix test breakage in vCard exporter.
Due to the change Iae8dbac1, all tests for vCard exporeter has failed.
This change fixes the breakage by using a kind of dirty Dependency Injection.

Current test framework for vCard exporter strongly depends on the assumption that
ContentValues objects are able to be directly passed to objects which use
ContentResolver, while the change above disabled the feature by removing
queryEntities().

This change makes VCardComposer forcibly uses queryEntities() via Reflection.
I agree that this change is not so clean, but works fine for now.
2010-01-05 13:44:51 +09:00
3763464e8f b/2293263 Replaced busybit functionality with eventDay functionality.
Made changes to start stripping out busybits and replace them with checks only to see if an event eists on a given day.
This file ties into several other areas so not all busybits references were removed and those that were have been
commented out to make it easier to find errors.
2010-01-04 16:29:15 -08:00
d9328513da Turn off debug flag 2010-01-04 16:18:06 -08:00
1dabb95d28 Merge "Ignore key events when the widget is disabled. Bug: #2353635." 2010-01-04 15:40:27 -08:00
d5c19608c6 Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2010-01-04 15:39:56 -08:00
992cc4282e Ignore key events when the widget is disabled.
Bug: #2353635.
2010-01-04 15:39:40 -08:00
7eca501433 Merge "MediaFile.UNKNOWN_STRING -> MediaStore.UNKNOWN_STRING" 2010-01-04 15:10:33 -08:00
9a488b44cb MediaFile.UNKNOWN_STRING -> MediaStore.UNKNOWN_STRING 2010-01-04 15:09:03 -08:00
40967d61fc Merge "Add four way directional rotation to WindowOrientationListener" 2010-01-04 15:07:14 -08:00
63104edbf0 Add four way directional rotation to WindowOrientationListener 2010-01-04 15:05:20 -08:00
7d3cbfe2db Merge "Plug memory leak in Simple*Adapter, due to the misuse of a WeakHashMap. This removes an optimization but the benefit is not worth the memory leak. Bug: #2353474." 2010-01-04 14:54:02 -08:00
c8ca2a3a07 Plug memory leak in Simple*Adapter, due to the misuse of a WeakHashMap.
This removes an optimization but the benefit is not worth the memory leak.
Bug: #2353474.
2010-01-04 14:52:38 -08:00
4cb8b8ffdf Merge "Fix typo in ColorStateList documentation." 2010-01-04 14:46:28 -08:00
79dc8ccddd Fix typo in ColorStateList documentation. 2010-01-04 14:45:49 -08:00
1c2d1d0296 Merge "Do not start filtering if the first character is a space. Bug: #2347833." 2010-01-04 14:34:55 -08:00
cf6c5720a7 Do not start filtering if the first character is a space.
Bug: #2347833.
2010-01-04 14:34:08 -08:00
f9f4173c7d Merge "Add the UNKNOWN_STRING definition to MediaStore. It will be removed from MediaFile once I've updated the code that uses it." 2010-01-04 14:02:49 -08:00
24c10062cd am 5c529a0c: am 08fa1428: Rename ro.monkey to monkey.running
Merge commit '5c529a0cb587d0dfa38e5642e268ca56285a356f'

* commit '5c529a0cb587d0dfa38e5642e268ca56285a356f':
  Rename ro.monkey to monkey.running
2010-01-04 13:49:47 -08:00
ed297a8417 Add the UNKNOWN_STRING definition to MediaStore. It will be removed
from MediaFile once I've updated the code that uses it.
2010-01-04 13:24:31 -08:00
5c529a0cb5 am 08fa1428: Rename ro.monkey to monkey.running
Merge commit '08fa1428eed52083789dc3b366aea4873199bd37' into eclair-plus-aosp

* commit '08fa1428eed52083789dc3b366aea4873199bd37':
  Rename ro.monkey to monkey.running
2010-01-04 12:59:17 -08:00
0804043689 am 081798f9: am 38863336: layers support
Merge commit '081798f91270adb2a68979e5f7867d2021b8eed3'

* commit '081798f91270adb2a68979e5f7867d2021b8eed3':
  layers support
2010-01-04 12:49:50 -08:00
08fa1428ee Rename ro.monkey to monkey.running
So that Monkey can set ro.mokey before running and reset it after running.
2010-01-04 11:56:24 -08:00
081798f912 am 38863336: layers support
Merge commit '3886333644467beeaf60c13fb94f242538067765' into eclair-mr2-plus-aosp

* commit '3886333644467beeaf60c13fb94f242538067765':
  layers support
2010-01-04 11:42:41 -08:00
3886333644 layers support 2010-01-04 19:30:55 +00:00
1337b012f8 Fix DropBox reference in SDK comment. (Fix SDK build.) 2010-01-04 11:02:00 -08:00
f1d068981b Merge "Fix obsolete advice in RelativeLayout's documentation." 2010-01-04 10:58:13 -08:00
520c4204fb Fix obsolete advice in RelativeLayout's documentation. 2010-01-04 10:56:38 -08:00
e80a066984 Merge "Don't round size to page size. Ashmem will do this internally as needed." 2010-01-04 10:31:28 -08:00
e38d58bf89 Remove Google-specific (or only-used-by-Google-code) classes.
Fix a small typo in Context javadoc.
2010-01-04 10:14:21 -08:00
c70cf9af8d am 9002eb44: am 67166b6e: Merge "Cleanup the cache file when we decide not saving it. This logic was lost when we switched back using FLASH instead of RAM for the cache." into eclair-mr2
Merge commit '9002eb44043868a2f5fc38128748464492f297c6'

* commit '9002eb44043868a2f5fc38128748464492f297c6':
  Cleanup the cache file when we decide not saving it.
2010-01-04 10:05:13 -08:00
9002eb4404 am 67166b6e: Merge "Cleanup the cache file when we decide not saving it. This logic was lost when we switched back using FLASH instead of RAM for the cache." into eclair-mr2
Merge commit '67166b6eaea7a3bc83ec7bf2876b3807cda859f1' into eclair-mr2-plus-aosp

* commit '67166b6eaea7a3bc83ec7bf2876b3807cda859f1':
  Cleanup the cache file when we decide not saving it.
2010-01-04 10:01:16 -08:00
67166b6eae Merge "Cleanup the cache file when we decide not saving it. This logic was lost when we switched back using FLASH instead of RAM for the cache." into eclair-mr2 2010-01-04 09:55:54 -08:00
7bcbd51173 Don't round size to page size. Ashmem will do this internally as needed. 2010-01-04 09:54:45 -08:00
3bf657a22b Merge "Remove some logging from camera operations. Bug 2346606." 2010-01-04 08:57:20 -08:00
c95a176d6f Remove some logging from camera operations. Bug 2346606. 2010-01-04 08:55:04 -08:00
87232e6382 am 1b9d7605: am e26efa32: If the DOM changes textfield focus, make the IME work properly.
Merge commit '1b9d7605df3c07998752b713d7f944bb925cb193'

* commit '1b9d7605df3c07998752b713d7f944bb925cb193':
  If the DOM changes textfield focus, make the IME work properly.
2010-01-04 08:02:18 -08:00
1b9d7605df am e26efa32: If the DOM changes textfield focus, make the IME work properly.
Merge commit 'e26efa321c66716d58f3e338022caed8852af07e' into eclair-mr2-plus-aosp

* commit 'e26efa321c66716d58f3e338022caed8852af07e':
  If the DOM changes textfield focus, make the IME work properly.
2010-01-04 07:32:59 -08:00
e26efa321c If the DOM changes textfield focus, make the IME work properly.
Fix for http://b/issue?id=2219166

Requires a change to external/webkit

Remove the old change to update the WebTextView when a key is pressed,
since the IME does not generate key events.  Instead, when the focus
changes, and the IME is serving the WebTextView, immediately clear
the cursor and update the WebTextView, so the user can continue
typing.
2010-01-04 09:43:57 -05:00
7fd0fee968 services: MountService: Refactor MountService for vold2
Squash of the following:
services: MountService: Rework the way volume states are handled
MountService: Add new API for directly getting volume state via a mount point
Environment: Switch from using system property for external storage state.
MountService: Add support for UMS
MountService: Fix a few bugs
services: MountService: Add support for mount-on-insertion
services: MountService: Add some debugging around UMS
services: MountService: Fix some UMS bugs and clean-up startup mount code

Signed-off-by: San Mehat <san@google.com>
2010-01-02 07:24:07 -08:00
a6276fdd42 A library for encoding and decoding ETC1 textures.
The ETC1 compressed texture format is commonly
supported by OpenGL ES 2.0-capable devices.
2009-12-31 13:31:04 +08:00
7ebdcbdb6f Merge branch 'master' of ssh://android-git.corp.google.com:29418/platform/frameworks/base 2009-12-29 20:11:00 -08:00
202f560f85 Fix a typo.
Change-Id: Idbe649678a7321a6bd9511218788bc4dfb3cbdb4
2009-12-28 15:54:23 +08:00
998c05b3b5 Cleanup the cache file when we decide not saving it.
This logic was lost when we switched back using FLASH
instead of RAM for the cache.

Add back the CACHE_MAX_SIZE to limit the maximum
cacheable file.

Fix http://b/issue?id=2346132
2009-12-27 18:25:21 -08:00
a0b517609d am 68e9014e: am 484d2888: Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
Merge commit '68e9014e47f7350b3889e1704dde809b2a926968'

* commit '68e9014e47f7350b3889e1704dde809b2a926968':
  Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
2009-12-27 16:33:17 -08:00
68e9014e47 am 484d2888: Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
Merge commit '484d2888680e18e6ad8c3fcc51e3b70a705a096e' into eclair-mr2-plus-aosp

* commit '484d2888680e18e6ad8c3fcc51e3b70a705a096e':
  Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
2009-12-22 17:42:17 -08:00
44303922f1 Watch for "bluetooth" in list of toggleable radios.
Settings.System.AIRPLANE_MODE_TOGGLEABLE_RADIOS is a list of
radios that can be toggled while in airplane mode.  This
change adds logic to BluetoothService to allow enabling
when Settings.System.RADIO_BLUETOOTH appears in that list.

Fixes http://b/2297314
2009-12-22 14:32:15 -08:00
7853722721 am 49a791a0: am 4350e145: Move the full screen\'s matching embedded view to be fully visible so that the touch will always work.
Merge commit '49a791a08b074aac438f8b6b32ae8c2860717447'

* commit '49a791a08b074aac438f8b6b32ae8c2860717447':
  Move the full screen's matching embedded view to be
2009-12-22 10:15:46 -08:00
f0108cda21 resolved conflicts for merge of ad2fa35d to master
Change-Id: Ia4362cd48ac0689b91003943a4cd9660da72ff90
2009-12-22 10:11:55 -08:00
484d288868 Fix issue 2299360: Change in in-call volume affects the Bluetooth in-call volume and vice versa.
Add a separate system settings entry for bluetooth SCO volume.
2009-12-22 10:10:24 -08:00