Commit Graph

9051 Commits

Author SHA1 Message Date
Jaikumar Ganesh
45c2da09ba am 4f377394: am 972f0e38: Merge change 25325 into eclair
Merge commit '4f377394a9a7d66dd2f0ecba8310e512d85674a6'

* commit '4f377394a9a7d66dd2f0ecba8310e512d85674a6':
  Add a parcelable version of UUID file.
2009-09-17 12:12:49 -07:00
Romain Guy
c5cb111cdd am 31b60307: am d9497f7d: Merge change 25394 into eclair
Merge commit '31b60307de864ec1a3d4371f7e3b2eb02fa17f04'

* commit '31b60307de864ec1a3d4371f7e3b2eb02fa17f04':
  Add StateListDrawable's dither flag to the constant state.
2009-09-17 12:12:41 -07:00
Mathias Agopian
a043039fe3 am f5c25eed: am 9080125f: Merge change 25393 into eclair
Merge commit 'f5c25eeda9dcaf4cc6bd5d425f1f520ee861e617'

* commit 'f5c25eeda9dcaf4cc6bd5d425f1f520ee861e617':
  fix again [2102410] Home Screen is not displayed in the background in Landscape Mode
2009-09-17 12:12:33 -07:00
Dianne Hackborn
690daac133 am 11ae4695: am e777e0a3: Merge change 25388 into eclair
Merge commit '11ae4695c18587a376f5da06f377fae6c242f5a5'

* commit '11ae4695c18587a376f5da06f377fae6c242f5a5':
  Fix #1827299: Google login screen to re-enter password is not viewable
2009-09-17 12:12:25 -07:00
Eric Fischer
8532e4e255 am b3278a5c: am 0828beee: Merge change 25386 into eclair
Merge commit 'b3278a5c8a625b5bfe532eea0c1e30d24695f4ae'

* commit 'b3278a5c8a625b5bfe532eea0c1e30d24695f4ae':
  Add one more hardware keyboard character popup: \ if you hold /
2009-09-17 12:12:16 -07:00
Dianne Hackborn
8a104bb4c5 am ca1475a8: am 8843620c: Merge change 25360 into eclair
Merge commit 'ca1475a868c6fe24700065a8ae321bb41425c033'

* commit 'ca1475a868c6fe24700065a8ae321bb41425c033':
  Fix issue #2121993: com.android.unit_tests.os.HandlerThreadTest:testHandlerThread is failing
2009-09-17 12:12:08 -07:00
Leon Scroggins
379edc4cfe am 3ce97308: am 38456260: Merge change 25369 into eclair
Merge commit '3ce9730848f5e1b0ab277eb77932fe60b888b2fd'

* commit '3ce9730848f5e1b0ab277eb77932fe60b888b2fd':
  Update the input method when the selection changes.
2009-09-17 12:12:00 -07:00
Fred Quintana
3f0ea3abba am fd6bb030: am 5f78786c: Merge change 25190 into eclair
Merge commit 'fd6bb030fde10603e8d8d5deaeeee2b132e8b2c4'

* commit 'fd6bb030fde10603e8d8d5deaeeee2b132e8b2c4':
  add the ability to do a newAssert with no values
2009-09-17 12:11:52 -07:00
Guang Zhu
7c238186cb am 77c65a64: am 44ca7090: Merge change 25356 into eclair
Merge commit '77c65a641afc0b090a5ad231c1ff1f805edf576c'

* commit '77c65a641afc0b090a5ad231c1ff1f805edf576c':
  Filter out failing cases for future investigation.
2009-09-17 12:11:43 -07:00
Jason Sams
0f32a03723 am 6a940930: am 07e62d1d: Merge change 25185 into eclair
Merge commit '6a9409303bf90c340637a32498701603bb964e65'

* commit '6a9409303bf90c340637a32498701603bb964e65':
  Implement renderscript Invokables.
2009-09-17 12:11:34 -07:00
Romain Guy
5cbbf0afde am 2437de94: am 32c687c2: Merge change 25351 into eclair
Merge commit '2437de94ed63dfcac5bc86a5b2943dd54c629d8e'

* commit '2437de94ed63dfcac5bc86a5b2943dd54c629d8e':
  Change Theme.Light's background back to pure white.
2009-09-17 12:11:23 -07:00
Leon Scroggins
ce20ffddfd am 3eb9a78a: am 4295613a: Merge change 25307 into eclair
Merge commit '3eb9a78a254395097cbb28e3826d25014422ead5'

* commit '3eb9a78a254395097cbb28e3826d25014422ead5':
  Allow touches to change the selection in WebTextView.
2009-09-17 12:11:14 -07:00
Dianne Hackborn
42876517f5 am 6c7de2f0: am e09f5707: Merge change 25302 into eclair
Merge commit '6c7de2f0784abb4ae6d170dc0677acb35834a0d6'

* commit '6c7de2f0784abb4ae6d170dc0677acb35834a0d6':
  Add more features.
2009-09-17 12:11:04 -07:00
Evan Millar
1d42db5380 am 6c42a4ba: am 6a20b823: Merge change 25293 into eclair
Merge commit '6c42a4bad668bc4b742e3f657f9491165d22bfb0'

* commit '6c42a4bad668bc4b742e3f657f9491165d22bfb0':
  Fix a handful of bugs in the ContactHeaderWidget
2009-09-17 12:10:55 -07:00
Jean-Baptiste Queru
e910ef2258 am e525eef4: merge from open-source master
Merge commit 'e525eef4b8e284ac8eb023bd0df4eeed37916d4b'

* commit 'e525eef4b8e284ac8eb023bd0df4eeed37916d4b':
  Update comment in mediaplayer.h.
  Update documentation for getVideoWidth and getVideoHeight.
  Make Uri.parseUserPart, parseHost, and parsePort symmetric
  Javadoc used startApplication() which doesnt exists, changed to createApplication()
2009-09-17 12:10:47 -07:00
Nicolas Catania
c69956e87c am ea884481: am b615166c: Merge change 25279 into eclair
Merge commit 'ea8844811d1b0965f5c2f43006c0a08bcd73f23a'

* commit 'ea8844811d1b0965f5c2f43006c0a08bcd73f23a':
  Added a field to track if the call is to a voicemail instance.
2009-09-17 09:59:37 -07:00
Karl Rosaen
ae32ac6e2e am 4babd458: am 82df16c6: Merge change 25297 into eclair
Merge commit '4babd458daa3fd7ff73110b1689094a9586a3c46'

* commit '4babd458daa3fd7ff73110b1689094a9586a3c46':
  Address romain's code review comments
2009-09-17 09:59:29 -07:00
Cary Clark
611be54a5c am 20158b9c: am c9e2e661: slide the title if the site changes the scroll position
Merge commit '20158b9ce5895fdbdedf5db103583264d94a62a4'

* commit '20158b9ce5895fdbdedf5db103583264d94a62a4':
  slide the title if the site changes the scroll position
2009-09-17 09:58:27 -07:00
Guang Zhu
20c52d724e am 0c228905: am a5526468: Merge change 25250 into eclair
Merge commit '0c2289053127e43e517ff8cc096d691c15279fed'

* commit '0c2289053127e43e517ff8cc096d691c15279fed':
  Refactor logic for starting forward servers and http test cases hacking, so that they can be shared between automated test mode and UI launch mode.
2009-09-17 09:58:10 -07:00
Mike Lockwood
ca4bb53c76 am bdd1f2e3: am 9092ab4d: Add support for launching activities when attaching to a car or desk dock.
Merge commit 'bdd1f2e37e67cc530e54ea7b8a23df60a4aa1a9b'

* commit 'bdd1f2e37e67cc530e54ea7b8a23df60a4aa1a9b':
  Add support for launching activities when attaching to a car or desk dock.
2009-09-17 09:57:52 -07:00
Eric Fischer
165bc88555 am 5a7477ce: am 764916d0: Merge change 23383 into eclair
Merge commit '5a7477cee84a5e6214c7fb81833bd3bfb8870a18'

* commit '5a7477cee84a5e6214c7fb81833bd3bfb8870a18':
  Combine the "Permission Requested" title and subtitle into one string.
2009-09-17 09:57:40 -07:00
Jack Palevich
5165eee3d9 am c05a7f62: am fee6b69a: Merge change 25303 into eclair
Merge commit 'c05a7f6216a286b5cb9dad026efaef0e3bc59f35'

* commit 'c05a7f6216a286b5cb9dad026efaef0e3bc59f35':
  Add EGL call error checking.
2009-09-17 09:57:32 -07:00
Cynthia Wong
9ff2e9392d am fc1a3657: am f5a5f045: Merge change 25296 into eclair
Merge commit 'fc1a365740478f61e671fe669fc466a9a753f031'

* commit 'fc1a365740478f61e671fe669fc466a9a753f031':
  Add new Gservices setting for discarding uphill ops for eclair and future devices.
2009-09-17 09:57:24 -07:00
Amith Yamasani
4fa32578c1 am 1272442f: am 0abc859e: Merge change 25299 into eclair
Merge commit '1272442f1c24cd39b10aa1ef518a80bfcf4c86f2'

* commit '1272442f1c24cd39b10aa1ef518a80bfcf4c86f2':
  Show keyboard automatically in EditTextPreference dialogs
2009-09-17 09:56:43 -07:00
Eric Laurent
1b83a06e71 am 917ec947: am 99d20717: Merge change 25265 into eclair
Merge commit '917ec94734056ee44523b88ad2675825376d2c87'

* commit '917ec94734056ee44523b88ad2675825376d2c87':
  Fix issue 2123668: Class scope typo in AudioFlinger.cpp.
2009-09-17 09:56:25 -07:00
Mike Lockwood
8d0e379884 am f324b2b0: am 4f8bb4c8: Merge change 25276 into eclair
Merge commit 'f324b2b0fcc15834fd944adf6afe95d1e5bc6d0a'

* commit 'f324b2b0fcc15834fd944adf6afe95d1e5bc6d0a':
  Use separate resources to control orientation change for car and desk docks.
2009-09-17 09:56:04 -07:00
Chih-Chung Chang
8441c267dc am d5423a9f: am fc5f1026: Merge change 25291 into eclair
Merge commit 'd5423a9fc8c0caebdd29d1c673cf14725ad7205e'

* commit 'd5423a9fc8c0caebdd29d1c673cf14725ad7205e':
  Try to fix sdk build again.
2009-09-17 09:55:56 -07:00
Chih-Chung Chang
903c2cc47f am 8bc2495e: am de88c515: Merge change 25286 into eclair
Merge commit '8bc2495e5ee83d2815b3e7ed151271dae057db67'

* commit '8bc2495e5ee83d2815b3e7ed151271dae057db67':
  Fix sdk build.
2009-09-17 09:55:34 -07:00
Cary Clark
26b10afe9e am a78a1579: am 9f28d900: Merge change 25280 into eclair
Merge commit 'a78a157905ae49a170b0e2239df96b1f365f646d'

* commit 'a78a157905ae49a170b0e2239df96b1f365f646d':
  Don't scroll on load if titlebar is visible
2009-09-17 09:55:21 -07:00
Andreas Huber
181a6ebed6 am 51173401: am f7c3679f: Merge change 25158 into eclair
Merge commit '51173401f4742d92d46af602190a98372f10bda9'

* commit '51173401f4742d92d46af602190a98372f10bda9':
  Another software color conversion implementation, this time OMX_QCOM_COLOR_FormatYVU420SemiPlanar => rgb565.
2009-09-17 09:55:04 -07:00
Suchi Amalapurapu
16eebdc958 am bbfbf187: am 2a66eee3: Merge change 25157 into eclair
Merge commit 'bbfbf187efc47eb55f07928abdc7055d781f859e'

* commit 'bbfbf187efc47eb55f07928abdc7055d781f859e':
  Remove deadlock in PackageManager when installing or upgrading packages.
2009-09-17 09:54:45 -07:00
Chih-Chung Chang
696605ad77 am 53a67366: am d3ba4811: Merge change 25272 into eclair
Merge commit '53a673661cebc93649532a716b19cc22497c5bb6'

* commit '53a673661cebc93649532a716b19cc22497c5bb6':
  Make ExifInterface public.
2009-09-17 09:54:32 -07:00
Jean-Michel Trivi
09a11afd40 am 2edbd217: am b53eaac6: Merge change 25155 into eclair
Merge commit '2edbd217af15ce3e1e3632da1e679db5153111b8'

* commit '2edbd217af15ce3e1e3632da1e679db5153111b8':
  Fix bug 2115258 where the AudioManager javadoc doesn't warn against
2009-09-17 09:54:23 -07:00
Bjorn Bringert
db511f4cd8 am 5e3f452c: am 57384101: Merge change 25270 into eclair
Merge commit '5e3f452c4634c74a4e659ef6c7357c594c77b10c'

* commit '5e3f452c4634c74a4e659ef6c7357c594c77b10c':
  Use Resources to load search icons with android.resource URIs
2009-09-17 09:54:14 -07:00
Chih-Chung Chang
d127d2027f am 146a0fab: am 46ad7961: Unhide cancelAutoFocus API in Camera.
Merge commit '146a0fabb2db8d0677621d716ea02198c6a795ab'

* commit '146a0fabb2db8d0677621d716ea02198c6a795ab':
  Unhide cancelAutoFocus API in Camera.
2009-09-17 09:53:48 -07:00
Chih-Chung Chang
d52c567285 am e1c64f8f: am ccd064d4: Merge change 25255 into eclair
Merge commit 'e1c64f8f14700c5ef090fbbc231b971b9cd6e8de'

* commit 'e1c64f8f14700c5ef090fbbc231b971b9cd6e8de':
  Clean ExifInterface. Prepare to make it public.
2009-09-17 09:53:12 -07:00
Wu-cheng Li
70224719d8 am a326c816: am 7478ea68: Remove trailing spaces.
Merge commit 'a326c8160fa10c9954e9872f754309b1850d8ff4'

* commit 'a326c8160fa10c9954e9872f754309b1850d8ff4':
  Remove trailing spaces.
2009-09-17 09:53:00 -07:00
Chung-yih Wang
3b7e7c4f66 am b8e398ab: am 8e9ef0e7: Add the hide for the inner class definition.
Merge commit 'b8e398abe483cdbcaf43fd7efe6bb8c5bd1bc7ac'

* commit 'b8e398abe483cdbcaf43fd7efe6bb8c5bd1bc7ac':
  Add the hide for the inner class definition.
2009-09-17 09:52:27 -07:00
Chung-yih Wang
1cb539f547 am 614fd72d: am 4337476a: Fix the missing part for reading enterprise fields in wifi configuration
Merge commit '614fd72d21a90c04ecf837f6ce69dc421ae852e2'

* commit '614fd72d21a90c04ecf837f6ce69dc421ae852e2':
  Fix the missing part for reading enterprise fields in wifi configuration
2009-09-17 09:52:19 -07:00
Jeff Sharkey
a4d37d85bf am 46f11652: am 85628188: Merge change 25244 into eclair
Merge commit '46f116520fe7ec04e99dd37d805fc852a71bf795'

* commit '46f116520fe7ec04e99dd37d805fc852a71bf795':
  Flag indicating if Contacts source has any unsynced groups.
2009-09-17 09:51:57 -07:00
Dianne Hackborn
31612db5f5 am 10bedaaf: am 7fc39b26: Merge change 25238 into eclair
Merge commit '10bedaaf3ec24af5fa4dcea54545e4d4953a1c7d'

* commit '10bedaaf3ec24af5fa4dcea54545e4d4953a1c7d':
  Implement issue #1780928: Need support hiding nav keys.
2009-09-17 09:51:33 -07:00
Jeff Sharkey
c3474ed7cb am 454e3c84: am 9352b9fb: Merge change 25232 into eclair
Merge commit '454e3c848feee705df79ea02feca5c9b97bfc5de'

* commit '454e3c848feee705df79ea02feca5c9b97bfc5de':
  Fix NPE when provider returns null cursor.
2009-09-17 09:51:01 -07:00
Yu Shan Emily Lau
3aea463e3d am 036033fc: am 610e3595: modified: MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java Fixed the meta data duration
Merge commit '036033fc6dcce36550f2d7fc9a0f64bc3b8d285b'

* commit '036033fc6dcce36550f2d7fc9a0f64bc3b8d285b':
  modified:   MediaFrameworkTest/src/com/android/mediaframeworktest/MediaNames.java
2009-09-17 09:50:39 -07:00
Daisuke Miyakawa
e39646b836 am 055714dd: am 6cf05f1c: Merge change 25206 into eclair
Merge commit '055714ddbb0db6634e362b357f5e11a77444c6de'

* commit '055714ddbb0db6634e362b357f5e11a77444c6de':
  Make vCard importer code use Account information if possible.
2009-09-17 09:49:55 -07:00
Mathias Agopian
f663bfd4f2 am a4322315: am 1f1135a2: Merge change 25212 into eclair
Merge commit 'a432231515df66fa4051bae1d8d319f315af8cca'

* commit 'a432231515df66fa4051bae1d8d319f315af8cca':
  revert to black video background, since we don't need the color-key anylonger
2009-09-17 09:49:47 -07:00
Mathias Agopian
b9109394cf am 8ac7a829: am 7bf75f6d: Merge change 25207 into eclair
Merge commit '8ac7a829bd0684ee69ed3a01cec877d93fc7a7db'

* commit '8ac7a829bd0684ee69ed3a01cec877d93fc7a7db':
  fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer
2009-09-17 09:49:38 -07:00
Karl Rosaen
802f7e4e02 am 20dfa6ab: am c6587dc8: Merge change 25178 into eclair
Merge commit '20dfa6abca11e1f01ace07f11c5d06e7337ccb00'

* commit '20dfa6abca11e1f01ace07f11c5d06e7337ccb00':
  Add RotarySelector widget to android.internal for use by lock screen and incoming call screen.
2009-09-17 09:49:20 -07:00
Nicolas Catania
c4d23017a5 am 35ec0031: am d9e28017: Merge change 25092 into eclair
Merge commit '35ec0031bca4a9fb2fe7c80500e95f8c5b3464d8'

* commit '35ec0031bca4a9fb2fe7c80500e95f8c5b3464d8':
  New field in CallerInfo to cache if the call is an emergency one.
2009-09-17 09:49:06 -07:00
Dianne Hackborn
3a3defb98a am c5624813: am 6ee7b04d: Merge change 25192 into eclair
Merge commit 'c562481380a4f5ddffc67dd72d81e2ded5bd201f'

* commit 'c562481380a4f5ddffc67dd72d81e2ded5bd201f':
  Some improvements for wallpaper configuration.
2009-09-17 09:48:54 -07:00
Mathias Agopian
2b4ab07e7b am d4e3265b: am dd8f6186: Merge change 25201 into eclair
Merge commit 'd4e3265b1a93f5bd5a8b1ba0f9166af8a89ee164'

* commit 'd4e3265b1a93f5bd5a8b1ba0f9166af8a89ee164':
  Revert "fix [2122448] android_native_window_t::setUsage() only reallocates the first buffer"
2009-09-17 09:48:41 -07:00