7503 Commits

Author SHA1 Message Date
Steve Block
478ac27782 am b84138c7: Merge change 23806 into eclair
Merge commit 'b84138c72c94f189d4656451097b90f86d751731' into eclair-plus-aosp

* commit 'b84138c72c94f189d4656451097b90f86d751731':
  Handle security exception when Geolocation registers with system location service in DumpRenderTree.
2009-09-03 09:26:05 -07:00
Android (Google) Code Review
b84138c72c Merge change 23806 into eclair
* changes:
  Handle security exception when Geolocation registers with system location service in DumpRenderTree.
2009-09-03 09:24:15 -07:00
Robert Greenwalt
1cfe4b2a75 am e8f605ff: Merge change 23761 into eclair
Merge commit 'e8f605ff44664d0ecc9a5a24886176ef447db2a9' into eclair-plus-aosp

* commit 'e8f605ff44664d0ecc9a5a24886176ef447db2a9':
  Fix compilation of add-resource tag.
2009-09-03 09:11:10 -07:00
Android (Google) Code Review
e8f605ff44 Merge change 23761 into eclair
* changes:
  Fix compilation of add-resource tag.
2009-09-03 09:08:24 -07:00
Daniel Sandler
7a1140ee89 am 47cec9fa: Merge change 23817 into eclair
Merge commit '47cec9fafbef30b817ac0a8af510ac35e09ea966' into eclair-plus-aosp

* commit '47cec9fafbef30b817ac0a8af510ac35e09ea966':
  Fix http://b/issue?id=2096107 (cosmetic issue for menus in WVGA)
2009-09-03 08:51:35 -07:00
Android (Google) Code Review
47cec9fafb Merge change 23817 into eclair
* changes:
  Fix http://b/issue?id=2096107 (cosmetic issue for menus in WVGA)
2009-09-03 08:49:56 -07:00
Daniel Sandler
0824096822 Fix http://b/issue?id=2096107 (cosmetic issue for menus in WVGA)
The divider 9-patch was rendered quite wrongly.  I repaired it to remove the
gap described in the bug report, as well as to match color with the horizontal
divider (divider_horizontal_bright.9.png).
2009-09-03 11:46:06 -04:00
Eric Laurent
6e1e1c6b78 am 1a3af62b: Merge change 23801 into eclair
Merge commit '1a3af62bfb3583ac2fece18523927587b6b6a277' into eclair-plus-aosp

* commit '1a3af62bfb3583ac2fece18523927587b6b6a277':
  fix issue 2096657: Sholes: residue shutter sound heard ONCE while taking a picture AFTER the volume is turned off.
2009-09-03 08:02:53 -07:00
Eric Laurent
7838887af4 am cabd01f4: Merge change 23798 into eclair
Merge commit 'cabd01f42afd0661d6a29217c62353c2eae3149a' into eclair-plus-aosp

* commit 'cabd01f42afd0661d6a29217c62353c2eae3149a':
  Fix issue 2097083: STREAM_SYSTEM should be at max volume.
2009-09-03 08:02:46 -07:00
Android (Google) Code Review
1a3af62bfb Merge change 23801 into eclair
* changes:
  fix issue 2096657: Sholes: residue shutter sound heard ONCE while taking a picture AFTER the volume is turned off.
2009-09-03 08:01:09 -07:00
Android (Google) Code Review
cabd01f42a Merge change 23798 into eclair
* changes:
  Fix issue 2097083: STREAM_SYSTEM should be at max volume.
2009-09-03 08:00:30 -07:00
Eric Laurent
a160c6ea05 fix issue 2096657: Sholes: residue shutter sound heard ONCE while taking a picture AFTER the volume is turned off.
Do not ramp volume if the first frame of a track is processed after the track was stopped.
In the case of very short sounds, the track stop request can be received by AudioFlinger just after the start request before the first frame is mixed by AudioMixer. In this case, the track is already in stopped state and initial volume is applied with a ramp for the first frame processed which should not be the case: initial volume change is always applied immediatelly.
2009-09-03 04:11:18 -07:00
Steve Block
4afcd2e9d6 Handle security exception when Geolocation registers with system location service in DumpRenderTree. 2009-09-03 12:02:20 +01:00
Wei Huang
80a268bdc9 am 558340f2: Merge change 23793 into eclair
Merge commit '558340f2143b5efe4bc14b901ae1dc1b8cec7901' into eclair-plus-aosp

* commit '558340f2143b5efe4bc14b901ae1dc1b8cec7901':
  add conditional verbose logging for when sending a SMS message.
2009-09-03 01:35:35 -07:00
Android (Google) Code Review
558340f214 Merge change 23793 into eclair
* changes:
  add conditional verbose logging for when sending a SMS message.
2009-09-03 01:33:44 -07:00
Wei Huang
8be9ccdc5c add conditional verbose logging for when sending a SMS message.
Change-Id: I969e4cbee87ce5a42eaf5809292442e90db294cf
2009-09-03 01:29:34 -07:00
Eric Laurent
9d85d5adf9 Fix issue 2097083: STREAM_SYSTEM should be at max volume.
Changed default volume for STREAM_SYSTEM and STREAM_SYSTEM_ENFORCED to the maximum value.
2009-09-03 01:28:26 -07:00
Dianne Hackborn
f6d2ccc19f am 85644d78: Really fix issue #:2097189 can\'t set custom wallpaper
Merge commit '85644d78894b66fa2903fb012b5122185767d1c5' into eclair-plus-aosp

* commit '85644d78894b66fa2903fb012b5122185767d1c5':
  Really fix issue #:2097189 can't set custom wallpaper
2009-09-03 00:29:09 -07:00
Dianne Hackborn
85644d7889 Really fix issue #:2097189 can't set custom wallpaper
Change-Id: Id0775b6c6716775c5da6f4fadf696571019279cc
2009-09-03 00:23:04 -07:00
Jeff Sharkey
bc0f52ea0b am 0c36a517: Add private API for data with presence.
Merge commit '0c36a517cd01a7112460a96f9f0fa2badf8f7015' into eclair-plus-aosp

* commit '0c36a517cd01a7112460a96f9f0fa2badf8f7015':
  Add private API for data with presence.
2009-09-02 23:20:48 -07:00
Dianne Hackborn
3df6afc153 am e3c393d3: Merge change 23787 into eclair
Merge commit 'e3c393d3d14dab5b1eab37d2c52b7283df253f7f' into eclair-plus-aosp

* commit 'e3c393d3d14dab5b1eab37d2c52b7283df253f7f':
  Fix issue #2097313: Latin IME crashes first use
2009-09-02 23:19:07 -07:00
Jeff Sharkey
0c36a517cd Add private API for data with presence. 2009-09-02 23:16:44 -07:00
Android (Google) Code Review
e3c393d3d1 Merge change 23787 into eclair
* changes:
  Fix issue #2097313: Latin IME crashes first use
2009-09-02 23:11:16 -07:00
Dianne Hackborn
cc27870098 Fix issue #2097313: Latin IME crashes first use
Change-Id: I50c48b66aff5aff42e71058591d20775eba73fed
2009-09-02 23:08:45 -07:00
Libin Tang
13cb90a745 am e2c9187b: Merge change 23782 into eclair
Merge commit 'e2c9187b993a652fa8fdad516461ab66caa96cb4' into eclair-plus-aosp

* commit 'e2c9187b993a652fa8fdad516461ab66caa96cb4':
  Fix the issue that dialing *86 during call, the dialing voicemail screen is not shown.
2009-09-02 22:47:49 -07:00
Dianne Hackborn
83c36fcbd4 am 3bb9c6d1: Merge change 23774 into eclair
Merge commit '3bb9c6d1f5b252dc3ed7eb069ff5aeabd2b02548' into eclair-plus-aosp

* commit '3bb9c6d1f5b252dc3ed7eb069ff5aeabd2b02548':
  Fix issue #2097189: can't set custom wallpaper
2009-09-02 22:47:42 -07:00
Dianne Hackborn
03050e8cd2 am bdd52b26: Fix issue #2097060: Screen all messed up when setup wizard finished
Merge commit 'bdd52b264af8f562dd368d40b66771c88d45127f' into eclair-plus-aosp

* commit 'bdd52b264af8f562dd368d40b66771c88d45127f':
  Fix issue #2097060: Screen all messed up when setup wizard finished
2009-09-02 22:47:36 -07:00
Android (Google) Code Review
e2c9187b99 Merge change 23782 into eclair
* changes:
  Fix the issue that dialing *86 during call, the dialing voicemail screen is not shown.
2009-09-02 22:29:08 -07:00
Android (Google) Code Review
3bb9c6d1f5 Merge change 23774 into eclair
* changes:
  Fix issue #2097189: can't set custom wallpaper
2009-09-02 22:20:29 -07:00
Dianne Hackborn
bdd52b264a Fix issue #2097060: Screen all messed up when setup wizard finished
The new code to rebuild the window list was missing some app tokens.
Also there were a few other smaller bugs floating around.

Change-Id: I7734917af0b76ee4aa304e6a5321401d87640f89
2009-09-02 21:54:18 -07:00
Dianne Hackborn
5e802fbb89 Fix issue #2097189: can't set custom wallpaper
My deadlock fix was only half done.

Change-Id: If9f286030894a60cd71851fb784bb61045f08185
2009-09-02 21:53:30 -07:00
Libin Tang
aace799b9c Fix the issue that dialing *86 during call, the dialing voicemail screen is not shown.
The change fixes the issue that dialing *86 during the call, the dialing voicemail
screen is not shown, instead it shows feature code screen.

For CDMA, when flash is sent to the network, there is no response from the
network to indicate if the feature code is completed or not. This is different
from MMI code in GSM network. So it's confusing to show any UI to indicate MMI
(feature code) for CDMA.

The change is to remove the feature code handling in CDMAPone, and handle the
feature code dialing the same way as the 3 way call dialing. Basically, when
feature code is dialed, the dialing screen will be shown.
2009-09-02 20:48:02 -07:00
Tammo Spalink
8521dca69b am fb16e5cc: Merge change 23607 into eclair
Merge commit 'fb16e5ccdb230a11cbbbfd17d323db7b88395c2f' into eclair-plus-aosp

* commit 'fb16e5ccdb230a11cbbbfd17d323db7b88395c2f':
  Reject (NAK) CDMA SMS with unknown teleservice ids.
2009-09-02 20:30:43 -07:00
Android (Google) Code Review
fb16e5ccdb Merge change 23607 into eclair
* changes:
  Reject (NAK) CDMA SMS with unknown teleservice ids.
2009-09-02 20:29:09 -07:00
Scott Main
438fdfe833 am 8f99b524: am b6b25d63: Merge change 23126 into donut
Merge commit '8f99b52484369a3a9221733c9817f6c09ba1ec85' into eclair-plus-aosp

* commit '8f99b52484369a3a9221733c9817f6c09ba1ec85':
  docs only.
2009-09-02 20:24:09 -07:00
Dmitri Plotnikov
9d6783e774 am 622da682: Merge change 23765 into eclair
Merge commit '622da6829f11f0cacdbd6fe3b58f230d98115ed5' into eclair-plus-aosp

* commit '622da6829f11f0cacdbd6fe3b58f230d98115ed5':
  [Issue 2087123] Suppressing all exception when trying to load a photo for the in-call UI
2009-09-02 20:24:04 -07:00
Scott Main
8f99b52484 am b6b25d63: Merge change 23126 into donut
Merge commit 'b6b25d63df8dd873c60ab056e5b0e0eda167cfb1' into eclair

* commit 'b6b25d63df8dd873c60ab056e5b0e0eda167cfb1':
  docs only.
2009-09-02 20:21:42 -07:00
Android (Google) Code Review
b6b25d63df Merge change 23126 into donut
* changes:
  docs only. add documentation about zipalign and new auto-signing procedures for Ant
2009-09-02 20:19:39 -07:00
Scott Main
23110e49b3 docs only.
add documentation about zipalign and new auto-signing
procedures for Ant

Change-Id: Ia66f5a7af58f77e52b3a5c26cb9972d317c2c42c
2009-09-02 20:17:16 -07:00
Android (Google) Code Review
622da6829f Merge change 23765 into eclair
* changes:
  [Issue 2087123] Suppressing all exception when trying to load a photo for the in-call UI
2009-09-02 19:35:07 -07:00
Dirk Dougherty
f2b3fcf5a7 am 5f7cee89: am 2a2058f5: Merge change 23762 into donut
Merge commit '5f7cee89ca6670cefe91192e364037ee6ce39b19' into eclair-plus-aosp

* commit '5f7cee89ca6670cefe91192e364037ee6ce39b19':
  Add updated API diff based on 4.xml.
2009-09-02 19:34:00 -07:00
Dirk Dougherty
5f7cee89ca am 2a2058f5: Merge change 23762 into donut
Merge commit '2a2058f5a31e3bace3d0284fb1259a9ddcbec3a5' into eclair

* commit '2a2058f5a31e3bace3d0284fb1259a9ddcbec3a5':
  Add updated API diff based on 4.xml.
2009-09-02 19:32:02 -07:00
Android (Google) Code Review
2a2058f5a3 Merge change 23762 into donut
* changes:
  Add updated API diff based on 4.xml.
2009-09-02 19:29:45 -07:00
Dirk Dougherty
2fcba6125f am 618ded26: am a6602f1f: Add docs for SDK update. Add redirects for preview files. Manually integrate a few doc changes from cupcake.
Merge commit '618ded26c61afbf907e72b4568a4f4f1c6c287a7' into eclair-plus-aosp

* commit '618ded26c61afbf907e72b4568a4f4f1c6c287a7':
  Add docs for SDK update.
2009-09-02 19:16:26 -07:00
Jason Sams
8fb913661c am e00d660a: Merge change 23584 into eclair
Merge commit 'e00d660aba91a7a682f83b2e0216296b0f3cca64' into eclair-plus-aosp

* commit 'e00d660aba91a7a682f83b2e0216296b0f3cca64':
  Simple app to create a gl2 context and dump the strings.
2009-09-02 19:16:20 -07:00
Dirk Dougherty
618ded26c6 am a6602f1f: Add docs for SDK update. Add redirects for preview files. Manually integrate a few doc changes from cupcake.
Merge commit 'a6602f1fe4590e48c760f21ce29a92629240c463' into eclair

* commit 'a6602f1fe4590e48c760f21ce29a92629240c463':
  Add docs for SDK update.
2009-09-02 19:14:24 -07:00
Dmitri Plotnikov
ceb7979636 [Issue 2087123] Suppressing all exception when trying to load a photo for the in-call UI 2009-09-02 19:13:58 -07:00
Android (Google) Code Review
e00d660aba Merge change 23584 into eclair
* changes:
  Simple app to create a gl2 context and dump the strings.
2009-09-02 19:13:10 -07:00
Dirk Dougherty
a6602f1fe4 Add docs for SDK update.
Add redirects for preview files.
Manually integrate a few doc changes from cupcake.

Change-Id:I524d7dbf929371ee501599229894640660f352ce
2009-09-02 19:08:28 -07:00
Dirk Dougherty
1f58a351d9 Add updated API diff based on 4.xml.
Change-Id: Ic34f796c8308e2111e2a3dfaad5e27da2ca8b001
2009-09-02 18:28:55 -07:00