21691 Commits

Author SHA1 Message Date
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
Scott Main
fae5961f57 am 31a14585: am f61eade2: Merge "docs: add a screenLayout and uiMode values for configChanges attribute add note that this should be avoided and point to dev guide" into froyo
Merge commit '31a14585819ca2aacddb539dac0084f9d81172d2' into kraken

* commit '31a14585819ca2aacddb539dac0084f9d81172d2':
  docs: add a screenLayout and uiMode values for configChanges attribute
2010-04-07 09:23:24 -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
Scott Main
31a1458581 am f61eade2: Merge "docs: add a screenLayout and uiMode values for configChanges attribute add note that this should be avoided and point to dev guide" into froyo
Merge commit 'f61eade258d5274b8447c0ea936ee578b7dc063a' into froyo-plus-aosp

* commit 'f61eade258d5274b8447c0ea936ee578b7dc063a':
  docs: add a screenLayout and uiMode values for configChanges attribute
2010-04-07 09:06:51 -07:00
Scott Main
f61eade258 Merge "docs: add a screenLayout and uiMode values for configChanges attribute add note that this should be avoided and point to dev guide" into froyo 2010-04-07 09:02:59 -07: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
Daniel Sandler
8397809cc2 Transparent alarm icons for lockscreen.
Bug: 2576281
Change-Id: Ifa4f77a6992a46e0b81118fd3bac97d2aea89e31
2010-04-07 09:01:49 -04: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
Daniel Sandler
789a25eb9b Add emergency call button to PUK'd lockscreen.
The user unlocks a PUK-locked SIM via the e-call dialer, so
we absolutely need the button there.

This is the layout portion; it requires change
I6872c3ad135bc34348adafa76e08a3878f1b506f from
frameworks/policies/base.

Bug: 2568732
Change-Id: I8aa0fc2223428ba15a57269ac5a624e74e91a5f3
2010-04-07 00:22:47 -04: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
Joe Onorato
a240ce208c Merge "Finish moving the policies out of frameworks/policies/base and into frameworks/base." into kraken 2010-04-06 18:26:39 -07:00
Joe Onorato
a5c51373d4 Finish moving the policies out of frameworks/policies/base and into frameworks/base.
Change-Id: Id3a0c06202b0f6f2206acf490c8655d340ee0556
2010-04-06 20:21:30 -05: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
Scott Main
e756b21636 docs: add a screenLayout and uiMode values for configChanges attribute
add note that this should be avoided and point to dev guide

Change-Id: I977660c14da71eaf8beb1d630cbb4f6a2f26bb50
2010-04-06 17:19:43 -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
Jean-Baptiste Queru
b1b28e26d7 Merge policy from frameworks/policies/base
Change-Id: I3ad6925b8a9f0ee14e4180e798519c23b6bf6662
2010-04-06 15:44:22 -07:00
Jean-Baptiste Queru
6e251d7d66 de-activate makefile
Change-Id: I6def51dea7aab002f7dbbe1e2573f52a2caa94fe
2010-04-06 15:43:25 -07:00
Andreas Huber
b93ae7ea24 am 3e8b89bd: am 2be77a22: Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo
Merge commit '3e8b89bd8d35525019080205e7221063748a3f0a' into kraken

* commit '3e8b89bd8d35525019080205e7221063748a3f0a':
  Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance.
2010-04-06 14:50:05 -07:00
Andreas Huber
3e8b89bd8d am 2be77a22: Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo
Merge commit '2be77a22a4db8253e7aa31d8cfa3bf7d65647cc7' into froyo-plus-aosp

* commit '2be77a22a4db8253e7aa31d8cfa3bf7d65647cc7':
  Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance.
2010-04-06 14:46:14 -07:00
Andreas Huber
2be77a22a4 Merge "Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance." into froyo 2010-04-06 14:43:05 -07:00
Kenny Root
62057cddfa am 266bb3c5: am f1b256f5: Merge "Fix last character of password field being visible after rotation" into froyo
Merge commit '266bb3c5de24e7daafdaad57152a6762f53b7cc3' into kraken

* commit '266bb3c5de24e7daafdaad57152a6762f53b7cc3':
  Fix last character of password field being visible after rotation
2010-04-06 14:38:59 -07:00
Kenny Root
266bb3c5de am f1b256f5: Merge "Fix last character of password field being visible after rotation" into froyo
Merge commit 'f1b256f5198d12952302ef2b6214a79927918866' into froyo-plus-aosp

* commit 'f1b256f5198d12952302ef2b6214a79927918866':
  Fix last character of password field being visible after rotation
2010-04-06 14:36:36 -07:00
Andreas Huber
548b7999fe Partial revert of previous change to improve hardware AAC decoder performance, increasing the input buffer size so dramatically accidentally broke streaming performance.
Change-Id: I14e9fbc1fdff61bcf89218d83cb1d2e3d6eb8438
related-to-bug: 2574491
2010-04-06 14:36:23 -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
Christopher Tate
b93107daad am ccb2c6cf: am 1bfcaa59: Merge "Fix \'bmgr restore\'" into froyo
Merge commit 'ccb2c6cf3a2bf2ddbf5cd261bd22ee02f0bf7aa7' into kraken

* commit 'ccb2c6cf3a2bf2ddbf5cd261bd22ee02f0bf7aa7':
  Fix 'bmgr restore'
2010-04-06 12:43:23 -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
Dianne Hackborn
357bff46b8 am 710312b3: am 48bce451: Merge "Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B" into froyo
Merge commit '710312b3bb0ec7bef39742e0e3fc2a3e5c987532' into kraken

* commit '710312b3bb0ec7bef39742e0e3fc2a3e5c987532':
  Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B
2010-04-06 12:43:00 -07:00
Christopher Tate
ccb2c6cf3a am 1bfcaa59: Merge "Fix \'bmgr restore\'" into froyo
Merge commit '1bfcaa592cb10059d185d8408935571d16727f54' into froyo-plus-aosp

* commit '1bfcaa592cb10059d185d8408935571d16727f54':
  Fix 'bmgr restore'
2010-04-06 12:38:50 -07:00
Grace Kloba
8dbf510573 am 54fccf8a: Merge "Update the Webkit version." into froyo
Merge commit '54fccf8a074f1b743df5b270c4f85e0e602d7f46' into froyo-plus-aosp

* commit '54fccf8a074f1b743df5b270c4f85e0e602d7f46':
  Update the Webkit version.
2010-04-06 12:38:47 -07:00
Romain Guy
92b46ffb2c am bd4808dc: Merge "Correctly resize dialogs when measured in WRAP_CONTENT Bug #2549649" into froyo
Merge commit 'bd4808dccf8cd3e5d8e96e667fa435a6c68e0f7c' into froyo-plus-aosp

* commit 'bd4808dccf8cd3e5d8e96e667fa435a6c68e0f7c':
  Correctly resize dialogs when measured in WRAP_CONTENT
2010-04-06 12:38:33 -07:00
Dianne Hackborn
710312b3bb am 48bce451: Merge "Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B" into froyo
Merge commit '48bce4515d948971a122a1e17fd1919f81297d77' into froyo-plus-aosp

* commit '48bce4515d948971a122a1e17fd1919f81297d77':
  Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B
2010-04-06 12:38:22 -07:00
Christopher Tate
1bfcaa592c Merge "Fix 'bmgr restore'" into froyo 2010-04-06 12:19:11 -07:00
Christopher Tate
1398e27bb0 Fix 'bmgr restore'
Zero means success.  Fixes bug #2573785

Change-Id: I11bd4d85aa2b3a061aa37e085790ee8cd52d50a2
2010-04-06 12:17:46 -07:00