OSDN Git Service

android-x86/frameworks-native.git
14 years agoam 21ad6043: am 6b1e6969: Rename tab widget attributes, remove scroll barrier constan...
Romain Guy [Mon, 29 Mar 2010 22:05:11 +0000 (15:05 -0700)]
am 21ad6043: am 6b1e6969: Rename tab widget attributes, remove scroll barrier constant. Bug #2553515 #2553595

Merge commit '21ad6043cd48fbe2d52a5eb18c29e09b4b80bc9f' into kraken

* commit '21ad6043cd48fbe2d52a5eb18c29e09b4b80bc9f':
  Rename tab widget attributes, remove scroll barrier constant.

14 years agoam 6b1e6969: Rename tab widget attributes, remove scroll barrier constant. Bug #25535...
Romain Guy [Mon, 29 Mar 2010 21:49:09 +0000 (14:49 -0700)]
am 6b1e6969: Rename tab widget attributes, remove scroll barrier constant. Bug #2553515 #2553595

Merge commit '6b1e6969828f05a2f5f55825fdf16b19c9dce2dd' into froyo-plus-aosp

* commit '6b1e6969828f05a2f5f55825fdf16b19c9dce2dd':
  Rename tab widget attributes, remove scroll barrier constant.

14 years agoam 0d531f5b: am ab69e29c: relocate android.util.base64.* -> android.util.*
Doug Zongker [Mon, 29 Mar 2010 21:05:01 +0000 (14:05 -0700)]
am 0d531f5b: am ab69e29c: relocate android.util.base64.* -> android.util.*

Merge commit '0d531f5b5927556fd94e44eedacb678f6341479b' into kraken

* commit '0d531f5b5927556fd94e44eedacb678f6341479b':
  relocate android.util.base64.* -> android.util.*

14 years agoam e16741b2: am 272b504e: Merge "Tame the monkey. Bug #2547546" into froyo
Romain Guy [Mon, 29 Mar 2010 21:04:58 +0000 (14:04 -0700)]
am e16741b2: am 272b504e: Merge "Tame the monkey. Bug #2547546" into froyo

Merge commit 'e16741b22a55289bd22787b91842b410213556f6' into kraken

* commit 'e16741b22a55289bd22787b91842b410213556f6':
  Tame the monkey.

14 years agoam 9d59c70a: am 12cd8a3c: Merge "doc change: Indicate that only the first 8 character...
Dirk Dougherty [Mon, 29 Mar 2010 21:04:55 +0000 (14:04 -0700)]
am 9d59c70a: am 12cd8a3c: Merge "doc change: Indicate that only the first 8 characters of the key alias are used." into froyo

Merge commit '9d59c70a5599da86cf8ba0c3f5eddf9af08cf71b' into kraken

* commit '9d59c70a5599da86cf8ba0c3f5eddf9af08cf71b':
  doc change: Indicate that only the first 8 characters of the key alias are used.

14 years agoam ab69e29c: relocate android.util.base64.* -> android.util.*
Doug Zongker [Mon, 29 Mar 2010 21:00:58 +0000 (14:00 -0700)]
am ab69e29c: relocate android.util.base64.* -> android.util.*

Merge commit 'ab69e29c1927bdc6143324eba5ccd78f7c43128d' into froyo-plus-aosp

* commit 'ab69e29c1927bdc6143324eba5ccd78f7c43128d':
  relocate android.util.base64.* -> android.util.*

14 years agoam 272b504e: Merge "Tame the monkey. Bug #2547546" into froyo
Romain Guy [Mon, 29 Mar 2010 20:06:20 +0000 (13:06 -0700)]
am 272b504e: Merge "Tame the monkey. Bug #2547546" into froyo

Merge commit '272b504ee6aaf2515572520cd642f9a4fbf81a44' into froyo-plus-aosp

* commit '272b504ee6aaf2515572520cd642f9a4fbf81a44':
  Tame the monkey.

14 years agoam 12cd8a3c: Merge "doc change: Indicate that only the first 8 characters of the...
Dirk Dougherty [Mon, 29 Mar 2010 20:06:17 +0000 (13:06 -0700)]
am 12cd8a3c: Merge "doc change: Indicate that only the first 8 characters of the key alias are used." into froyo

Merge commit '12cd8a3c27aac27832d42f559afeebf0d95f14d3' into froyo-plus-aosp

* commit '12cd8a3c27aac27832d42f559afeebf0d95f14d3':
  doc change: Indicate that only the first 8 characters of the key alias are used.

14 years agoam 8ccfd36d: am 1e64e52c: Merge "Fix a bug where the TimedEventQueue mistakenly acces...
Andreas Huber [Mon, 29 Mar 2010 20:06:11 +0000 (13:06 -0700)]
am 8ccfd36d: am 1e64e52c: Merge "Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we\'re waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns." into

Merge commit '8ccfd36d3d6aae7be33dcf0c19646762298306ad' into kraken

* commit '8ccfd36d3d6aae7be33dcf0c19646762298306ad':
  Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns.

14 years agoam 1e64e52c: Merge "Fix a bug where the TimedEventQueue mistakenly accesses a bogus...
Andreas Huber [Mon, 29 Mar 2010 20:01:27 +0000 (13:01 -0700)]
am 1e64e52c: Merge "Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we\'re waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns." into froyo

Merge commit '1e64e52c8f25ab08605ee445d91bb745f1f3f2d7' into froyo-plus-aosp

* commit '1e64e52c8f25ab08605ee445d91bb745f1f3f2d7':
  Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns.

14 years agoam 9d0f6dfd: Fix build
Jean-Baptiste Queru [Mon, 29 Mar 2010 20:01:26 +0000 (13:01 -0700)]
am 9d0f6dfd: Fix build

Merge commit '9d0f6dfdc1ac0b9374acf51572f273e9c9bbc9f9' into kraken

* commit '9d0f6dfdc1ac0b9374acf51572f273e9c9bbc9f9':
  Fix build

14 years agoMerge "Tame the monkey. Bug #2547546" into froyo
Romain Guy [Mon, 29 Mar 2010 20:00:42 +0000 (13:00 -0700)]
Merge "Tame the monkey. Bug #2547546" into froyo

14 years agoMerge "doc change: Indicate that only the first 8 characters of the key alias are...
Dirk Dougherty [Mon, 29 Mar 2010 20:00:37 +0000 (13:00 -0700)]
Merge "doc change: Indicate that only the first 8 characters of the key alias are used." into froyo

14 years agoMerge "Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the...
Andreas Huber [Mon, 29 Mar 2010 19:58:03 +0000 (12:58 -0700)]
Merge "Fix a bug where the TimedEventQueue mistakenly accesses a bogus event if the only event in the queue has been cancelled while we're waiting for its scheduled time. Avoids potential int64_t overflow when converting from us to ns." into froyo

14 years agoam 7e31b282: am 0e122926: Merge "Rename private fields to break bad code examples...
Romain Guy [Mon, 29 Mar 2010 19:37:48 +0000 (12:37 -0700)]
am 7e31b282: am 0e122926: Merge "Rename private fields to break bad code examples" into froyo

Merge commit '7e31b282ddd1f4296ba702f7604044216a95f65e' into kraken

* commit '7e31b282ddd1f4296ba702f7604044216a95f65e':
  Rename private fields to break bad code examples

14 years agoam 0e122926: Merge "Rename private fields to break bad code examples" into froyo
Romain Guy [Mon, 29 Mar 2010 19:34:23 +0000 (12:34 -0700)]
am 0e122926: Merge "Rename private fields to break bad code examples" into froyo

Merge commit '0e1229260d66b308a0ad271c20970e3decd6f55c' into froyo-plus-aosp

* commit '0e1229260d66b308a0ad271c20970e3decd6f55c':
  Rename private fields to break bad code examples

14 years agoMerge "Rename private fields to break bad code examples" into froyo
Romain Guy [Mon, 29 Mar 2010 19:28:20 +0000 (12:28 -0700)]
Merge "Rename private fields to break bad code examples" into froyo

14 years agoam cdb9839a: am 5d961085: Add a test of EGL pausing and resuming.
Jack Palevich [Mon, 29 Mar 2010 19:24:48 +0000 (12:24 -0700)]
am cdb9839a: am 5d961085: Add a test of EGL pausing and resuming.

Merge commit 'cdb9839a569819f233c6d0d9658ffa1fab938794' into kraken

* commit 'cdb9839a569819f233c6d0d9658ffa1fab938794':
  Add a test of EGL pausing and resuming.

14 years agoam 5d961085: Add a test of EGL pausing and resuming.
Jack Palevich [Mon, 29 Mar 2010 19:22:08 +0000 (12:22 -0700)]
am 5d961085: Add a test of EGL pausing and resuming.

Merge commit '5d961085c33d17e43330ed2d3ada03ffcfa04817' into froyo-plus-aosp

* commit '5d961085c33d17e43330ed2d3ada03ffcfa04817':
  Add a test of EGL pausing and resuming.

14 years agoAdd a test of EGL pausing and resuming.
Jack Palevich [Mon, 29 Mar 2010 19:09:57 +0000 (12:09 -0700)]
Add a test of EGL pausing and resuming.

14 years agoam 92380919: am b99fe5e6: cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into...
Irfan Sheriff [Mon, 29 Mar 2010 19:12:48 +0000 (12:12 -0700)]
am 92380919: am b99fe5e6: cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo

Merge commit '92380919cc54fb6f0b56d1c69ebbb66d4d78bfaa' into kraken

* commit '92380919cc54fb6f0b56d1c69ebbb66d4d78bfaa':
  cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo

14 years agoam b99fe5e6: cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo
Irfan Sheriff [Mon, 29 Mar 2010 19:07:37 +0000 (12:07 -0700)]
am b99fe5e6: cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo

Merge commit 'b99fe5e622aa5419d80c02e3fab614372f44bc2a' into froyo-plus-aosp

* commit 'b99fe5e622aa5419d80c02e3fab614372f44bc2a':
  cherry-pick 288b4ac94571e6f77036831708e7bb7c31874688 into froyo

14 years agoam 1889f40a: am ab924c90: Merge "Make EditTextPreference scrollable. Bug #2549257...
Romain Guy [Mon, 29 Mar 2010 18:32:53 +0000 (11:32 -0700)]
am 1889f40a: am ab924c90: Merge "Make EditTextPreference scrollable. Bug #2549257" into froyo

Merge commit '1889f40aa17bd658df1b7181d091a6dff631ec95' into kraken

* commit '1889f40aa17bd658df1b7181d091a6dff631ec95':
  Make EditTextPreference scrollable.

14 years agoam ab924c90: Merge "Make EditTextPreference scrollable. Bug #2549257" into froyo
Romain Guy [Mon, 29 Mar 2010 18:28:07 +0000 (11:28 -0700)]
am ab924c90: Merge "Make EditTextPreference scrollable. Bug #2549257" into froyo

Merge commit 'ab924c909a516eb71fef7c238a20c7755f8170ed' into froyo-plus-aosp

* commit 'ab924c909a516eb71fef7c238a20c7755f8170ed':
  Make EditTextPreference scrollable.

14 years agoMerge "Make EditTextPreference scrollable. Bug #2549257" into froyo
Romain Guy [Mon, 29 Mar 2010 18:24:31 +0000 (11:24 -0700)]
Merge "Make EditTextPreference scrollable. Bug #2549257" into froyo

14 years agoam 5849606d: merge from open-source master
The Android Open Source Project [Mon, 29 Mar 2010 18:10:32 +0000 (11:10 -0700)]
am 5849606d: merge from open-source master

Merge commit '5849606df71fb3d5ce88b966cff8382deccd56b6' into kraken

* commit '5849606df71fb3d5ce88b966cff8382deccd56b6':
  Fix typos in comment.
  CursorToBulkCursorAdapter.close must call mCursor.close instead of mCursor.deactivate. This prevent us to call Cursor.close on cross process ContentProvider and may cause a database leak problem.

14 years agomerge from open-source master
The Android Open Source Project [Mon, 29 Mar 2010 18:04:30 +0000 (11:04 -0700)]
merge from open-source master

Change-Id: I6a7542e696e69bc8788f3b3b77fcec50512ba81c

14 years agoam c89704a7: merge from open-source master
The Android Open Source Project [Mon, 29 Mar 2010 18:03:33 +0000 (11:03 -0700)]
am c89704a7: merge from open-source master

Merge commit 'c89704a77f9c51ebd8c1cc6863e15ff402a56c86' into kraken

* commit 'c89704a77f9c51ebd8c1cc6863e15ff402a56c86':
  Fix Memory Leak When Switching Input Methods

14 years agomerge from open-source master
The Android Open Source Project [Mon, 29 Mar 2010 17:57:04 +0000 (10:57 -0700)]
merge from open-source master

Change-Id: I6a8109d11dabc579501c598ab2927cf802797130

14 years agoam 3e9032e6: Merge "Increase name-label height so that "g" isn\'t cut off anymore...
Daniel Lehmann [Mon, 29 Mar 2010 17:37:41 +0000 (10:37 -0700)]
am 3e9032e6: Merge "Increase name-label height so that "g" isn\'t cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts Bug:2542703 Bug:2549485" into froyo

Merge commit '3e9032e646c898a725c256c90031494cc349eea0' into kraken

* commit '3e9032e646c898a725c256c90031494cc349eea0':
  Increase name-label height so that "g" isn't cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts

14 years agoMerge "Increase name-label height so that "g" isn't cut off anymore. Decrease header...
Daniel Lehmann [Mon, 29 Mar 2010 17:30:54 +0000 (10:30 -0700)]
Merge "Increase name-label height so that "g" isn't cut off anymore. Decrease header height so that no resizes are required after background loading for most contacts Bug:2542703 Bug:2549485" into froyo

14 years agoam 0737d77a: Merge "Implement audio focus support in the notification manager." into...
Jean-Michel Trivi [Mon, 29 Mar 2010 17:14:28 +0000 (10:14 -0700)]
am 0737d77a: Merge "Implement audio focus support in the notification manager." into froyo

Merge commit '0737d77ac3964e4db8218ca61a1eaaae31a74f1c' into kraken

* commit '0737d77ac3964e4db8218ca61a1eaaae31a74f1c':
  Implement audio focus support in the notification manager.

14 years agoMerge "Implement audio focus support in the notification manager." into froyo
Jean-Michel Trivi [Mon, 29 Mar 2010 17:05:28 +0000 (10:05 -0700)]
Merge "Implement audio focus support in the notification manager." into froyo

14 years agoam 51b97011: cherry-pick 4a4f9886a789ece80f127397c1c7ad7f543b78fa into froyo
Grace Kloba [Mon, 29 Mar 2010 16:44:05 +0000 (09:44 -0700)]
am 51b97011: cherry-pick 4a4f9886a789ece80f127397c1c7ad7f543b78fa into froyo

Merge commit '51b97011b73c10b832ea4ad10637f761802e125d' into kraken

* commit '51b97011b73c10b832ea4ad10637f761802e125d':
  cherry-pick 4a4f9886a789ece80f127397c1c7ad7f543b78fa into froyo

14 years agoam 7c3006f5: http://b/issue?id=2496591 When receiving a message to delete the root...
Leon Clarke [Mon, 29 Mar 2010 16:10:58 +0000 (09:10 -0700)]
am 7c3006f5: b/issue?id=2496591 When receiving a message to delete the root layer, delay it until the next new picture message, so that the layers only disappear when we start displaying the new page, and not the moment the DOM on the old page is destroyed.

Merge commit '7c3006f53ac02adeac7396726cdc0bf5d6d01926' into kraken

* commit '7c3006f53ac02adeac7396726cdc0bf5d6d01926':
  http://b/issue?id=2496591

14 years agoam 0ca25191: Add some comments for zoom methods.
Wu-cheng Li [Mon, 29 Mar 2010 09:08:09 +0000 (02:08 -0700)]
am 0ca25191: Add some comments for zoom methods.

Merge commit '0ca25191c663ef229f1f475b17899f2017ed6980' into kraken

* commit '0ca25191c663ef229f1f475b17899f2017ed6980':
  Add some comments for zoom methods.

14 years agoam 4a65900c: Turn off logging.
Jack Palevich [Sat, 27 Mar 2010 22:12:31 +0000 (15:12 -0700)]
am 4a65900c: Turn off logging.

Merge commit '4a65900cd69b79e6e47d275575eaeb5bb2487f9f' into kraken

* commit '4a65900cd69b79e6e47d275575eaeb5bb2487f9f':
  Turn off logging.

14 years agoam 7205b0fc: Merge "cherry-pick 7d39f981badf7ec75138d6ef97d37c57a63ab5f0 to froyo...
Dirk Dougherty [Sat, 27 Mar 2010 20:08:53 +0000 (13:08 -0700)]
am 7205b0fc: Merge "cherry-pick 7d39f981badf7ec75138d6ef97d37c57a63ab5f0 to froyo." into froyo

Merge commit '7205b0fcb43e9309e2516420d235a1df0b3cd04a' into kraken

* commit '7205b0fcb43e9309e2516420d235a1df0b3cd04a':
  cherry-pick 7d39f981badf7ec75138d6ef97d37c57a63ab5f0 to froyo.

14 years agoam 4c8a63ca: Merge "Fix issue #2538228: Intents targeting browsers constantly nagging...
Dianne Hackborn [Sat, 27 Mar 2010 20:08:50 +0000 (13:08 -0700)]
am 4c8a63ca: Merge "Fix issue #2538228: Intents targeting browsers constantly nagging" into froyo

Merge commit '4c8a63ca4d4ac18f593fd9c235f18ba1f691eef7' into kraken

* commit '4c8a63ca4d4ac18f593fd9c235f18ba1f691eef7':
  Fix issue #2538228: Intents targeting browsers constantly nagging

14 years agoam 5c2a502b: cherry-pick 72aadeb013548cfdc317b5f6fec9dab9551911b8 to froyo.
Dirk Dougherty [Sat, 27 Mar 2010 20:08:48 +0000 (13:08 -0700)]
am 5c2a502b: cherry-pick 72aadeb013548cfdc317b5f6fec9dab9551911b8 to froyo.

Merge commit '5c2a502bffc05d54c8de3456fee5aec5b99ff3e9' into kraken

* commit '5c2a502bffc05d54c8de3456fee5aec5b99ff3e9':
  cherry-pick 72aadeb013548cfdc317b5f6fec9dab9551911b8 to froyo.

14 years agoam 1f196f29: Merge "cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo...
Dirk Dougherty [Sat, 27 Mar 2010 20:08:44 +0000 (13:08 -0700)]
am 1f196f29: Merge "cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo" into froyo

Merge commit '1f196f29127f9a05d0bd0553d2f3db2ad983df14' into kraken

* commit '1f196f29127f9a05d0bd0553d2f3db2ad983df14':
  cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo

14 years agoMerge "cherry-pick 7d39f981badf7ec75138d6ef97d37c57a63ab5f0 to froyo." into froyo
Dirk Dougherty [Sat, 27 Mar 2010 01:25:05 +0000 (18:25 -0700)]
Merge "cherry-pick 7d39f981badf7ec75138d6ef97d37c57a63ab5f0 to froyo." into froyo

14 years agoMerge "Fix issue #2538228: Intents targeting browsers constantly nagging" into froyo
Dianne Hackborn [Sat, 27 Mar 2010 01:06:52 +0000 (18:06 -0700)]
Merge "Fix issue #2538228: Intents targeting browsers constantly nagging" into froyo

14 years agoMerge "cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo" into froyo
Dirk Dougherty [Sat, 27 Mar 2010 00:50:26 +0000 (17:50 -0700)]
Merge "cherry-pick af4786bcb5945f72e8639d74611cd5f9b0236710 to froyo" into froyo

14 years agoam 213b9805: Merge "Don\'t assume there\'s a selected position in touch mode. Bug...
Romain Guy [Sat, 27 Mar 2010 00:37:08 +0000 (17:37 -0700)]
am 213b9805: Merge "Don\'t assume there\'s a selected position in touch mode. Bug #2520743" into froyo

Merge commit '213b9805e31ae9de26c740c04e04af2090759e52' into kraken

* commit '213b9805e31ae9de26c740c04e04af2090759e52':
  Don't assume there's a selected position in touch mode.

14 years agoMerge "Don't assume there's a selected position in touch mode. Bug #2520743" into...
Romain Guy [Sat, 27 Mar 2010 00:30:40 +0000 (17:30 -0700)]
Merge "Don't assume there's a selected position in touch mode. Bug #2520743" into froyo

14 years agoam a947fce3: cherry-pick fda3521ea37b53c1dc633c39845e4e8f25c3234f into froyo
Dirk Dougherty [Sat, 27 Mar 2010 00:02:28 +0000 (17:02 -0700)]
am a947fce3: cherry-pick fda3521ea37b53c1dc633c39845e4e8f25c3234f into froyo

Merge commit 'a947fce312fb0670ed4e5a486cf9dbd226baa948' into kraken

* commit 'a947fce312fb0670ed4e5a486cf9dbd226baa948':
  cherry-pick fda3521ea37b53c1dc633c39845e4e8f25c3234f into froyo

14 years agoam 7986a167: Merge "Cherry-pick 97432e866eedd2a179242fa7017e03b6febe4887 to froyo...
Dirk Dougherty [Sat, 27 Mar 2010 00:02:25 +0000 (17:02 -0700)]
am 7986a167: Merge "Cherry-pick 97432e866eedd2a179242fa7017e03b6febe4887 to froyo." into froyo

Merge commit '7986a167d0d8078f33d3ab580252e2f0849e1fad' into kraken

* commit '7986a167d0d8078f33d3ab580252e2f0849e1fad':
  Cherry-pick 97432e866eedd2a179242fa7017e03b6febe4887 to froyo.

14 years agoam c7d2e169: Merge "Cherry-picking this fix into Froyo." into froyo
Jean-Michel Trivi [Fri, 26 Mar 2010 23:27:47 +0000 (16:27 -0700)]
am c7d2e169: Merge "Cherry-picking this fix into Froyo." into froyo

Merge commit 'c7d2e169c04de37717c2320184f87caed6be7769' into kraken

* commit 'c7d2e169c04de37717c2320184f87caed6be7769':
  Cherry-picking this fix into Froyo.

14 years agoMerge "Cherry-pick 97432e866eedd2a179242fa7017e03b6febe4887 to froyo." into froyo
Dirk Dougherty [Fri, 26 Mar 2010 23:27:07 +0000 (16:27 -0700)]
Merge "Cherry-pick 97432e866eedd2a179242fa7017e03b6febe4887 to froyo." into froyo

14 years agoMerge "Cherry-picking this fix into Froyo." into froyo
Jean-Michel Trivi [Fri, 26 Mar 2010 23:17:38 +0000 (16:17 -0700)]
Merge "Cherry-picking this fix into Froyo." into froyo

14 years agoam 307a2b59: Merge "Remove long_press when WebView lost window focus. Reset touch...
Grace Kloba [Fri, 26 Mar 2010 22:40:18 +0000 (15:40 -0700)]
am 307a2b59: Merge "Remove long_press when WebView lost window focus. Reset touch mode too." into froyo

Merge commit '307a2b59ba9666c071f5c5b03f58700e7c28ea35' into kraken

* commit '307a2b59ba9666c071f5c5b03f58700e7c28ea35':
  Remove long_press when WebView lost window focus.

14 years agoMerge "Remove long_press when WebView lost window focus. Reset touch mode too." into...
Grace Kloba [Fri, 26 Mar 2010 22:30:26 +0000 (15:30 -0700)]
Merge "Remove long_press when WebView lost window focus. Reset touch mode too." into froyo

14 years agoam 9c3cee98: API CHANGE: Backup/restore API changes requested by the API Council
Christopher Tate [Fri, 26 Mar 2010 21:48:09 +0000 (14:48 -0700)]
am 9c3cee98: API CHANGE: Backup/restore API changes requested by the API Council

Merge commit '9c3cee9824026764275e4d84ba9b5d9fdc5da690' into kraken

* commit '9c3cee9824026764275e4d84ba9b5d9fdc5da690':
  API CHANGE: Backup/restore API changes requested by the API Council

14 years agoam a3de7455: Move PackageManagerTests and AsecTests.
Brett Chabot [Fri, 26 Mar 2010 21:31:39 +0000 (14:31 -0700)]
am a3de7455: Move PackageManagerTests and AsecTests.

Merge commit 'a3de74555120cc4dc205a3f93ef44c843b8d64a8' into kraken

* commit 'a3de74555120cc4dc205a3f93ef44c843b8d64a8':
  Move PackageManagerTests and AsecTests.

14 years agoam 092cfaaa: Merge "cherry-picked bf4650ca39c9153e38c76280ceb5e9af48b67751 to froyo...
Grace Kloba [Fri, 26 Mar 2010 21:31:35 +0000 (14:31 -0700)]
am 092cfaaa: Merge "cherry-picked bf4650ca39c9153e38c76280ceb5e9af48b67751 to froyo" into froyo

Merge commit '092cfaaa22795b7e63f2e55ff9102a569ec17efe' into kraken

* commit '092cfaaa22795b7e63f2e55ff9102a569ec17efe':
  cherry-picked bf4650ca39c9153e38c76280ceb5e9af48b67751 to froyo

14 years agoam d49258fe: Fix issue #2544466: Car Home brightness icon comes and goes while phone...
Dianne Hackborn [Fri, 26 Mar 2010 21:31:32 +0000 (14:31 -0700)]
am d49258fe: Fix issue #2544466: Car Home brightness icon comes and goes while phone is in car dock in FRE83

Merge commit 'd49258fed489bcd72a2b2a6ce3a3c38d4b2531e6' into kraken

* commit 'd49258fed489bcd72a2b2a6ce3a3c38d4b2531e6':
  Fix issue #2544466: Car Home brightness icon comes and goes while phone is in car dock in FRE83

14 years agoam fc6d1ba9: Merge "Hide download manager." into froyo
Jean-Baptiste Queru [Fri, 26 Mar 2010 21:31:28 +0000 (14:31 -0700)]
am fc6d1ba9: Merge "Hide download manager." into froyo

Merge commit 'fc6d1ba930111ef7a51d91908f489ca9469fc572' into kraken

* commit 'fc6d1ba930111ef7a51d91908f489ca9469fc572':
  Hide download manager.

14 years agoam 89837b25: Merge "Fix StatusBarService deadlock for real this time." into froyo
Joe Onorato [Fri, 26 Mar 2010 21:31:23 +0000 (14:31 -0700)]
am 89837b25: Merge "Fix StatusBarService deadlock for real this time." into froyo

Merge commit '89837b25c85929b29288fd42727c44093548fced' into kraken

* commit '89837b25c85929b29288fd42727c44093548fced':
  Fix StatusBarService deadlock for real this time.

14 years agoam 4ea1eea5: (-s ours) Merge "Redesigned keyguard layout in the no-SIM case. DO NOT...
Daniel Sandler [Fri, 26 Mar 2010 21:31:17 +0000 (14:31 -0700)]
am 4ea1eea5: (-s ours) Merge "Redesigned keyguard layout in the no-SIM case. DO NOT MERGE" into froyo

Merge commit '4ea1eea55bedcf83e643f7847f5f0a3ccce35187' into kraken

* commit '4ea1eea55bedcf83e643f7847f5f0a3ccce35187':
  Redesigned keyguard layout in the no-SIM case. DO NOT MERGE

14 years agoMerge "cherry-picked bf4650ca39c9153e38c76280ceb5e9af48b67751 to froyo" into froyo
Grace Kloba [Fri, 26 Mar 2010 20:55:34 +0000 (13:55 -0700)]
Merge "cherry-picked bf4650ca39c9153e38c76280ceb5e9af48b67751 to froyo" into froyo

14 years agoMerge "Hide download manager." into froyo
Jean-Baptiste Queru [Fri, 26 Mar 2010 19:25:11 +0000 (12:25 -0700)]
Merge "Hide download manager." into froyo

14 years agoMerge "Fix StatusBarService deadlock for real this time." into froyo
Joe Onorato [Fri, 26 Mar 2010 19:14:49 +0000 (12:14 -0700)]
Merge "Fix StatusBarService deadlock for real this time." into froyo

14 years agoMerge "Redesigned keyguard layout in the no-SIM case. DO NOT MERGE" into froyo
Daniel Sandler [Fri, 26 Mar 2010 18:41:34 +0000 (11:41 -0700)]
Merge "Redesigned keyguard layout in the no-SIM case. DO NOT MERGE" into froyo

14 years agoMerge "Clarify some Binder docs regarding things that are thread-local."
Brad Fitzpatrick [Fri, 26 Mar 2010 04:02:46 +0000 (21:02 -0700)]
Merge "Clarify some Binder docs regarding things that are thread-local."

14 years agoMerge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number"
Mathias Agopian [Fri, 26 Mar 2010 03:22:58 +0000 (20:22 -0700)]
Merge "fix [2236865] STOPSHIP: bump soft gl and egl minor version number"

14 years agofix [2236865] STOPSHIP: bump soft gl and egl minor version number
Mathias Agopian [Fri, 26 Mar 2010 03:21:12 +0000 (20:21 -0700)]
fix [2236865] STOPSHIP: bump soft gl and egl minor version number

this is to allow developpers to deal with potiential differences
between the softgl versions.

Change-Id: I7ec2451d6af1be29818d66215b22977405d403e8

14 years agoMerge "Fix 2535700: Add support for enforcing password quality"
Jim Miller [Fri, 26 Mar 2010 02:54:15 +0000 (19:54 -0700)]
Merge "Fix 2535700: Add support for enforcing password quality"

14 years agoMerge "Fix Memory Leak When Switching Input Methods"
Dianne Hackborn [Fri, 26 Mar 2010 02:23:09 +0000 (19:23 -0700)]
Merge "Fix Memory Leak When Switching Input Methods"

14 years agoMerge "Remove spurious byte order marks from xml files."
Marco Nelissen [Fri, 26 Mar 2010 02:06:23 +0000 (19:06 -0700)]
Merge "Remove spurious byte order marks from xml files."

14 years agoMerge "Fix bug 2544916 - Fun with AbsListView touch mode"
Adam Powell [Fri, 26 Mar 2010 01:55:47 +0000 (18:55 -0700)]
Merge "Fix bug 2544916 - Fun with AbsListView touch mode"

14 years agoMerge "fix [2545826] calling into gralloc with external lock held"
Mathias Agopian [Fri, 26 Mar 2010 01:42:34 +0000 (18:42 -0700)]
Merge "fix [2545826] calling into gralloc with external lock held"

14 years agoMerge "Add "dumpsys diskstats" to get a dump of disk-free values."
Dan Egnor [Fri, 26 Mar 2010 00:59:00 +0000 (17:59 -0700)]
Merge "Add "dumpsys diskstats" to get a dump of disk-free values."

14 years agoMerge "GLSurfaceView pause and resume now synchronize with the GLThread."
Jack Palevich [Fri, 26 Mar 2010 00:21:50 +0000 (17:21 -0700)]
Merge "GLSurfaceView pause and resume now synchronize with the GLThread."

14 years agoMerge "API refactoring for OverScroller."
Adam Powell [Fri, 26 Mar 2010 00:03:58 +0000 (17:03 -0700)]
Merge "API refactoring for OverScroller."

14 years agomerge from open-source master
The Android Open Source Project [Thu, 25 Mar 2010 23:39:32 +0000 (16:39 -0700)]
merge from open-source master

Change-Id: I4d8f34986fd9e16ead8a22909263069dbb819d3e

14 years agoMerge "Fix 2495749 - System process crash when a notification switches sections."
Joe Onorato [Thu, 25 Mar 2010 23:00:25 +0000 (16:00 -0700)]
Merge "Fix 2495749 - System process crash when a notification switches sections."

14 years agoMerge "Fix Tethering of multiple downstream ifaces."
Robert Greenwalt [Thu, 25 Mar 2010 22:50:25 +0000 (15:50 -0700)]
Merge "Fix Tethering of multiple downstream ifaces."

14 years agoMerge "check for nulls"
Fred Quintana [Thu, 25 Mar 2010 21:39:15 +0000 (14:39 -0700)]
Merge "check for nulls"

14 years agofix [2545826] calling into gralloc with external lock held
Mathias Agopian [Thu, 25 Mar 2010 21:34:49 +0000 (14:34 -0700)]
fix [2545826] calling into gralloc with external lock held

Change-Id: I2d0e017382404c684c768a0dd0423d574213f10a

14 years agoMerge "Add .3gpp as the preferred extension for video/3gpp."
Patrick Scott [Thu, 25 Mar 2010 20:27:57 +0000 (13:27 -0700)]
Merge "Add .3gpp as the preferred extension for video/3gpp."

14 years agoMerge "Use a more benign icon for ADB notifications."
Daniel Sandler [Thu, 25 Mar 2010 20:26:36 +0000 (13:26 -0700)]
Merge "Use a more benign icon for ADB notifications."

14 years agoMerge "Better fix for gettid() sim-eng breakage from last night."
Brad Fitzpatrick [Thu, 25 Mar 2010 20:22:15 +0000 (13:22 -0700)]
Merge "Better fix for gettid() sim-eng breakage from last night."

14 years agoMerge "Hide download manager."
Jean-Baptiste Queru [Thu, 25 Mar 2010 19:35:22 +0000 (12:35 -0700)]
Merge "Hide download manager."

14 years agoMerge "Dumb late-night typo."
Dianne Hackborn [Thu, 25 Mar 2010 19:32:12 +0000 (12:32 -0700)]
Merge "Dumb late-night typo."

14 years agoMerge "Add window flags and window types to hierarchyviewer."
Joe Onorato [Thu, 25 Mar 2010 18:54:12 +0000 (11:54 -0700)]
Merge "Add window flags and window types to hierarchyviewer."

14 years agoMerge "Turn off thread logging (too many messages.)"
Jack Palevich [Thu, 25 Mar 2010 18:54:10 +0000 (11:54 -0700)]
Merge "Turn off thread logging (too many messages.)"

14 years agoMerge "Refactoring PackageManagerHostTests helper functions into a utility class...
Neal Nguyen [Thu, 25 Mar 2010 18:09:38 +0000 (11:09 -0700)]
Merge "Refactoring PackageManagerHostTests helper functions into a utility class for easier sharing with future stress tests."

14 years agoMerge "update dox that we ignore the exact parameter on computeBounds"
Mike Reed [Thu, 25 Mar 2010 18:04:02 +0000 (11:04 -0700)]
Merge "update dox that we ignore the exact parameter on computeBounds"

14 years agoMerge "Add logging of GLSurfaceView pause/resume calls."
Jack Palevich [Thu, 25 Mar 2010 17:53:10 +0000 (10:53 -0700)]
Merge "Add logging of GLSurfaceView pause/resume calls."

14 years agoMerge "Turn on plugin signature checking."
Grace Kloba [Thu, 25 Mar 2010 17:32:22 +0000 (10:32 -0700)]
Merge "Turn on plugin signature checking."

14 years agoMerge "MountService: Switch all Log -> Slog"
San Mehat [Thu, 25 Mar 2010 17:20:44 +0000 (10:20 -0700)]
Merge "MountService: Switch all Log -> Slog"

14 years agoMerge "Call unlinkToDeath() when we disconnect the Camera, so we don't hold the ...
Chih-Chung Chang [Thu, 25 Mar 2010 17:05:58 +0000 (10:05 -0700)]
Merge "Call unlinkToDeath() when we disconnect the Camera, so we don't hold the (weak) reference to it, which caused (small) memory leaks."

14 years agoMerge "Fix Phone App crash due to binary data in HSP/HFP stream."
Nick Pelly [Thu, 25 Mar 2010 17:01:21 +0000 (10:01 -0700)]
Merge "Fix Phone App crash due to binary data in HSP/HFP stream."

14 years agoMerge "New lock/unlock sounds."
Dave Sparks [Thu, 25 Mar 2010 15:24:24 +0000 (08:24 -0700)]
Merge "New lock/unlock sounds."

14 years agoMerge "http://b/issue?id=2516676 Correctly scale the play button and youtube logo...
Leon Clarke [Thu, 25 Mar 2010 14:38:22 +0000 (07:38 -0700)]
Merge "b/issue?id=2516676 Correctly scale the play button and youtube logo when embedded youtube videos are displayed at smaller than the suggested size."

14 years agoMerge "Use a secure setting for default browser geolocation permissions"
Bjorn Bringert [Thu, 25 Mar 2010 14:36:46 +0000 (07:36 -0700)]
Merge "Use a secure setting for default browser geolocation permissions"

14 years agoMerge "Fix testCameraPreviewMemoryUsage test."
Wu-cheng Li [Thu, 25 Mar 2010 10:52:00 +0000 (03:52 -0700)]
Merge "Fix testCameraPreviewMemoryUsage test."

14 years agoMerge "Hopefully fix the sim-eng build, part 2."
Brad Fitzpatrick [Thu, 25 Mar 2010 09:05:31 +0000 (02:05 -0700)]
Merge "Hopefully fix the sim-eng build, part 2."

14 years agoMerge "Fix issue #2543231: chat invitation dialog does show all the time"
Dianne Hackborn [Thu, 25 Mar 2010 08:02:32 +0000 (01:02 -0700)]
Merge "Fix issue #2543231: chat invitation dialog does show all the time"