Commit Graph

5478 Commits

Author SHA1 Message Date
Dirk Dougherty
9521fc0f17 am 61c29c29: Merge change Ieeb0b251 into eclair-sdk
Merge commit '61c29c293adf0ea4e28eefafbd1be948eb2d85c8' into eclair

* commit '61c29c293adf0ea4e28eefafbd1be948eb2d85c8':
  doc change: incorporate comments on SDK docs and structure.
2009-10-22 18:02:54 -07:00
Android (Google) Code Review
e46a8427dd Merge change Ieeb0b251 into eclair-sdk
* changes:
  doc change: incorporate comments on SDK docs and structure.
2009-10-22 20:53:38 -04:00
Fred Quintana
c5e481aa75 am f4520f3e: Merge change I9161f53d into eclair-sdk
Merge commit 'f4520f3e03e120ed109a579c1936994b142523c3' into eclair

* commit 'f4520f3e03e120ed109a579c1936994b142523c3':
  update account manager javadoc
2009-10-22 17:53:28 -07:00
Android (Google) Code Review
a3c57dd19d Merge change I9161f53d into eclair-sdk
* changes:
  update account manager javadoc
2009-10-22 20:44:12 -04:00
Eric Fischer
c0bd8da618 am 94f2c524: Merge change I63c2d9ed into eclair
Merge commit '94f2c524214b56ac2416f79cf9e81fa598327917' into eclair-mr2

* commit '94f2c524214b56ac2416f79cf9e81fa598327917':
  Update the names of the widgets when the locale changes.
2009-10-22 15:47:24 -07:00
Tom Taylor
b62e81ec76 am 6c618c68: Merge change Ie7105dae into eclair
Merge commit '6c618c68f251e42210f7c2f45d69498352da87e0' into eclair-mr2

* commit '6c618c68f251e42210f7c2f45d69498352da87e0':
  Handle bad SIM message
2009-10-22 15:47:06 -07:00
Android (Google) Code Review
86bac64f29 Merge change I63c2d9ed into eclair
* changes:
  Update the names of the widgets when the locale changes.
2009-10-22 18:38:29 -04:00
Android (Google) Code Review
34a7ab856f Merge change Ie7105dae into eclair
* changes:
  Handle bad SIM message
2009-10-22 18:37:51 -04:00
Mike Lockwood
9ecff302a7 am 96e0c315: Merge change Ia3f7ef64 into eclair
Merge commit '96e0c3156e21bbdb0d94201b08d80379b98c472a' into eclair-mr2

* commit '96e0c3156e21bbdb0d94201b08d80379b98c472a':
  PowerManager: Don't poke user activity in setKeyboardVisibility unless the state actually changed.
2009-10-22 13:31:37 -07:00
Dirk Dougherty
09464e0122 am 4f82394a: am ee58d1bf: doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.
Merge commit '4f82394af6486e1725ae6b6dd3b0334dcfc52747' into eclair-mr2

* commit '4f82394af6486e1725ae6b6dd3b0334dcfc52747':
  doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.
2009-10-22 13:31:25 -07:00
Dirk Dougherty
c819d89468 am f41eb87d: am 6797b9fa: doc change: add diff report 4 -> 5
Merge commit 'f41eb87df2c88c4a045dac5c073e8be87c5b0832' into eclair-mr2

* commit 'f41eb87df2c88c4a045dac5c073e8be87c5b0832':
  doc change: add diff report 4 -> 5
2009-10-22 13:31:09 -07:00
Dirk Dougherty
093e8a7cb0 am e12191a7: am 439bf97c: doc change: edits to the screens support doc.
Merge commit 'e12191a7ec9ab35e4ce80726be2734881a24a223' into eclair-mr2

* commit 'e12191a7ec9ab35e4ce80726be2734881a24a223':
  doc change: edits to the screens support doc.
2009-10-22 13:30:57 -07:00
Dirk Dougherty
f8449df1a9 am e5e2c167: am f4b5540b: doc change only: add screens support doc
Merge commit 'e5e2c167366ff3823b4096af00b2a2ab2d0e6127' into eclair-mr2

* commit 'e5e2c167366ff3823b4096af00b2a2ab2d0e6127':
  doc change only: add screens support doc
2009-10-22 13:30:44 -07:00
Scott Main
17444e34cb am 3c0c0da9: am f90178d0: docs only. fix some typos.
Merge commit '3c0c0da95f23712fb926fc9edf4023528eabd868' into eclair-mr2

* commit '3c0c0da95f23712fb926fc9edf4023528eabd868':
  docs only.
2009-10-22 13:30:30 -07:00
Android (Google) Code Review
37acab06d7 Merge change Ia3f7ef64 into eclair
* changes:
  PowerManager: Don't poke user activity in setKeyboardVisibility unless the state actually changed.
2009-10-22 16:24:05 -04:00
Dirk Dougherty
34cd567e40 am ee58d1bf: doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.
Merge commit 'ee58d1bf9c54eaed623c4419e1d9db269a9c4137' into eclair

* commit 'ee58d1bf9c54eaed623c4419e1d9db269a9c4137':
  doc change: Add docs for SDK. Support new modular structure. In Android.mk, change @since level identifier to 5.xml, expose adt downloadable vars. Fix links that pointed to @sdkCurrent.
2009-10-22 11:22:12 -07:00
Dirk Dougherty
186d2c5c11 am 6797b9fa: doc change: add diff report 4 -> 5
Merge commit '6797b9fa06b4c86b92da117a7f84277f7a380820' into eclair

* commit '6797b9fa06b4c86b92da117a7f84277f7a380820':
  doc change: add diff report 4 -> 5
2009-10-22 11:21:47 -07:00
Dirk Dougherty
3bb609c7e6 am 439bf97c: doc change: edits to the screens support doc.
Merge commit '439bf97ca5adb3e33eaf15faf25034b012a7d9d0' into eclair

* commit '439bf97ca5adb3e33eaf15faf25034b012a7d9d0':
  doc change: edits to the screens support doc.
2009-10-22 11:21:23 -07:00
Dirk Dougherty
3b9a16f8dc am f4b5540b: doc change only: add screens support doc
Merge commit 'f4b5540b35a37ae5b999a50c2195bb43eb125f3c' into eclair

* commit 'f4b5540b35a37ae5b999a50c2195bb43eb125f3c':
  doc change only: add screens support doc
2009-10-22 11:21:12 -07:00
Scott Main
ca5aa0d8b0 am f90178d0: docs only. fix some typos.
Merge commit 'f90178d08d3a6cdb500a6f4d1069c38036b3db69' into eclair

* commit 'f90178d08d3a6cdb500a6f4d1069c38036b3db69':
  docs only.
2009-10-22 11:20:55 -07:00
jsh
50847bd6ec am f14da417: Merge change I3ff560d7 into eclair
Merge commit 'f14da417f3cb1f80a62732238623bb83173255c0' into eclair-mr2

* commit 'f14da417f3cb1f80a62732238623bb83173255c0':
  Send "encoding problem" to the network for general errors during SMS dispatch.
2009-10-22 11:16:35 -07:00
Android (Google) Code Review
a2f304a6b9 Merge change I3ff560d7 into eclair
* changes:
  Send "encoding problem" to the network for general errors during SMS dispatch.
2009-10-22 14:04:03 -04:00
Mike Lockwood
bec9e77320 am fee0f577: Merge change I99dc6477 into eclair
Merge commit 'fee0f5773335e42f4ffdf2d2d1c344ceee3ccb33' into eclair-mr2

* commit 'fee0f5773335e42f4ffdf2d2d1c344ceee3ccb33':
  Add WindowManagerPolicy.allowKeyRepeat() method for disabling key repeats.
2009-10-22 10:49:23 -07:00
Mike Lockwood
1227cf4499 am eadb97b4: Merge change I53f83502 into eclair
Merge commit 'eadb97b4826bb6a2fa34db9c65b5a0d6f7baade9' into eclair-mr2

* commit 'eadb97b4826bb6a2fa34db9c65b5a0d6f7baade9':
  PowerManagerService: Ignore user activity while the screen is animating off.
2009-10-22 10:49:11 -07:00
Brandon Ballinger
3ce86c7117 am 0737b164: Merge change I959a6f46 into eclair
Merge commit '0737b1643071694cf8767e3609ad628f1679d63a' into eclair-mr2

* commit '0737b1643071694cf8767e3609ad628f1679d63a':
  Fix bug	2194213: Non-default system IMEs are enabled, but not initially shown in input method switcher.
2009-10-22 10:48:49 -07:00
Robert Greenwalt
793a8b8b6f am f702f1f3: (-s ours) Merge change I1538dba4 into eclair
Merge commit 'f702f1f33fb5490854579a1f5ce61c70ea7fd768' into eclair-mr2

* commit 'f702f1f33fb5490854579a1f5ce61c70ea7fd768':
  Make FWK start a wifi scan if supplicant forgets. (do not merge)
2009-10-22 10:47:50 -07:00
Naveen Kalla
5be1019431 am 076cb23a: Merge change I13dd02fc into eclair
Merge commit '076cb23a024f256817b5dc22830c3f9a9e0a44a7' into eclair-mr2

* commit '076cb23a024f256817b5dc22830c3f9a9e0a44a7':
  telephony/cdma: Fix Erroneous Roaming Indicators and Latitude-Longitude parsing
2009-10-22 10:47:03 -07:00
Andreas Huber
fe040ade1f am b0e6a9a0: Merge change I7a03b074 into eclair
Merge commit 'b0e6a9a0e6e82327f52fd25f3a9e2463ff591905' into eclair-mr2

* commit 'b0e6a9a0e6e82327f52fd25f3a9e2463ff591905':
  Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
2009-10-22 10:46:50 -07:00
Android (Google) Code Review
be8bac24dc Merge change Ie31311fd into eclair-mr2
* changes:
  fix the "right icon" in the titlebar
2009-10-22 13:30:44 -04:00
Leon Scroggins
3d56076f91 am f8e3ac85: Merge change Ifa8ab30e into eclair
Merge commit 'f8e3ac851959efbd21da930a802f8efb65ccec5b' into eclair-mr2

* commit 'f8e3ac851959efbd21da930a802f8efb65ccec5b':
  In onKeyUp for DPAD_CENTER, show the IME for text input.
2009-10-22 06:47:47 -07:00
Eric Fischer
b6747deddd am 2cb6b7fb: (-s ours) Merge change Ic4bf942c into eclair
Merge commit '2cb6b7fb868899a3c718280605b0e462d0f8491f' into eclair-mr2

* commit '2cb6b7fb868899a3c718280605b0e462d0f8491f':
  Import revised translations.  DO NOT MERGE
2009-10-22 06:47:24 -07:00
Jack Palevich
7cd5d8c2f9 am 785768a9: Merge change Id443ba45 into eclair
Merge commit '785768a9216b3a631237587feffea2aeb05a91cc' into eclair-mr2

* commit '785768a9216b3a631237587feffea2aeb05a91cc':
  Prevent transparent region from getting out of sync with Surface Flinger
2009-10-22 06:44:52 -07:00
Brett Chabot
db45e05fff am 6270d52c: (-s ours) Merge change Ica1d7b90 into eclair
Merge commit '6270d52c0dded8658733a392f3ef1f521bc5dbee' into eclair-mr2

* commit '6270d52c0dded8658733a392f3ef1f521bc5dbee':
  Disable known failure math tanhd tests  (DO NOT MERGE)
2009-10-22 06:43:22 -07:00
Jeff Sharkey
716600cf34 am 9aa7e4e7: am d7bc6546: Fix spacing to escape "false" correctly.
Merge commit '9aa7e4e729b6f3c3075e762af37c259f84bfe876' into eclair-mr2

* commit '9aa7e4e729b6f3c3075e762af37c259f84bfe876':
  Fix spacing to escape "false" correctly.
2009-10-22 06:42:34 -07:00
Dianne Hackborn
c58e395bb6 am 8d9ddbe2: Merge change I1f30f3f1 into eclair
Merge commit '8d9ddbe2aa3db86237880102ccf320945e7f57d3' into eclair-mr2

* commit '8d9ddbe2aa3db86237880102ccf320945e7f57d3':
  Fix #2201615: getCallingPackage returns calling process instead of calling package
2009-10-22 06:38:50 -07:00
Suchi Amalapurapu
a8f0f3e2ff am 5b48223d: Merge change I14e833fa into eclair
Merge commit '5b48223d0e8b8becea0c120895d964e6472b3552' into eclair-mr2

* commit '5b48223d0e8b8becea0c120895d964e6472b3552':
  If we fail to persist the current settings and fall back to the back settings file
2009-10-22 06:38:33 -07:00
Android (Google) Code Review
2b4079331b Merge change I99dc6477 into eclair
* changes:
  Add WindowManagerPolicy.allowKeyRepeat() method for disabling key repeats.
2009-10-22 07:07:04 -04:00
Android (Google) Code Review
05c3a4082d Merge change I53f83502 into eclair
* changes:
  PowerManagerService: Ignore user activity while the screen is animating off.
2009-10-22 07:06:51 -04:00
Doug Zongker
07840e5394 am 617262d8: (-s ours) Merge change I37c4157d into eclair
Merge commit '617262d8f57362536ddc00a070c1c0994741de44' into eclair-mr2

* commit '617262d8f57362536ddc00a070c1c0994741de44':
  add "junk path" -k option to aapt (DO NOT MERGE)
2009-10-21 22:22:27 -07:00
Andreas Huber
b88458bf90 am ca404dfb: (-s ours) Merge change Ie3ffb526 into eclair
Merge commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9' into eclair-mr2

* commit 'ca404dfb920ab009cef4db5e74715b796f79b3f9':
  do not merge: The qcom video decoders always output yuv data after adjusting dimensions to be a multiple of 16.
2009-10-21 22:21:52 -07:00
Brett Chabot
e5b28caf27 am 76bb9a36: Merge change I1932e8f8 into eclair
Merge commit '76bb9a363633b5741937ebe58b01a8b2024753b0' into eclair-mr2

* commit '76bb9a363633b5741937ebe58b01a8b2024753b0':
  Disable com.android.unit_tests.HeapTest:testExternalOomeLarge.
2009-10-21 22:21:40 -07:00
Android (Google) Code Review
5c67a5743e Merge change I959a6f46 into eclair
* changes:
  Fix bug	2194213: Non-default system IMEs are enabled, but not initially shown in input method switcher.     - Ensure system IMEs are put on the enabled list at startup/install.     - If the default IME is not installed, choose another one whenever building input method list.
2009-10-21 22:58:39 -04:00
Android (Google) Code Review
89e6154f8b Merge change I66ff8af6 into eclair-mr2
* changes:
  Move calc of EriIconIndex/Mode to whenever basis changes
2009-10-21 20:45:37 -04:00
Android (Google) Code Review
d13596a331 Merge change Ie2d155a5 into eclair-mr2
* changes:
  Add a new API for initing Wifi multicast filtering
2009-10-21 19:44:30 -04:00
Android (Google) Code Review
c1b2b3d61e Merge change I1538dba4 into eclair
* changes:
  Make FWK start a wifi scan if supplicant forgets. (do not merge)
2009-10-21 18:56:10 -04:00
Android (Google) Code Review
eb409f7cba Merge change I13dd02fc into eclair
* changes:
  telephony/cdma: Fix Erroneous Roaming Indicators and Latitude-Longitude parsing
2009-10-21 18:18:30 -04:00
Android (Google) Code Review
7617b917b8 Merge change If68c168d into eclair-mr2
* changes:
  Some cleanup of OMXCodec code, make sure to ignore 0-length output buffers in the metadata retriever.
2009-10-21 18:17:01 -04:00
Android (Google) Code Review
0d2ad405e5 Merge change I7a03b074 into eclair
* changes:
  Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers.
2009-10-21 18:15:20 -04:00
Android (Google) Code Review
d304153d35 Merge change Ifa8ab30e into eclair
* changes:
  In onKeyUp for DPAD_CENTER, show the IME for text input.
2009-10-21 16:11:23 -04:00
Eric Laurent
63da2b65f9 Fix issue 2192181: AudioFlinger must provide separated methods to set VOICE_CALL stream volume and down link audio volume.
Added setVoiceVolume() method to AudioSystem, AudioFlinger, IAudioFlinger, AudioPolicyService.
Removed call to AudioHardwareInterface::setVoiceVolume() from AudioFlinger::setStreamVolume().
2009-10-21 12:29:37 -07:00