Merge commit '31a14585819ca2aacddb539dac0084f9d81172d2' into kraken
* commit '31a14585819ca2aacddb539dac0084f9d81172d2':
docs: add a screenLayout and uiMode values for configChanges attribute
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
Merge commit 'f61eade258d5274b8447c0ea936ee578b7dc063a' into froyo-plus-aosp
* commit 'f61eade258d5274b8447c0ea936ee578b7dc063a':
docs: add a screenLayout and uiMode values for configChanges attribute
Merge commit '93720cad0c2905e7d0a80aee154684396d8b0ed1' into kraken
* commit '93720cad0c2905e7d0a80aee154684396d8b0ed1':
Add more WindowManager flags to ViewDebug.
Merge commit 'c957ebef9755d15f92c27d690641995587c0ba2f' into froyo-plus-aosp
* commit 'c957ebef9755d15f92c27d690641995587c0ba2f':
Add more WindowManager flags to ViewDebug.
Merge commit 'aa94842c1ad16298e27adf07701bf0bb792e0a51' into kraken
* commit 'aa94842c1ad16298e27adf07701bf0bb792e0a51':
Comment-only change to clarify the role and use of IntentService
Merge commit '9807d6a5b7d27f438d0bd30389c5930e3fe389d8' into froyo-plus-aosp
* commit '9807d6a5b7d27f438d0bd30389c5930e3fe389d8':
Comment-only change to clarify the role and use of IntentService
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
Merge commit 'f6d415805511bb938a2b6ce2b1ee22a184b3f2bb' into kraken
* commit 'f6d415805511bb938a2b6ce2b1ee22a184b3f2bb':
Add makefile so package manager test apks can get buitl from root.
Merge commit '0990511f3fe7653dabc7cc0e801f65aa2a1a59f6' into froyo-plus-aosp
* commit '0990511f3fe7653dabc7cc0e801f65aa2a1a59f6':
Add makefile so package manager test apks can get buitl from root.
Merge commit '266bb3c5de24e7daafdaad57152a6762f53b7cc3' into kraken
* commit '266bb3c5de24e7daafdaad57152a6762f53b7cc3':
Fix last character of password field being visible after rotation
Merge commit 'f1b256f5198d12952302ef2b6214a79927918866' into froyo-plus-aosp
* commit 'f1b256f5198d12952302ef2b6214a79927918866':
Fix last character of password field being visible after rotation
Merge commit '140d040b6a5d2dc01e999e6f7b69863c71b2272b' into kraken
* commit '140d040b6a5d2dc01e999e6f7b69863c71b2272b':
Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again
Merge commit 'd8b9b511821a06d86b3ffaab0d71ee9ce3834678' into froyo-plus-aosp
* commit 'd8b9b511821a06d86b3ffaab0d71ee9ce3834678':
Pass cookie to TOKEN_CONTACT_INFO so that QuickContact without photo works again
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
Merge commit '92b46ffb2c0c9f2bf6700f7004b26bf952bce1ae' into kraken
* commit '92b46ffb2c0c9f2bf6700f7004b26bf952bce1ae':
Correctly resize dialogs when measured in WRAP_CONTENT
Merge commit '710312b3bb0ec7bef39742e0e3fc2a3e5c987532' into kraken
* commit '710312b3bb0ec7bef39742e0e3fc2a3e5c987532':
Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B
Merge commit 'bd4808dccf8cd3e5d8e96e667fa435a6c68e0f7c' into froyo-plus-aosp
* commit 'bd4808dccf8cd3e5d8e96e667fa435a6c68e0f7c':
Correctly resize dialogs when measured in WRAP_CONTENT
Merge commit '48bce4515d948971a122a1e17fd1919f81297d77' into froyo-plus-aosp
* commit '48bce4515d948971a122a1e17fd1919f81297d77':
Fix issue #2569139: Cannot login to last.fm after upgrade from Donut to FRF01B