Merge commit '4e7cacd3e44bd222a7892113336caff571a9983a' into froyo-plus-aosp
* commit '4e7cacd3e44bd222a7892113336caff571a9983a':
Maybe fix issue #2568615: System server crashed in SyncStorageEngine
Merge commit '8258fda17741b4969b93ffbe8796c76e427a9f27' into froyo-plus-aosp
* commit '8258fda17741b4969b93ffbe8796c76e427a9f27':
Fix issue #2576268: There is no uiMode config change constant for the manifest
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 '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 'c957ebef9755d15f92c27d690641995587c0ba2f' into froyo-plus-aosp
* commit 'c957ebef9755d15f92c27d690641995587c0ba2f':
Add more WindowManager flags to ViewDebug.
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 '0990511f3fe7653dabc7cc0e801f65aa2a1a59f6' into froyo-plus-aosp
* commit '0990511f3fe7653dabc7cc0e801f65aa2a1a59f6':
Add makefile so package manager test apks can get buitl from root.
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 'bd4808dccf8cd3e5d8e96e667fa435a6c68e0f7c' into froyo-plus-aosp
* commit 'bd4808dccf8cd3e5d8e96e667fa435a6c68e0f7c':
Correctly resize dialogs when measured in WRAP_CONTENT
Bug #2549649
If the window had a different size than its content but the content had already
been measured with the appropriate size, the window would not be resized. This
happens in wrap_content windows (dialogs.) This change simply adds a new codition
to window resizing: if the window is wrap_content, not as big as it can be and
not as big as its content, it gets resized.
Change-Id: I1d82d03af5a15c9ad8dffa0511d5f6d522578285
Merge commit '7d2511b722808dfc9cadd3f0f49375fcb738df56' into froyo-plus-aosp
* commit '7d2511b722808dfc9cadd3f0f49375fcb738df56':
Guard against NPE in SearchManagerService
Merge commit 'fa588fc37420a1a4d287e6307700ca310897308a' into froyo-plus-aosp
* commit 'fa588fc37420a1a4d287e6307700ca310897308a':
Redo the look of the recent apps switcher
When airplane mode is disabled, Mobile connection may be bring up
before connecting to a known wifi.
Change-Id: I92e395aefd141c8bc4b8b2e497a71e5fd131eec2
Merge commit '6e52b5d76850ee60bbef2f3d8a2e47bd589e28e8' into froyo-plus-aosp
* commit '6e52b5d76850ee60bbef2f3d8a2e47bd589e28e8':
2568467 System crash when installing corrupt APK
Also fix another crash I just saw in the package manager, when a
permission got left around from a previous install but as no
longer defined.
Change-Id: I33b87420f0c59e24b8b77fab8b0316461d99e048
