Commit Graph

9944 Commits

Author SHA1 Message Date
Suchi Amalapurapu
070e1ecfee am a137cf2a: am 4b18ced6: Merge "Fix 2578016." into froyo
Merge commit 'a137cf2a1899b863913b4ab32a87835c2d47d8fe' into kraken

* commit 'a137cf2a1899b863913b4ab32a87835c2d47d8fe':
  Fix 2578016.
2010-04-07 16:35:57 -07:00
Suchi Amalapurapu
a137cf2a18 am 4b18ced6: Merge "Fix 2578016." into froyo
Merge commit '4b18ced6b5409bb9dd4013c06b9562b76a062939' into froyo-plus-aosp

* commit '4b18ced6b5409bb9dd4013c06b9562b76a062939':
  Fix 2578016.
2010-04-07 16:32:26 -07:00
Suchi Amalapurapu
4b18ced6b5 Merge "Fix 2578016." into froyo 2010-04-07 15:25:51 -07:00
Ray Chen
84d12f3fe7 am dbad286c: am 25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871" into froyo
Merge commit 'dbad286c4640ab7d2244695c5b175ebd1b6fcbab' into kraken

* commit 'dbad286c4640ab7d2244695c5b175ebd1b6fcbab':
  Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
2010-04-07 12:14:49 -07:00
Ray Chen
dbad286c46 am 25c2dd60: Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871" into froyo
Merge commit '25c2dd60d43298c18b9459abd6ff33046d675fe6' into froyo-plus-aosp

* commit '25c2dd60d43298c18b9459abd6ff33046d675fe6':
  Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
2010-04-07 12:09:42 -07:00
Ray Chen
25c2dd60d4 Merge "Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener http://2553871" into froyo 2010-04-07 12:05:58 -07:00
Dianne Hackborn
7aed1e14b5 am d66e2b23: am 4e7cacd3: Merge "Maybe fix issue #2568615: System server crashed in SyncStorageEngine" into froyo
Merge commit 'd66e2b23a5c6b4b2b6586015c1a6951b4d6d1bfa' into kraken

* commit 'd66e2b23a5c6b4b2b6586015c1a6951b4d6d1bfa':
  Maybe fix issue #2568615: System server crashed in SyncStorageEngine
2010-04-07 11:58:21 -07:00
Dianne Hackborn
d00fb429c1 am 03e352a2: am 8258fda1: Fix issue #2576268: There is no uiMode config change constant for the manifest
Merge commit '03e352a2850d74cee11d3f0734938efb22cac351' into kraken

* commit '03e352a2850d74cee11d3f0734938efb22cac351':
  Fix issue #2576268: There is no uiMode config change constant for the manifest
2010-04-07 11:58:17 -07:00
Dianne Hackborn
d66e2b23a5 am 4e7cacd3: Merge "Maybe fix issue #2568615: System server crashed in SyncStorageEngine" into froyo
Merge commit '4e7cacd3e44bd222a7892113336caff571a9983a' into froyo-plus-aosp

* commit '4e7cacd3e44bd222a7892113336caff571a9983a':
  Maybe fix issue #2568615: System server crashed in SyncStorageEngine
2010-04-07 11:52:21 -07:00
Dianne Hackborn
03e352a285 am 8258fda1: Fix issue #2576268: There is no uiMode config change constant for the manifest
Merge commit '8258fda17741b4969b93ffbe8796c76e427a9f27' into froyo-plus-aosp

* commit '8258fda17741b4969b93ffbe8796c76e427a9f27':
  Fix issue #2576268: There is no uiMode config change constant for the manifest
2010-04-07 11:52:17 -07:00
Dianne Hackborn
4e7cacd3e4 Merge "Maybe fix issue #2568615: System server crashed in SyncStorageEngine" into froyo 2010-04-07 11:49:37 -07:00
Suchi Amalapurapu
30f775b12a Fix 2578016.
Add some checks before moving package.
Checkin test code.
Regenerate test apks

Change-Id: I769ece128fefd3429ce93208a77d887c7759d2e1
2010-04-07 11:43:31 -07:00
Dianne Hackborn
4e80820ab5 Maybe fix issue #2568615: System server crashed in SyncStorageEngine
Ack, we were acquiring the wrong lock at some points when
accessing the data structure!

Change-Id: I8bbc8e1ffa2e3e8a94bf7625e3d7f020c458eea2
2010-04-07 11:14:15 -07:00
Dianne Hackborn
8258fda177 Fix issue #2576268: There is no uiMode config change constant for the manifest
Change-Id: Id0fa812048244ae408ea54c746266a88c6c214d9
2010-04-07 11:13:38 -07:00
Xia Wang
3edc3c56c6 am b151f48a: am c93386ce: Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi." into froyo
Merge commit 'b151f48a06d9473a8ec079d928d4203d13e2568b' into kraken

* commit 'b151f48a06d9473a8ec079d928d4203d13e2568b':
  Fix bug2537659
2010-04-07 10:36:31 -07:00
Romain Guy
388fe1b040 am 2a9ec986: am 7b70f658: Search for focusable views only after layout has happened when the window is first created. Bug #2565564
Merge commit '2a9ec9869ee0fb8112426f85a85dffd966a2fa97' into kraken

* commit '2a9ec9869ee0fb8112426f85a85dffd966a2fa97':
  Search for focusable views only after layout has happened when the window is first created.
2010-04-07 10:36:28 -07:00
Xia Wang
b151f48a06 am c93386ce: Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi." into froyo
Merge commit 'c93386cece18b8467c69004561e8f22b6b053d24' into froyo-plus-aosp

* commit 'c93386cece18b8467c69004561e8f22b6b053d24':
  Fix bug2537659
2010-04-07 10:32:38 -07:00
Romain Guy
2a9ec9869e am 7b70f658: Search for focusable views only after layout has happened when the window is first created. Bug #2565564
Merge commit '7b70f6589205dec10afdb358b7ddef7aa61b7dd8' into froyo-plus-aosp

* commit '7b70f6589205dec10afdb358b7ddef7aa61b7dd8':
  Search for focusable views only after layout has happened when the window is first created.
2010-04-07 10:32:34 -07:00
Xia Wang
c93386cece Merge " Fix bug2537659 When airplane mode is disabled, Mobile connection may be bring up before connecting to a known wifi." into froyo 2010-04-07 10:30:19 -07:00
Romain Guy
7b70f65892 Search for focusable views only after layout has happened when the window is first created.
Bug #2565564

Change-Id: I9eb58bbcba873ac1d6dc0b60b0de99e0e9979398
2010-04-07 10:15:18 -07:00
Ray Chen
b7c8c76180 Per requested by API council, rename MediaScannerConneciton.ScanResultListener to .OnScanCompletedListener
http://2553871

Change-Id: I293b8138a2c23ea107b634da014902f838966c0e
2010-04-07 10:14:04 -07:00
Leon Scroggins
84d2d10d36 am efaee761: am 083c715d: Merge "Show the microphone when the search box is opened from browser" into froyo
Merge commit 'efaee761022305d74e63237d87809582514bd5e2' into kraken

* commit 'efaee761022305d74e63237d87809582514bd5e2':
  Show the microphone when the search box is opened from browser
2010-04-07 10:13:28 -07:00
Leon Scroggins
efaee76102 am 083c715d: Merge "Show the microphone when the search box is opened from browser" into froyo
Merge commit '083c715d06a99951429b38c62484f8c3caf43cd1' into froyo-plus-aosp

* commit '083c715d06a99951429b38c62484f8c3caf43cd1':
  Show the microphone when the search box is opened from browser
2010-04-07 10:09:06 -07:00
Leon Scroggins
083c715d06 Merge "Show the microphone when the search box is opened from browser" into froyo 2010-04-07 10:04:50 -07:00
Adam Powell
85a650fedf am c696b0df: am eb3d47e4: Merge "Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo
Merge commit 'c696b0df1e41f7cbd09c034e47570e6510d5a2e3' into kraken

* commit 'c696b0df1e41f7cbd09c034e47570e6510d5a2e3':
  Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection
2010-04-07 09:54:32 -07:00
Adam Powell
c696b0df1e am eb3d47e4: Merge "Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo
Merge commit 'eb3d47e43ac971b7d965db9a53ca92db2ce47d77' into froyo-plus-aosp

* commit 'eb3d47e43ac971b7d965db9a53ca92db2ce47d77':
  Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection
2010-04-07 09:51:48 -07:00
Adam Powell
eb3d47e43a Merge "Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection" into froyo 2010-04-07 09:48:48 -07:00
Leon Scroggins
e7501c17e6 Show the microphone when the search box is opened from browser
Fix for http://b/issue?id=2549036

Also required moving the call to updateWidgetState to after the
update of mUserQuery so mUserQuery could be used as a comparison.

Change-Id: I4996f09c02751a6d74e8f517669025e4bdd709d8
2010-04-07 12:22:01 -04:00
Daniel Sandler
aea1443b0d am 93720cad: am c957ebef: Merge "Add more WindowManager flags to ViewDebug." into froyo
Merge commit '93720cad0c2905e7d0a80aee154684396d8b0ed1' into kraken

* commit '93720cad0c2905e7d0a80aee154684396d8b0ed1':
  Add more WindowManager flags to ViewDebug.
2010-04-07 06:48:07 -07:00
Daniel Sandler
93720cad0c am c957ebef: Merge "Add more WindowManager flags to ViewDebug." into froyo
Merge commit 'c957ebef9755d15f92c27d690641995587c0ba2f' into froyo-plus-aosp

* commit 'c957ebef9755d15f92c27d690641995587c0ba2f':
  Add more WindowManager flags to ViewDebug.
2010-04-07 06:44:04 -07:00
Daniel Sandler
c957ebef97 Merge "Add more WindowManager flags to ViewDebug." into froyo 2010-04-07 06:40:26 -07:00
Wu-cheng Li
1bab46c648 am 14111d14: am cae57d62: Fix SDK build.
Merge commit '14111d1444ad5f5f5beb914e51eed32cfaab75cf' into kraken

* commit '14111d1444ad5f5f5beb914e51eed32cfaab75cf':
  Fix SDK build.
2010-04-06 23:12:29 -07:00
Wu-cheng Li
14111d1444 am cae57d62: Fix SDK build.
Merge commit 'cae57d6205a8ebc8599ff89629307ecb8cabb3b8' into froyo-plus-aosp

* commit 'cae57d6205a8ebc8599ff89629307ecb8cabb3b8':
  Fix SDK build.
2010-04-06 23:08:51 -07:00
Wu-cheng Li
cae57d6205 Fix SDK build.
Change-Id: I2d816f8e765678fa1dc07c1f50cef51026e66a10
2010-04-07 13:54:49 +08:00
Dan Egnor
7da9fc2f4f am aa94842c: am 9807d6a5: Merge "Comment-only change to clarify the role and use of IntentService" into froyo
Merge commit 'aa94842c1ad16298e27adf07701bf0bb792e0a51' into kraken

* commit 'aa94842c1ad16298e27adf07701bf0bb792e0a51':
  Comment-only change to clarify the role and use of IntentService
2010-04-06 22:06:48 -07:00
Dan Egnor
aa94842c1a am 9807d6a5: Merge "Comment-only change to clarify the role and use of IntentService" into froyo
Merge commit '9807d6a5b7d27f438d0bd30389c5930e3fe389d8' into froyo-plus-aosp

* commit '9807d6a5b7d27f438d0bd30389c5930e3fe389d8':
  Comment-only change to clarify the role and use of IntentService
2010-04-06 22:03:04 -07:00
Dan Egnor
9807d6a5b7 Merge "Comment-only change to clarify the role and use of IntentService" into froyo 2010-04-06 20:50:25 -07:00
Adam Powell
91f234fe4d Fix bug 2574860 - fix AbsListView.trackMotionScroll edge detection
Change-Id: I0fc6d2b8547ab56937eeb5ef3438003a06b966ec
2010-04-06 19:35:32 -07:00
Dan Egnor
6e3d9884e4 Comment-only change to clarify the role and use of IntentService
Change-Id: I0adb26daccc8d1559f96892cc31694fbf6ab4583
2010-04-06 19:19:43 -07:00
Brett Chabot
7f41a9922a am f6d41580: am 0990511f: Merge "Add makefile so package manager test apks can get buitl from root." into froyo
Merge commit 'f6d415805511bb938a2b6ce2b1ee22a184b3f2bb' into kraken

* commit 'f6d415805511bb938a2b6ce2b1ee22a184b3f2bb':
  Add makefile so package manager test apks can get buitl from root.
2010-04-06 17:44:33 -07:00
Brett Chabot
f6d4158055 am 0990511f: Merge "Add makefile so package manager test apks can get buitl from root." into froyo
Merge commit '0990511f3fe7653dabc7cc0e801f65aa2a1a59f6' into froyo-plus-aosp

* commit '0990511f3fe7653dabc7cc0e801f65aa2a1a59f6':
  Add makefile so package manager test apks can get buitl from root.
2010-04-06 17:36:49 -07:00
Brett Chabot
0990511f3f Merge "Add makefile so package manager test apks can get buitl from root." into froyo 2010-04-06 16:31:14 -07:00
Brett Chabot
5a2190877c Add makefile so package manager test apks can get buitl from root.
Change-Id: I89e3d50793a48a404c7d8e5699baea8b195b7684
2010-04-06 16:23:44 -07:00
Kenny Root
f1b256f519 Merge "Fix last character of password field being visible after rotation" into froyo 2010-04-06 14:33:24 -07:00
Daniel Lehmann
ba3147d157 am 140d040b: am d8b9b511: Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:2572239" into froyo
Merge commit '140d040b6a5d2dc01e999e6f7b69863c71b2272b' into kraken

* commit '140d040b6a5d2dc01e999e6f7b69863c71b2272b':
  Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again
2010-04-06 14:17:57 -07:00
Daniel Lehmann
140d040b6a am d8b9b511: Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:2572239" into froyo
Merge commit 'd8b9b511821a06d86b3ffaab0d71ee9ce3834678' into froyo-plus-aosp

* commit 'd8b9b511821a06d86b3ffaab0d71ee9ce3834678':
  Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again
2010-04-06 14:14:21 -07:00
Daniel Lehmann
d8b9b51182 Merge "Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again Bug:2572239" into froyo 2010-04-06 14:10:04 -07:00
Devin Taylor
71ab21a02a Fix last character of password field being visible after rotation
This is a fix for http://code.google.com/p/android/issues/detail?id=907. Note that
that issue was declined without comment, but the bug (while incredibly minor)
does exist. This can be seen on the facebook app, as well as many third party apps.

Change-Id: I8f1449c47228f5f757a5baf389656e51c817b150
2010-04-06 13:25:19 -07:00
Grace Kloba
cbc7fe0df6 am 8dbf5105: am 54fccf8a: Merge "Update the Webkit version." into froyo
Merge commit '8dbf5105739db2354057be445483a63ec96376f0' into kraken

* commit '8dbf5105739db2354057be445483a63ec96376f0':
  Update the Webkit version.
2010-04-06 12:43:19 -07:00
Romain Guy
d00edffbae am 92b46ffb: am bd4808dc: Merge "Correctly resize dialogs when measured in WRAP_CONTENT Bug #2549649" into froyo
Merge commit '92b46ffb2c0c9f2bf6700f7004b26bf952bce1ae' into kraken

* commit '92b46ffb2c0c9f2bf6700f7004b26bf952bce1ae':
  Correctly resize dialogs when measured in WRAP_CONTENT
2010-04-06 12:43:16 -07:00