Commit Graph

6512 Commits

Author SHA1 Message Date
krosaen
04fc2a2949 am d2d6014f: NEW API for SearchManager and Activity to \'triggerSearch\'.
Merge commit 'd2d6014f715f12f6263f61ba3eeb6f8cba6d0fa6'

* commit 'd2d6014f715f12f6263f61ba3eeb6f8cba6d0fa6':
  NEW API for SearchManager and Activity to 'triggerSearch'.
2009-08-18 09:13:58 -07:00
krosaen
d2d6014f71 NEW API for SearchManager and Activity to 'triggerSearch'.
This is pretty much the same thing as startSearch, except it also launches the
query.  We enforce that this can only be done for the package of the app that is
associated with the search mananger (e.g you can't trigger a contacts search
from anywhere).
2009-08-18 08:56:03 -07:00
Xavier Ducrohet
b45282f7b6 am 1a8c1599: am c1c432f5: Merge change 21241 into donut
Merge commit '1a8c1599de630ae4199b71cb3eca75d7db9c40d6'

* commit '1a8c1599de630ae4199b71cb3eca75d7db9c40d6':
  Layoutlib now uses the dimen status_bar_height instead of hard-coded value
2009-08-18 08:48:56 -07:00
Jean-Michel Trivi
b176f362cd am 0deb41ab: am 0950c5de: Merge change 21226 into donut
Merge commit '0deb41abc68ff05b6c2e06175982f9d22a5abd92'

* commit '0deb41abc68ff05b6c2e06175982f9d22a5abd92':
  Fix bug 2046705 where the output of the speech synthesizer is too low.
2009-08-18 08:48:53 -07:00
Jean-Baptiste Queru
dc53a3c272 am 969c2eaa: am c8ab08aa: Merge change 21124 into donut
Merge commit '969c2eaa3ac2501931b0ce67d831262e6f3d6cf6'

* commit '969c2eaa3ac2501931b0ce67d831262e6f3d6cf6':
  Add license-related files
2009-08-18 08:48:49 -07:00
Scott Main
47c5f34afc am 2685d3b8: am ba52b3e0: Merge change 21149 into donut
Merge commit '2685d3b85b3ad5fcb5362abdfb9037fc89deb714'

* commit '2685d3b85b3ad5fcb5362abdfb9037fc89deb714':
  DOCS ONLY.
2009-08-18 08:48:46 -07:00
Grace Kloba
06dbd41941 am 9befde04: Merge change 21648 into eclair
Merge commit '9befde04c3efe82317bf06cb0d841752a71de62c'

* commit '9befde04c3efe82317bf06cb0d841752a71de62c':
  Remove the hack to include Gears as it is gone now.
2009-08-18 08:48:43 -07:00
Xavier Ducrohet
1a8c1599de am c1c432f5: Merge change 21241 into donut
Merge commit 'c1c432f57b782ed9d8d65be7ea1bee1e1d7d7839' into eclair

* commit 'c1c432f57b782ed9d8d65be7ea1bee1e1d7d7839':
  Layoutlib now uses the dimen status_bar_height instead of hard-coded value
2009-08-18 08:44:59 -07:00
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
7bb9150435 am bd022f42: Bluetooth: API change.
Merge commit 'bd022f423a33f0794bb53e5b0720da2d67e4631c'

* commit 'bd022f423a33f0794bb53e5b0720da2d67e4631c':
  Bluetooth: API change.
2009-08-18 08:40:51 -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
Daniel Sandler
7d010d9067 am 82e7408b: Merge change 21326 into eclair
Merge commit '82e7408be29c6c8c6ed80887ea97f48f38b3223d'

* commit '82e7408be29c6c8c6ed80887ea97f48f38b3223d':
  aapt now attempts to process all assets even if some are malformed.
2009-08-18 07:24:10 -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
Mike Lockwood
c37770cfff am 8735d553: Merge change 21601 into eclair
Merge commit '8735d553c58c2ff445798a26de78e89e34964d08'

* commit '8735d553c58c2ff445798a26de78e89e34964d08':
  BatteryService: Add support for new standard battery voltage and temperature attributes.
2009-08-18 06:07:33 -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
Mathias Agopian
d7716266f9 am 6e6c7bbc: Merge change 21646 into eclair
Merge commit '6e6c7bbce01a7c7feabeab7b77632515a54e79d9'

* commit '6e6c7bbce01a7c7feabeab7b77632515a54e79d9':
  fix bug [2021677] egl driver unloaded after eglTerminate() is called
2009-08-18 00:31:38 -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
0bd6723652 am 8df8b2b4: Allow wallpapers to get touch events.
Merge commit '8df8b2b405c60cacf7a66c4e2ca078dd3d7ec7bd'

* commit '8df8b2b405c60cacf7a66c4e2ca078dd3d7ec7bd':
  Allow wallpapers to get touch events.
2009-08-17 22:37:47 -07:00
Romain Guy
aa7c305624 am 948ee251: Merge change 21660 into eclair
Merge commit '948ee251276e1ce7f5c5517b24bf88a75e99f160'

* commit '948ee251276e1ce7f5c5517b24bf88a75e99f160':
  Optimized Galaxy
2009-08-17 22:37:44 -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
johnwang
d80afe63d2 am e5a07e65: Merge change 21655 into eclair
Merge commit 'e5a07e65c5f0bf8a4374934f6a3d85713cb6161b'

* commit 'e5a07e65c5f0bf8a4374934f6a3d85713cb6161b':
  Use dataRoaming in dataConnectionTracker.
2009-08-17 19:26:43 -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
Jason Sams
7b26ce8c15 am 9fb956db: Merge change 21653 into eclair
Merge commit '9fb956dbdce14e38e38cb45a14610a8c822cbbf0'

* commit '9fb956dbdce14e38e38cb45a14610a8c822cbbf0':
  Remove global IO context and integrate it into the RS context.
2009-08-17 18:45:15 -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
Jason Sams
bc948dedce Remove global IO context and integrate it into the RS context. 2009-08-17 18:35:48 -07:00
Grace Kloba
fd43fae06f am 437f79b6: Merge change 21637 into eclair
Merge commit '437f79b6b76418c70b53d7db8af80c7a3dee333b'

* commit '437f79b6b76418c70b53d7db8af80c7a3dee333b':
  Fix 2058938. As zoom control is uesd in overview mode to switch to reading
2009-08-17 18:21:48 -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
Eric Fischer
7ae01943aa am 30c1738b: Merge change 21638 into eclair
Merge commit '30c1738b2cd9e59263a4eecc4e666f7a3cb35b03'

* commit '30c1738b2cd9e59263a4eecc4e666f7a3cb35b03':
  Don't use BoringLayout to display text that has paragraph-style markup.
2009-08-17 17:28:22 -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
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
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
0e4e11b7ca Merge change 21615
* changes:
  Add new calendar database columns.
2009-08-17 16:47:04 -07:00
Ken Shirriff
1fa642826d Add new calendar database columns.
The columns are guestsCanModify, guestsCanInviteOthers,
guestsCanSeeGuests, organizer, and canInviteOthers.
2009-08-17 16:43:53 -07:00
Andreas Huber
b4d28aef3c am 51782509: Merge change 21576 into eclair
Merge commit '517825091a2fdbdb20dc569184f2736c78ecc1bd'

* commit '517825091a2fdbdb20dc569184f2736c78ecc1bd':
  Support for marshalling pointers / intptr_t in Parcel.
2009-08-17 16:42:48 -07: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
a4d18dff39 am 20ea6ce0: Change get/set IsSyncable() methods to static. Add isUserFacing flag to SyncAdapterType. Update api file.
Merge commit '20ea6ce0e8a758cc5c33eb2577495bf9f4dce16e'

* commit '20ea6ce0e8a758cc5c33eb2577495bf9f4dce16e':
  Change get/set IsSyncable() methods to static.  Add isUserFacing flag to SyncAdapterType. Update api file.
2009-08-17 16:13:13 -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
Robert Greenwalt
d189896b2f am d8711672: Merge change 21581 into eclair
Merge commit 'd87116728447eef3b73dd3b87074a5d12b532261'

* commit 'd87116728447eef3b73dd3b87074a5d12b532261':
  Fix CDMA to startup/shutdown based on apn en/disab
2009-08-17 15:52:08 -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
Nick Pelly
f60492ca24 am 736c24a8: Merge change 21516 into eclair
Merge commit '736c24a8af268d014163f4687750baf18664e690'

* commit '736c24a8af268d014163f4687750baf18664e690':
  Update docs: readFromParcel() is not necessary to make a class support
2009-08-17 15:42:19 -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