Commit Graph

5306 Commits

Author SHA1 Message Date
Dianne Hackborn
099c78fcc0 am 7f3fb7de: Merge change 26130 into eclair
Merge commit '7f3fb7dec2afdffa37e3067ca8a5b9d01809a9ce' into eclair-plus-aosp

* commit '7f3fb7dec2afdffa37e3067ca8a5b9d01809a9ce':
  Turn animations on by default.
2009-09-21 17:40:06 -07:00
Android (Google) Code Review
350ef93bca Merge change 26130 into eclair
* changes:
  Turn animations on by default.
2009-09-21 20:34:30 -04:00
Jaikumar Ganesh
056d92f21d am 9197081f: Merge change 26275 into eclair
Merge commit '9197081f8feca110455740874e06e05771f462c8' into eclair-plus-aosp

* commit '9197081f8feca110455740874e06e05771f462c8':
  Send the address of the device with the UUID intent.
2009-09-21 17:10:46 -07:00
Yong Zhang
8fa0dd0126 am 6e81a40d: Merge change 26286 into eclair
Merge commit '6e81a40d078269258d75bf22dd00a9dc22f4d0b9' into eclair-plus-aosp

* commit '6e81a40d078269258d75bf22dd00a9dc22f4d0b9':
  Resolve race conditions with disconnect of CDMA data and airplane mode
2009-09-21 17:10:34 -07:00
Android (Google) Code Review
90a0e82db5 Merge change 26275 into eclair
* changes:
  Send the address of the device with the UUID intent.
2009-09-21 20:04:54 -04:00
Android (Google) Code Review
14e02f02cf Merge change 26286 into eclair
* changes:
  Resolve race conditions with disconnect of CDMA data and airplane mode
2009-09-21 20:01:55 -04:00
Jaikumar Ganesh
b10d6a958f am a7719af3: Merge change 26217 into eclair
Merge commit 'a7719af31290bea50d822b535b6a886ba7a88097' into eclair-plus-aosp

* commit 'a7719af31290bea50d822b535b6a886ba7a88097':
  Cache the remote device's service channel.
2009-09-21 16:09:57 -07:00
Jack Palevich
b2e7900839 am 5222a957: Merge change 26270 into eclair
Merge commit '5222a9571ea2538c989608d376ac71eabe0f09d4' into eclair-plus-aosp

* commit '5222a9571ea2538c989608d376ac71eabe0f09d4':
  Fix GLSurfaceView to sync surfaceDestroyed with GL rendering thread
2009-09-21 16:09:45 -07:00
Android (Google) Code Review
c2cd3f21ca Merge change 26217 into eclair
* changes:
  Cache the remote device's service channel.
2009-09-21 19:00:40 -04:00
Android (Google) Code Review
f9b8d70aa2 Merge change 26270 into eclair
* changes:
  Fix GLSurfaceView to sync surfaceDestroyed with GL rendering thread
2009-09-21 19:00:37 -04:00
Wu-cheng Li
a5d3f7f0a1 am 36322db5: Add focus API and FLASH_MODE_VIDEO_LIGHT.
Merge commit '36322db5752c7ec196f59ba94abe5d5a63cc19f5' into eclair-plus-aosp

* commit '36322db5752c7ec196f59ba94abe5d5a63cc19f5':
  Add focus API and FLASH_MODE_VIDEO_LIGHT.
2009-09-21 15:40:13 -07:00
Andy McFadden
ddda6b6b56 am dbe8bad1: Merge change 26253 into eclair
Merge commit 'dbe8bad1d2d68e2f5947ff0a8347dbb498e17ede' into eclair-plus-aosp

* commit 'dbe8bad1d2d68e2f5947ff0a8347dbb498e17ede':
  Work around gcc 4.0.3 bug.
2009-09-21 15:22:06 -07:00
Android (Google) Code Review
7e986a795f Merge change 26253 into eclair
* changes:
  Work around gcc 4.0.3 bug.
2009-09-21 18:12:31 -04:00
Wei Huang
7706678aea am 31a12429: Merge change 26254 into eclair
Merge commit '31a12429b77e87b5047589d251642b975ad35b9a' into eclair-plus-aosp

* commit '31a12429b77e87b5047589d251642b975ad35b9a':
  fix bug 2134685: fix tests for PhoneNumberUtilsTest.
2009-09-21 14:50:01 -07:00
Android (Google) Code Review
8cf378f7b3 Merge change 26254 into eclair
* changes:
  fix bug 2134685: fix tests for PhoneNumberUtilsTest.
2009-09-21 17:43:20 -04:00
Andy McFadden
2944a2b360 Work around gcc 4.0.3 bug.
This appears to fix the sim-eng build on the gDapper build machines.

Basic problem is that LayerBuffer::OverlaySource has a constructor that
calls SurfaceFlinger.signalEvent().  SurfaceFlinger lists LayerBuffer
as a friend, but that's not enough to convince gcc that the embedded
OverlaySource class is also a friend.  I don't see a way to make them
friendly, so I marked signalEvent() as public.
2009-09-21 14:33:20 -07:00
Yu Shan Emily Lau
1dc2f22294 am c2f97178: Merge change 26111 into eclair
Merge commit 'c2f97178acaf9c406067b9b89776b87ddf9c8558' into eclair-plus-aosp

* commit 'c2f97178acaf9c406067b9b89776b87ddf9c8558':
  Added a workaround to clear the browser cache.
2009-09-21 14:04:26 -07:00
Android (Google) Code Review
e4a632af0e Merge change 26111 into eclair
* changes:
  Added a workaround to clear the browser cache.
2009-09-21 16:58:35 -04:00
Mark Wagner
ee908aa1f4 am fe6104fb: When manually setting the uri pass it through to the badge widget.
Merge commit 'fe6104fbfbba0434e78f9e21f460c71cddfe8449' into eclair-plus-aosp

* commit 'fe6104fbfbba0434e78f9e21f460c71cddfe8449':
  When manually setting the uri pass it through to the badge widget.
2009-09-21 13:53:37 -07:00
Jeff Sharkey
918acb9d76 am 88a83d3f: Update getDisplayLabel() API to support new types.
Merge commit '88a83d3f108dcf01443b241439e14eedbd9615f5' into eclair-plus-aosp

* commit '88a83d3f108dcf01443b241439e14eedbd9615f5':
  Update getDisplayLabel() API to support new types.
2009-09-21 13:36:58 -07:00
Christopher Tate
4e5f696f10 am 9568fb21: Merge change 26164 into eclair
Merge commit '9568fb21766684083ec256303a6ed7949ada7d9f' into eclair-plus-aosp

* commit '9568fb21766684083ec256303a6ed7949ada7d9f':
  Reset backup tracking in response to transport data-wipe notification
2009-09-21 13:21:40 -07:00
Android (Google) Code Review
24aa451138 Merge change 26164 into eclair
* changes:
  Reset backup tracking in response to transport data-wipe notification
2009-09-21 16:13:48 -04:00
Leon Scroggins
3ab54b8bd1 am d3997e55: Make scrolling textfields work better in the browser.
Merge commit 'd3997e556eb0509248c72b668c2cd955b7842b55' into eclair-plus-aosp

* commit 'd3997e556eb0509248c72b668c2cd955b7842b55':
  Make scrolling textfields work better in the browser.
2009-09-21 13:11:45 -07:00
Jaikumar Ganesh
3813093c80 am 163be61c: Merge change 25412 into eclair
Merge commit '163be61ce5ea85181da3a8908adaa63b5ff56a7e' into eclair-plus-aosp

* commit '163be61ce5ea85181da3a8908adaa63b5ff56a7e':
  Make ParcelUuid helper functions consistent.
2009-09-21 12:46:08 -07:00
Chia-chi Yeh
680e945278 am e3578d60: Merge change 26190 into eclair
Merge commit 'e3578d60c6fbe17c116048a6b4de60b0ac42961f' into eclair-plus-aosp

* commit 'e3578d60c6fbe17c116048a6b4de60b0ac42961f':
  KeyStore: rename scan() to saw().
2009-09-21 12:45:58 -07:00
Android (Google) Code Review
5f61d2f647 Merge change 25412 into eclair
* changes:
  Make ParcelUuid helper functions consistent.
2009-09-21 15:37:21 -04:00
Android (Google) Code Review
bb8f33277a Merge change 26190 into eclair
* changes:
  KeyStore: rename scan() to saw().
2009-09-21 15:06:18 -04:00
Chia-chi Yeh
ec102d90d8 am e045e129: Merge change 26188 into eclair
Merge commit 'e045e129a98ae3a4e396abe377f1b00dff6a2460' into eclair-plus-aosp

* commit 'e045e129a98ae3a4e396abe377f1b00dff6a2460':
  keystore: rename scan() to saw().
2009-09-21 12:04:55 -07:00
Leon Scroggins
247f375e67 am 83f7bd0a: Merge change 26170 into eclair
Merge commit '83f7bd0a9bb563e18fc16fe60b923d65accd9dfe' into eclair-plus-aosp

* commit '83f7bd0a9bb563e18fc16fe60b923d65accd9dfe':
  Always interpret (0,0) scrolls as top of title bar.
2009-09-21 12:00:00 -07:00
Android (Google) Code Review
b14d269317 Merge change 26188 into eclair
* changes:
  keystore: rename scan() to saw().
2009-09-21 14:58:43 -04:00
Chia-chi Yeh
1cdc2a4b81 keystore: rename scan() to saw(). 2009-09-22 02:57:52 +08:00
Evan Millar
6babc84ca7 am 3242cbbf: Merge change 26181 into eclair
Merge commit '3242cbbf82b515397151522d0a6228403e9eec23' into eclair-plus-aosp

* commit '3242cbbf82b515397151522d0a6228403e9eec23':
  Make background color pure black.
2009-09-21 11:54:58 -07:00
Android (Google) Code Review
afd6d3d4a8 Merge change 26170 into eclair
* changes:
  Always interpret (0,0) scrolls as top of title bar.
2009-09-21 14:53:19 -04:00
Android (Google) Code Review
e9410afff5 Merge change 26181 into eclair
* changes:
  Make background color pure black.
2009-09-21 14:47:52 -04:00
Daisuke Miyakawa
06887754a6 am a13ccc90: Merge change 26175 into eclair
Merge commit 'a13ccc908ee54d6c606b5a73b3a57e4dda13e44a' into eclair-plus-aosp

* commit 'a13ccc908ee54d6c606b5a73b3a57e4dda13e44a':
  Fix test for phone number comparation. Now that there are two algorithms, we should consider them in Java layer.
2009-09-21 10:58:23 -07:00
Wink Saville
76acbf5b5c am 8451c25b: Merge change 26171 into eclair
Merge commit '8451c25b919ecef694d293d6bbd84d08d5fb60be' into eclair-plus-aosp

* commit '8451c25b919ecef694d293d6bbd84d08d5fb60be':
  Fix several CDMA call collision cases
2009-09-21 10:58:13 -07:00
Android (Google) Code Review
fde637477f Merge change 26175 into eclair
* changes:
  Fix test for phone number comparation. Now that there are two algorithms, we should consider them in Java layer. Uguu.
2009-09-21 13:52:02 -04:00
Android (Google) Code Review
f46ca7fa8c Merge change 26171 into eclair
* changes:
  Fix several CDMA call collision cases
2009-09-21 13:50:27 -04:00
Grace Kloba
5080d7b4eb am f8d8b46a: Add a tip toast for double tap.
Merge commit 'f8d8b46a2c684d51cd661a9d479dd895420a90b2' into eclair-plus-aosp

* commit 'f8d8b46a2c684d51cd661a9d479dd895420a90b2':
  Add a tip toast for double tap.
2009-09-21 10:11:54 -07:00
Megha Joshi
42fc4a1e99 am d5ffa12d: Merge change 26127 into eclair
Merge commit 'd5ffa12dea99233e6a75048d82ad4daf0373191f' into eclair-plus-aosp

* commit 'd5ffa12dea99233e6a75048d82ad4daf0373191f':
  Uri encode phone number before passing it to query.
2009-09-21 10:11:44 -07:00
Wei Huang
475fba9173 am 5ef75b68: Merge change 26125 into eclair
Merge commit '5ef75b68fe6ed46213e3499910f389d2c6fda85a' into eclair-plus-aosp

* commit '5ef75b68fe6ed46213e3499910f389d2c6fda85a':
  make PhoneNumberUtils.compareLoosely use MIN_MATCH of 7 instead of 5.
2009-09-21 10:06:36 -07:00
Android (Google) Code Review
4654d31432 Merge change 26127 into eclair
* changes:
  Uri encode phone number before passing it to query.
2009-09-21 13:05:10 -04:00
Dmitri Plotnikov
7500a58b89 am 483a599c: Merge change 25954 into eclair
Merge commit '483a599c0330da087502b5b75bbe82fe8236cbec' into eclair-plus-aosp

* commit '483a599c0330da087502b5b75bbe82fe8236cbec':
  Moving DISPLAY_NAME to column "data1" to keep it "aligned" with other data types.
2009-09-21 10:01:26 -07:00
Cary Clark
52c265af42 am 3f06a9b9: Merge change 26150 into eclair
Merge commit '3f06a9b931f6e3d12215a959f427bc373dacf7cc' into eclair-plus-aosp

* commit '3f06a9b931f6e3d12215a959f427bc373dacf7cc':
  Account for find dialog height in content height
2009-09-21 10:01:16 -07:00
Chia-chi Yeh
9467f7242c am 596edaf3: Merge change 26156 into eclair
Merge commit '596edaf343b5b3b39b0a32d9a61210cdf6f6cfa0' into eclair-plus-aosp

* commit '596edaf343b5b3b39b0a32d9a61210cdf6f6cfa0':
  keystore: exclude builds for simulator.
2009-09-21 10:01:06 -07:00
Android (Google) Code Review
9bce0c61cb Merge change 26125 into eclair
* changes:
  make PhoneNumberUtils.compareLoosely use MIN_MATCH of 7 instead of 5.
2009-09-21 12:59:57 -04:00
Android (Google) Code Review
819e3cd278 Merge change 25954 into eclair
* changes:
  Moving DISPLAY_NAME to column "data1" to keep it "aligned" with other data types.
2009-09-21 12:54:20 -04:00
Android (Google) Code Review
773ee615cf Merge change 26150 into eclair
* changes:
  Account for find dialog height in content height
2009-09-21 12:53:04 -04:00
Android (Google) Code Review
c204933821 Merge change 26156 into eclair
* changes:
  keystore: exclude builds for simulator.
2009-09-21 12:47:41 -04:00
Chia-chi Yeh
c5dbc5e98a keystore: exclude builds for simulator. 2009-09-22 00:43:13 +08:00