Merge commit '2a9ec9869ee0fb8112426f85a85dffd966a2fa97' into kraken
* commit '2a9ec9869ee0fb8112426f85a85dffd966a2fa97':
Search for focusable views only after layout has happened when the window is first created.
Merge commit '7b70f6589205dec10afdb358b7ddef7aa61b7dd8' into froyo-plus-aosp
* commit '7b70f6589205dec10afdb358b7ddef7aa61b7dd8':
Search for focusable views only after layout has happened when the window is first created.
Merge commit 'efaee761022305d74e63237d87809582514bd5e2' into kraken
* commit 'efaee761022305d74e63237d87809582514bd5e2':
Show the microphone when the search box is opened from browser
Merge commit '083c715d06a99951429b38c62484f8c3caf43cd1' into froyo-plus-aosp
* commit '083c715d06a99951429b38c62484f8c3caf43cd1':
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
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 '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