Merge commit '9274988e444da3b8652912f1a3c0cf0847f19fe3'
* commit '9274988e444da3b8652912f1a3c0cf0847f19fe3':
Fix the reporting of ActiveApnTypes on CDMA
Merge commit 'ce37120df3099a1bb544ff1ef1a016a20794dd51'
* commit 'ce37120df3099a1bb544ff1ef1a016a20794dd51':
Fix bug where we would return null with disabled components.
Merge commit '4df43ab1d834f839f3b1e535554836a936902d00'
* commit '4df43ab1d834f839f3b1e535554836a936902d00':
Fix issue #1930911: Crash in system process
Merge commit 'e6566064a990fcfc21334df33eb9c771f22eb0d5'
* commit 'e6566064a990fcfc21334df33eb9c771f22eb0d5':
Finish off java API to allow fading scrollbars
Merge commit '019116ce202021e1b274516c9813aeff83b1b5ab'
* commit '019116ce202021e1b274516c9813aeff83b1b5ab':
Don't ask for pbuffer support, because we don't use any pbuffers.
Print out EGL configuration info for the config we've chosen.
Merge commit '9b150b74573ce506abd00c692fb42f46980441a3' into eclair-plus-aosp
* commit '9b150b74573ce506abd00c692fb42f46980441a3':
Close the cursor before assigning a new one to the same variable.
Merge commit 'bbed0d68c815446400193bdc8b16fbf73e1ee664' into eclair-plus-aosp
* commit 'bbed0d68c815446400193bdc8b16fbf73e1ee664':
hide setGammaForText, which is only used for calibrating new devices
This allows us to disable the keyguard while docked without disabling the status bar.
Change-Id: I06ff48dcb1922a26e356faee0aefa91b7c871e6a
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '271cfe85ccfa6d94008dcebb3b97108ca325fe59' into eclair-plus-aosp
* commit '271cfe85ccfa6d94008dcebb3b97108ca325fe59':
improve boot animation a bit
Merge commit 'a6309c30722ad3aee88ddc2394cea2a499168d99' into eclair-plus-aosp
* commit 'a6309c30722ad3aee88ddc2394cea2a499168d99':
On BACK in search, hide just IME if IME is fullscreen
Since a fullscreen IME covers the entire search dialog, there was
no discoverable way to get back to the search dialog.
Now, on BACK presses when the IME is fullscreen (e.g. in landscape
mode without hard keyboard), we dismiss only the IME.
A second BACK press will dismiss the search dialog.
Fixes http://b/issue?id=2159132
Change-Id: I8e5736d83d7c35936a718929017ea04c6214700b
API council says:
"In reviewing the new triggerSearch API, we are concerned that
applications could use the option to perform a global search to spam
the user with frequent searches. We would like the global search
option to be removed for now (not just hidden, but removed from the
internal IPC API so that nobody can find this and abuse it). The rest
of the API should be fine as long as it is restricted to local
searches."
Fixes http://b/editIssue?id=2158785
Change-Id: Ie69a9c0ab6373cc4427aab50606885bdede40585
Merge commit 'f0e5ca7e09a8651b85c652e040a037e39e224128' into eclair-plus-aosp
* commit 'f0e5ca7e09a8651b85c652e040a037e39e224128':
New 1x status bar icons
Merge commit '62de742125d8f5fd1d236f720b2de3bf5cf76174' into eclair-plus-aosp
* commit '62de742125d8f5fd1d236f720b2de3bf5cf76174':
Fix stopping all vpn daemons before connect and more.
Merge commit '9825ec61b4a40ed92a5bb28019289e5bab9cfb56' into eclair-plus-aosp
* commit '9825ec61b4a40ed92a5bb28019289e5bab9cfb56':
Prevents the WindowManager from requesting empty or negative surfaces.
Windows with a negative Y position can end up in createSurfaceLocked()
with mFrame containing a negative height, causing SurfaceFlinger to go
crazy when asked to create the surface. This change simply guards
against such a situation by instead asking for a 1x1 surface and relying
or later layout operations to resize the window to the appropriate size.
Change-Id: I66f2058f4cd1cf069b12d3d23e6fd340dc76b74e
Merge commit 'be000b53be9ee73b14c7f172c9784c366dbb91c8' into eclair-plus-aosp
* commit 'be000b53be9ee73b14c7f172c9784c366dbb91c8':
Clean up search and voice search button assets for high res.
* move DaemonHelper out from VpnService to VpnDaemons for better
managing native daemons.
* check connectivity and dns less frequently to save battery.
Merge commit '00f603635d4cec4403687d8ee97aced91fb32108' into eclair-plus-aosp
* commit '00f603635d4cec4403687d8ee97aced91fb32108':
remove cert for SampleBrowserPlugin and only check
Merge commit 'e88846eeaf70f9f4299af9e3d54ba5dacede42b6' into eclair-plus-aosp
* commit 'e88846eeaf70f9f4299af9e3d54ba5dacede42b6':
Semi-workaround for #2027266: app drawer showing up on the side of the screen
