Jean-Michel Trivi
0deb41abc6
am 0950c5de: Merge change 21226 into donut
...
Merge commit '0950c5de864d1ad83ed96efc5c2d1569b4d36188' into eclair
* commit '0950c5de864d1ad83ed96efc5c2d1569b4d36188':
Fix bug 2046705 where the output of the speech synthesizer is too low.
2009-08-18 08:44:51 -07:00
Jean-Baptiste Queru
969c2eaa3a
am c8ab08aa: Merge change 21124 into donut
...
Merge commit 'c8ab08aa86aea3b693f731c9e817eeb71ab4c1cd' into eclair
* commit 'c8ab08aa86aea3b693f731c9e817eeb71ab4c1cd':
Add license-related files
2009-08-18 08:44:43 -07:00
Scott Main
2685d3b85b
am ba52b3e0: Merge change 21149 into donut
...
Merge commit 'ba52b3e08b33592457242944f7a89691a5b94880' into eclair
* commit 'ba52b3e08b33592457242944f7a89691a5b94880':
DOCS ONLY.
2009-08-18 08:44:38 -07:00
Android (Google) Code Review
9befde04c3
Merge change 21648 into eclair
...
* changes:
Remove the hack to include Gears as it is gone now.
2009-08-18 08:44:18 -07:00
Nick Pelly
bd022f423a
Bluetooth: API change.
...
Split BluetoothDevice into BluetoothDevice and BluetoothAdapter.
BluetoothAdapter: Represents the local BT adapter. Operations on the local
adapter (start a scan, etc).
BluetoothDevice: Represents a remote BT device. Operations on remote devices
(pair, connect, etc).
IBluetoothDevice.aidl -> Bluetooth.aidl
BluetoothDeviceService.java -> BluetoothDeviceService.java
TODO:
Javadoc
2009-08-18 08:24:22 -07:00
Android (Google) Code Review
82e7408be2
Merge change 21326 into eclair
...
* changes:
aapt now attempts to process all assets even if some are malformed.
2009-08-18 07:20:06 -07:00
Android (Google) Code Review
8735d553c5
Merge change 21601 into eclair
...
* changes:
BatteryService: Add support for new standard battery voltage and temperature attributes.
2009-08-18 06:03:47 -07:00
Android (Google) Code Review
6e6c7bbce0
Merge change 21646 into eclair
...
* changes:
fix bug [2021677] egl driver unloaded after eglTerminate() is called
2009-08-18 00:27:16 -07:00
Dianne Hackborn
8df8b2b405
Allow wallpapers to get touch events.
2009-08-17 21:23:05 -07:00
Android (Google) Code Review
948ee25127
Merge change 21660 into eclair
...
* changes:
Optimized Galaxy
2009-08-17 20:00:32 -07:00
Romain Guy
4f7136c659
Optimized Galaxy
2009-08-17 19:59:27 -07:00
Android (Google) Code Review
e5a07e65c5
Merge change 21655 into eclair
...
* changes:
resolved conflicts for merge of 696b912e to eclair
2009-08-17 19:21:49 -07:00
johnwang
01ae863611
resolved conflicts for merge of 696b912e to eclair
...
modified: telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
modified: telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
modified: telephony/java/com/android/internal/telephony/gsm/GsmDataConnectionTracker.java
modified: telephony/java/com/android/internal/telephony/gsm/GsmServiceStateTracker.java
2009-08-17 19:20:07 -07:00
Android (Google) Code Review
9fb956dbdc
Merge change 21653 into eclair
...
* changes:
Remove global IO context and integrate it into the RS context.
2009-08-17 18:40:38 -07:00
Android (Google) Code Review
238f8fe645
Merge change 21652 into donut
...
* changes:
Make ZoomButtonsController public.
2009-08-17 18:38:53 -07:00
Jason Sams
bc948dedce
Remove global IO context and integrate it into the RS context.
2009-08-17 18:35:48 -07:00
Jack Palevich
38710f4c0e
Make ZoomButtonsController public.
2009-08-17 18:29:52 -07:00
Android (Google) Code Review
437f79b6b7
Merge change 21637 into eclair
...
* changes:
Fix 2058938. As zoom control is uesd in overview mode to switch to reading mode, we also want to hide it after double tap is done.
2009-08-17 18:18:44 -07:00
Grace Kloba
325eabdc85
Remove the hack to include Gears as it is gone now.
2009-08-17 18:17:53 -07:00
Mathias Agopian
dcebf6f65a
fix bug [2021677] egl driver unloaded after eglTerminate() is called
...
refactored the code so that:
- EGL APIs that can be called before or after eglInitialize() will work by loading the drivers first
- make eglGetDisplay() a lot more efficient
- make sure that EGL drivers are loaded in a thread-safe way
- don't unload the drivers upon calling eglTerminate(), they're now never unloaded, since there is no safe way to do it (some thread could be running)
- updated our EGL version to 1.4
- return better error codes if errors happen during initialization
2009-08-17 18:07:06 -07:00
Android (Google) Code Review
6ba69734d8
Merge change 21178 into donut
...
* changes:
Simplified algorithm used to generate the preloaded-classes list. Generated a new preloaded-classes file.
2009-08-17 17:58:05 -07:00
Android (Google) Code Review
30c1738b2c
Merge change 21638 into eclair
...
* changes:
Don't use BoringLayout to display text that has paragraph-style markup.
2009-08-17 17:24:47 -07:00
Suchi Amalapurapu
d9d2576017
Remove dead locks in system process when installing packages
2009-08-17 17:21:56 -07:00
Eric Fischer
86fcef87b8
Don't use BoringLayout to display text that has paragraph-style markup.
...
BoringLayout assumes it doesn't have to do any work to calculate the
line height. In this case, though, there may actually be work to be
done, so have it fall back to StaticLayout to do the more thorough job.
Bug 2051050
2009-08-17 17:16:44 -07:00
Grace Kloba
d7660ccb7b
Fix 2058938. As zoom control is uesd in overview mode to switch to reading
...
mode, we also want to hide it after double tap is done.
2009-08-17 17:13:01 -07:00
Ken Shirriff
3d037078b8
Add new calendar database columns; do not merge (cherry-picked 1fa64)
...
The columns are guestsCanModify, guestsCanInviteOthers,
guestsCanSeeGuests, organizer, and canInviteOthers.
2009-08-17 17:09:24 -07:00
Mike Lockwood
f24d13a28f
BatteryService: Add support for new standard battery voltage and temperature attributes.
...
Plus some cleanup from the previous commit.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-17 19:58:32 -04:00
Android (Google) Code Review
517825091a
Merge change 21576 into eclair
...
* changes:
Support for marshalling pointers / intptr_t in Parcel.
2009-08-17 16:39:43 -07:00
Jim Miller
20ea6ce0e8
Change get/set IsSyncable() methods to static. Add isUserFacing flag to SyncAdapterType. Update api file.
2009-08-17 16:06:15 -07:00
Android (Google) Code Review
d871167284
Merge change 21581 into eclair
...
* changes:
Fix CDMA to startup/shutdown based on apn en/disab
2009-08-17 15:48:01 -07:00
Android (Google) Code Review
736c24a8af
Merge change 21516 into eclair
...
* changes:
Update docs: readFromParcel() is not necessary to make a class support Parcelable.
2009-08-17 15:38:14 -07:00
Bob Lee
9d2d6e14b0
Simplified algorithm used to generate the preloaded-classes list. Generated a new preloaded-classes file.
2009-08-17 15:36:15 -07:00
Andreas Huber
2f10ae08d4
Support for marshalling pointers / intptr_t in Parcel.
...
Some refactoring to eliminate code duplication in Parcel implementation.
2009-08-17 15:31:25 -07:00
Android (Google) Code Review
5fe1afe9cc
Merge change 21603 into eclair
...
* changes:
Fix infinite recursion.
2009-08-17 15:25:23 -07:00
Dianne Hackborn
46407d831e
Fix infinite recursion.
2009-08-17 15:22:29 -07:00
Robert Greenwalt
25a5d3db3f
Fix CDMA to startup/shutdown based on apn en/disab
...
Fixes MMS during wifi.
Also fixes CDMA for ConnectivityManager change.
2009-08-17 15:20:14 -07:00
Android (Google) Code Review
01f750d6fa
Merge change 21587 into eclair
...
* changes:
BatteryService: Remove hard coded power supply names.
2009-08-17 14:26:06 -07:00
Android (Google) Code Review
ace6a5cfc0
Merge change 21408 into donut
...
* changes:
Improved drawing/matrix support in layoutlib
2009-08-17 14:22:24 -07:00
Mike Lockwood
304928fb7e
BatteryService: Remove hard coded power supply names.
...
Search all subdirectories of /sys/class/power_supply and match on
the power supply type instead.
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-08-17 17:20:40 -04:00
Android (Google) Code Review
f5e6a211b1
Merge change 21572 into donut
...
* changes:
Add constants to adjust Vending input and output buffer sizes.
2009-08-17 14:19:42 -07:00
Xavier Ducrohet
2473ef5654
Improved drawing/matrix support in layoutlib
...
- Make the custom Canvas actually replace the original one so that it's used
even by parts of the framework that allocate their own temp Canvas object.
- Better support for Matrix: added support for mapPoint() and mapRect(), and invert()
- Implemented drawBitmap() with a Matrix, and made the paint object not NPE when null.
2009-08-17 14:17:05 -07:00
Fred Quintana
718671b441
fix build breakage
2009-08-17 14:08:37 -07:00
Jason Sams
60fae2af3c
am b93cdae7: Merge change 21570 into eclair
...
Merge commit 'b93cdae749c48a629331c9b039d3a0488752b82f'
* commit 'b93cdae749c48a629331c9b039d3a0488752b82f':
Update fountain and add writable flag to script slots.
2009-08-17 14:02:06 -07:00
Android (Google) Code Review
b93cdae749
Merge change 21570 into eclair
...
* changes:
Update fountain and add writable flag to script slots.
2009-08-17 13:58:20 -07:00
Jason Sams
334ea0c98f
Update fountain and add writable flag to script slots.
2009-08-17 13:56:09 -07:00
Android (Google) Code Review
093918a628
Merge change 21549 into donut
...
* changes:
Import revised translations. DO NOT MERGE
2009-08-17 13:42:24 -07:00
Jasperln
b95277e762
Add constants to adjust Vending input and output buffer sizes.
...
- Needed for Bug: 2058060
2009-08-17 13:29:11 -07:00
Eric Fischer
4d399f7e59
Import revised translations. DO NOT MERGE
2009-08-17 13:13:44 -07:00
Fred Quintana
b5f93cd3c0
am 5e787c42: - add a "isSyncable" flag to a given account/authority pair that indicates whether or not syncs should be attempted for it. - add public methods to get and set this parameter
...
Merge commit '5e787c42f2a6b3afc8ec8320a08d51b2d44b8614'
* commit '5e787c42f2a6b3afc8ec8320a08d51b2d44b8614':
- add a "isSyncable" flag to a given account/authority pair that
2009-08-17 13:07:26 -07:00
Romain Guy
596191889f
am 76c830b2: Merge change 21540 into eclair
...
Merge commit '76c830b229fc21d5ea0ea28955084cc187e25fc6'
* commit '76c830b229fc21d5ea0ea28955084cc187e25fc6':
Fix listview clicks with the trackball.
2009-08-17 13:05:05 -07:00