Commit Graph

4927 Commits

Author SHA1 Message Date
Romain Guy
92e2f8cb6f am 32c687c2: Merge change 25351 into eclair
Merge commit '32c687c20d6ac3080b396787147892dc85126b33' into eclair-plus-aosp

* commit '32c687c20d6ac3080b396787147892dc85126b33':
  Change Theme.Light's background back to pure white.
2009-09-17 08:39:53 -07:00
Leon Scroggins
ad49b67964 am 4295613a: Merge change 25307 into eclair
Merge commit '4295613a0ea1f61398d3123746740ca27d9ea170' into eclair-plus-aosp

* commit '4295613a0ea1f61398d3123746740ca27d9ea170':
  Allow touches to change the selection in WebTextView.
2009-09-17 08:39:45 -07:00
Dianne Hackborn
1ee16e77ac am e09f5707: Merge change 25302 into eclair
Merge commit 'e09f5707641e2c4a79a5f542635204516cda8c63' into eclair-plus-aosp

* commit 'e09f5707641e2c4a79a5f542635204516cda8c63':
  Add more features.
2009-09-17 08:39:38 -07:00
Evan Millar
54f6b5252b am 6a20b823: Merge change 25293 into eclair
Merge commit '6a20b823c3c9de8daa1c4bc002d6e58fe82d3a60' into eclair-plus-aosp

* commit '6a20b823c3c9de8daa1c4bc002d6e58fe82d3a60':
  Fix a handful of bugs in the ContactHeaderWidget
2009-09-17 08:39:27 -07:00
Jean-Baptiste Queru
a16b09d61b merge from open-source master 2009-09-16 16:22:13 -07:00
Android (Google) Code Review
a1bba1af7d Merge change 25351 into eclair
* changes:
  Change Theme.Light's background back to pure white.
2009-09-16 17:49:22 -04:00
Android (Google) Code Review
3781346aa9 Merge change 25307 into eclair
* changes:
  Allow touches to change the selection in WebTextView.
2009-09-16 17:49:20 -04:00
Android (Google) Code Review
3df403992a Merge change 25302 into eclair
* changes:
  Add more features.
2009-09-16 17:46:08 -04:00
Android (Google) Code Review
f23bb1b465 Merge change 25293 into eclair
* changes:
  Fix a handful of bugs in the ContactHeaderWidget
2009-09-16 17:38:53 -04:00
Nicolas Catania
6fff434e1e am b615166c: Merge change 25279 into eclair
Merge commit 'b615166ce7ac554a0278a8bc364f301316e0c745' into eclair-plus-aosp

* commit 'b615166ce7ac554a0278a8bc364f301316e0c745':
  Added a field to track if the call is to a voicemail instance.
2009-09-16 14:33:51 -07:00
Karl Rosaen
71ee4771a3 am 82df16c6: Merge change 25297 into eclair
Merge commit '82df16c6543e2c47056c14799845621717ac2b3b' into eclair-plus-aosp

* commit '82df16c6543e2c47056c14799845621717ac2b3b':
  Address romain's code review comments
2009-09-16 14:33:44 -07:00
Android (Google) Code Review
6ff2700054 Merge change 25279 into eclair
* changes:
  Added a field to track if the call is to a voicemail instance.
2009-09-16 17:25:51 -04:00
Android (Google) Code Review
167361e44c Merge change 25297 into eclair
* changes:
  Address romain's code review comments
2009-09-16 15:37:40 -04:00
Cary Clark
fc04b75e16 am c9e2e661: slide the title if the site changes the scroll position
Merge commit 'c9e2e661f0cbc736b948f8aca4c65d0467c44c79' into eclair-plus-aosp

* commit 'c9e2e661f0cbc736b948f8aca4c65d0467c44c79':
  slide the title if the site changes the scroll position
2009-09-16 12:30:21 -07:00
Guang Zhu
1ad93d07a3 am a5526468: Merge change 25250 into eclair
Merge commit 'a5526468a38289cc17b231c0d0eca918e34ede49' into eclair-plus-aosp

* commit 'a5526468a38289cc17b231c0d0eca918e34ede49':
  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-16 12:15:24 -07:00
Android (Google) Code Review
4ee93e9842 Merge change 25250 into eclair
* changes:
  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-16 15:07:55 -04:00
Mike Lockwood
e7bea2424f am 9092ab4d: Add support for launching activities when attaching to a car or desk dock.
Merge commit '9092ab4d458ad60b459d5fad52368bde5d25f665' into eclair-plus-aosp

* commit '9092ab4d458ad60b459d5fad52368bde5d25f665':
  Add support for launching activities when attaching to a car or desk dock.
2009-09-16 11:50:26 -07:00
Eric Fischer
df491842f7 am 764916d0: Merge change 23383 into eclair
Merge commit '764916d01b779ccc8064946c6ba2962fe063ed86' into eclair-plus-aosp

* commit '764916d01b779ccc8064946c6ba2962fe063ed86':
  Combine the "Permission Requested" title and subtitle into one string.
2009-09-16 11:40:37 -07:00
Jack Palevich
1507f9bb99 am fee6b69a: Merge change 25303 into eclair
Merge commit 'fee6b69a7ce38118423c114abb977fd1b053be3c' into eclair-plus-aosp

* commit 'fee6b69a7ce38118423c114abb977fd1b053be3c':
  Add EGL call error checking.
2009-09-16 11:40:30 -07:00
Cynthia Wong
914fff077f am f5a5f045: Merge change 25296 into eclair
Merge commit 'f5a5f04550fb0d7399b8bfbb4976e0ec3b718dd8' into eclair-plus-aosp

* commit 'f5a5f04550fb0d7399b8bfbb4976e0ec3b718dd8':
  Add new Gservices setting for discarding uphill ops for eclair and future devices.
2009-09-16 11:40:23 -07:00
Android (Google) Code Review
4666267b20 Merge change 23383 into eclair
* changes:
  Combine the "Permission Requested" title and subtitle into one string.
2009-09-16 14:36:56 -04:00
Android (Google) Code Review
cbcc6b9776 Merge change 25303 into eclair
* changes:
  Add EGL call error checking.
2009-09-16 14:33:20 -04:00
Android (Google) Code Review
4ad8a33a85 Merge change 25296 into eclair
* changes:
  Add new Gservices setting for discarding uphill ops for eclair and future devices.
2009-09-16 14:16:47 -04:00
Amith Yamasani
58e57385bd am 0abc859e: Merge change 25299 into eclair
Merge commit '0abc859e14fe557479cab490493e64ca6ab05e6e' into eclair-plus-aosp

* commit '0abc859e14fe557479cab490493e64ca6ab05e6e':
  Show keyboard automatically in EditTextPreference dialogs
2009-09-16 11:15:14 -07:00
Jack Palevich
13e68424fb Add EGL call error checking. 2009-09-16 11:08:43 -07:00
Android (Google) Code Review
bf3ee72e76 Merge change 25299 into eclair
* changes:
  Show keyboard automatically in EditTextPreference dialogs
2009-09-16 14:06:34 -04:00
Eric Laurent
40b38b6472 am 99d20717: Merge change 25265 into eclair
Merge commit '99d20717b7fea022052bbb36dde468aaad67d8c7' into eclair-plus-aosp

* commit '99d20717b7fea022052bbb36dde468aaad67d8c7':
  Fix issue 2123668: Class scope typo in AudioFlinger.cpp.
2009-09-16 11:00:54 -07:00
Android (Google) Code Review
f7bf754e50 Merge change 25265 into eclair
* changes:
  Fix issue 2123668: Class scope typo in AudioFlinger.cpp.
2009-09-16 13:56:12 -04:00
Mike Lockwood
b8246bdd9f am 4f8bb4c8: Merge change 25276 into eclair
Merge commit '4f8bb4c8a0ec6fa89857281537ad0c5d12bcff47' into eclair-plus-aosp

* commit '4f8bb4c8a0ec6fa89857281537ad0c5d12bcff47':
  Use separate resources to control orientation change for car and desk docks.
2009-09-16 10:32:21 -07:00
Chih-Chung Chang
a6d41868d0 am fc5f1026: Merge change 25291 into eclair
Merge commit 'fc5f10265fd676c14554a3c85fb665dfed5efe70' into eclair-plus-aosp

* commit 'fc5f10265fd676c14554a3c85fb665dfed5efe70':
  Try to fix sdk build again.
2009-09-16 10:32:14 -07:00
Android (Google) Code Review
3e36bfc721 Merge change 25276 into eclair
* changes:
  Use separate resources to control orientation change for car and desk docks.
2009-09-16 13:29:29 -04:00
Android (Google) Code Review
fdf539b80b Merge change 25291 into eclair
* changes:
  Try to fix sdk build again.
2009-09-16 13:23:35 -04:00
Chih-Chung Chang
cbf67b26b7 am de88c515: Merge change 25286 into eclair
Merge commit 'de88c515ce3ba2ca15cfeff632ef80d01bfac4df' into eclair-plus-aosp

* commit 'de88c515ce3ba2ca15cfeff632ef80d01bfac4df':
  Fix sdk build.
2009-09-16 10:22:56 -07:00
Cary Clark
90e2896f54 am 9f28d900: Merge change 25280 into eclair
Merge commit '9f28d9008b96a1f7f3fd14634664d3991d756abf' into eclair-plus-aosp

* commit '9f28d9008b96a1f7f3fd14634664d3991d756abf':
  Don't scroll on load if titlebar is visible
2009-09-16 10:17:18 -07:00
Android (Google) Code Review
a0ce64d4cc Merge change 25286 into eclair
* changes:
  Fix sdk build.
2009-09-16 13:15:45 -04:00
Android (Google) Code Review
e3afd21468 Merge change 25280 into eclair
* changes:
  Don't scroll on load if titlebar is visible
2009-09-16 13:12:56 -04:00
Andreas Huber
8fa65324a3 am f7c3679f: Merge change 25158 into eclair
Merge commit 'f7c3679f898cdcb208bc1675c79573e1d637083a' into eclair-plus-aosp

* commit 'f7c3679f898cdcb208bc1675c79573e1d637083a':
  Another software color conversion implementation, this time OMX_QCOM_COLOR_FormatYVU420SemiPlanar => rgb565.
2009-09-16 10:08:13 -07:00
Android (Google) Code Review
6863db711f Merge change 25158 into eclair
* changes:
  Another software color conversion implementation, this time OMX_QCOM_COLOR_FormatYVU420SemiPlanar => rgb565.
2009-09-16 13:01:57 -04:00
Suchi Amalapurapu
357da3cd94 am 2a66eee3: Merge change 25157 into eclair
Merge commit '2a66eee3ef88bdc7167e5e5d0471c1e8b2e68fc6' into eclair-plus-aosp

* commit '2a66eee3ef88bdc7167e5e5d0471c1e8b2e68fc6':
  Remove deadlock in PackageManager when installing or upgrading packages.
2009-09-16 09:43:52 -07:00
Android (Google) Code Review
d7a31ed755 Merge change 25157 into eclair
* changes:
  Remove deadlock in PackageManager when installing or upgrading packages. PM first creates a temporary file from the input package uri before installing it. if the package uri points to a content uri, the content provider  has to be retrieved via the ActivityManager which could cause deadlocks with the package manager locks being held. Clean up by always copying or creating temporary files before acquiring these locks. Fix issue when restoring a failed upgrade for third party apps.
2009-09-16 12:36:36 -04:00
Chih-Chung Chang
123823d9cb am d3ba4811: Merge change 25272 into eclair
Merge commit 'd3ba4811d48e01e85b4faa57da159471022e6daa' into eclair-plus-aosp

* commit 'd3ba4811d48e01e85b4faa57da159471022e6daa':
  Make ExifInterface public.
2009-09-16 09:19:41 -07:00
Android (Google) Code Review
434f6d8bbf Merge change 25272 into eclair
* changes:
  Make ExifInterface public.
2009-09-16 12:12:03 -04:00
Jean-Michel Trivi
1480aa0397 am b53eaac6: Merge change 25155 into eclair
Merge commit 'b53eaac659f93ae41cac8963c58a12d38e33eac8' into eclair-plus-aosp

* commit 'b53eaac659f93ae41cac8963c58a12d38e33eac8':
  Fix bug 2115258 where the AudioManager javadoc doesn't warn against
2009-09-16 09:10:31 -07:00
Bjorn Bringert
56482d3bba am 57384101: Merge change 25270 into eclair
Merge commit '57384101b9757b1c67570fae60cdb8f89c84bf32' into eclair-plus-aosp

* commit '57384101b9757b1c67570fae60cdb8f89c84bf32':
  Use Resources to load search icons with android.resource URIs
2009-09-16 09:10:25 -07:00
Android (Google) Code Review
b3ee69ae1e Merge change 25155 into eclair
* changes:
  Fix bug 2115258 where the AudioManager javadoc doesn't warn against misuse of some of the methods that should only be used to implement the Settings and Phone apps, and the audio service.
2009-09-16 12:07:37 -04:00
Android (Google) Code Review
f1bcac43d6 Merge change 25270 into eclair
* changes:
  Use Resources to load search icons with android.resource URIs
2009-09-16 12:03:52 -04:00
Chih-Chung Chang
d3331fbf72 am 46ad7961: Unhide cancelAutoFocus API in Camera.
Merge commit '46ad796186bdca8bac75607340aa0fac0c34a9d8' into eclair-plus-aosp

* commit '46ad796186bdca8bac75607340aa0fac0c34a9d8':
  Unhide cancelAutoFocus API in Camera.
2009-09-16 07:58:30 -07:00
Eric Laurent
bdc0f84793 Fix issue 2123668: Class scope typo in AudioFlinger.cpp. 2009-09-16 06:02:45 -07:00
Chih-Chung Chang
9fb9293b93 am ccd064d4: Merge change 25255 into eclair
Merge commit 'ccd064d4117bef3fc2a0914f03ccc84a1b50aaa1' into eclair-plus-aosp

* commit 'ccd064d4117bef3fc2a0914f03ccc84a1b50aaa1':
  Clean ExifInterface. Prepare to make it public.
2009-09-16 05:21:54 -07:00
Android (Google) Code Review
12dadf06b3 Merge change 25255 into eclair
* changes:
  Clean ExifInterface. Prepare to make it public.
2009-09-16 08:14:53 -04:00