Merge commit '26cab06472badee374ac854f5a210991c37c4493' into gingerbread-plus-aosp
* commit '26cab06472badee374ac854f5a210991c37c4493':
Allow two finger pan and scale on touchscreens with
Moves the remoteNativeLibrariesLI call to NativeLibraryHelper to prepare
for being able to symlink the /data/data/<package>/lib dir to the ASEC
container.
Change-Id: Ie3648509c6b6293a8d9bdd815610ab408df5047f
Merge commit 'ca6de93a9d2f11a18187d9fcd54303813c06094a' into gingerbread-plus-aosp
* commit 'ca6de93a9d2f11a18187d9fcd54303813c06094a':
Fix number counter will keep going after window losed focus.
Merge commit '7c65585feb761a3e00bb2b8a468d43f70a8c3cdc' into gingerbread-plus-aosp
* commit '7c65585feb761a3e00bb2b8a468d43f70a8c3cdc':
Make sure OutOfMemoryError is handled by WallpaperManager
Merge commit '7c8258d064efe70e8551480eaafd7296f659acd5' into gingerbread-plus-aosp
* commit '7c8258d064efe70e8551480eaafd7296f659acd5':
Fix the last remaining @deprecated tag without comment warning.
We weren't logging strictmode violation in the system_server process
in non-user builds (only system apps), even though the rest of the
strictmode logging supports it.
Also add a missing lock in ActivityManagerService.
Change-Id: If2af96a7e4fdde604a647b836097f0029ef1334b
Merge commit '506d724cc356a7ba73995ef2929c65062277c83d' into gingerbread-plus-aosp
* commit '506d724cc356a7ba73995ef2929c65062277c83d':
DO NOT MERGE. I like'd ctate's change so much I'm doin it myself!
Merge commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2' into gingerbread-plus-aosp
* commit 'a4ce31f5e080eae6c97e6f37040db0c7f0fc78f2':
Small fixes to battery stats.
Merge commit '47fa8e800ca3ce56733f7b3a54bace86ad37a1f4' into gingerbread-plus-aosp
* commit '47fa8e800ca3ce56733f7b3a54bace86ad37a1f4':
Fix for an IndentOutOfBounds in TextField.
Merge commit '87e215fd54559935649fb07264ece600bbabbdf9' into gingerbread-plus-aosp
* commit '87e215fd54559935649fb07264ece600bbabbdf9':
Made context menu appear when tapping inside selection.
Merge commit 'e3692d153e0f66a5620eb96bd75ce92585b9fc04' into gingerbread-plus-aosp
* commit 'e3692d153e0f66a5620eb96bd75ce92585b9fc04':
Hidden API to control sorting of download manager queries.
This change adds a hidden API to sort download manager queries by size
rather than by time last modified. This is necessary for the system
download manager UI but, in the interest of keeping the new public API
as minimal as possible for now, I'm leaving @hide on this method.
This change also changes the DownloadManager.COLUMN_ID column to be
identical to BaseColumns._ID, since some code relies on this (such as
CursorAdapter).
Change-Id: Ib89b614d63e988974d4486b122b39365b35b5269
Merge commit '9395b4656aca4b00d080ada89a44631459ad7b85' into gingerbread-plus-aosp
* commit '9395b4656aca4b00d080ada89a44631459ad7b85':
Fix to get A2DP to connect after unpairing
In this fix, A2DP profile will be connected when pairing with a
previously paired headset. The reason for this error was that the
connection of the A2DP profile was sent before the callback
onCreatePairedDeviceResult was receied in BluetoothEventLoop.java.
By not going to the state BOND_BONDED until after this callback has been
received, the problem is fixed. However the use case is different if the
pairing is initiated by the remote device. In these cases state
BOND_BONDED will be set when onDevicePropertyChanged instead.
Change-Id: I5dedca87d0a6872705ff3a933a99cce6eb37618a
Merge commit 'ab86b782fd2c8c7b1e6b50d30482aa2b8f890e80' into gingerbread-plus-aosp
* commit 'ab86b782fd2c8c7b1e6b50d30482aa2b8f890e80':
Fix for text selection in horizontally scrolled TextViews.
Apps can report if they like their connection to the nets
and we display either not-really-connected or fully-connected
icons. Final icons TBD.
bug:2978624
Change-Id: I28be52085edfe54571c0d4559aba0df883548654
In this fix, A2DP profile will be connected when pairing with a
previously paired headset. The reason for this error was that the
connection of the A2DP profile was sent before the callback
onCreatePairedDeviceResult was receied in BluetoothEventLoop.java.
By not going to the state BOND_BONDED until after this callback has been
received, the problem is fixed. However the use case is different if the
pairing is initiated by the remote device. In these cases state
BOND_BONDED will be set when onDevicePropertyChanged instead.
Change-Id: I5dedca87d0a6872705ff3a933a99cce6eb37618a
A left padding and scroll was not taken into account in cursor position.
Bug http://b/issue?id=2970142
Change-Id: Ie76e8d97f3dd5fe3a750aa82cd4b97c98892cb48
Merge commit '9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8' into gingerbread-plus-aosp
* commit '9bfb060ac4e30c82ec2c269b78cc758a6cb5daf8':
Force wallpaper surface to 565.
This is to maintain backward compatibility with badly programmed
GL wallpapers. Wallpapers can call SurfaceHolder.setFormat() to
request a different format.
Change-Id: Ib42b0cf6c7040d1300cad239c3acfd5c4c6cd326