Merge commit '00b17659bb4b2774580eea523c5f23b588105ab6' into eclair-plus-aosp
* commit '00b17659bb4b2774580eea523c5f23b588105ab6':
Manual merge of 40245 (ed5c973fc23a6733fd473ad13b4eb317e74e9bb5) DO NOT MERGE.
Merge commit '67e9e9df929aad9139f1dc776b15f6c5d64f424e' into eclair-plus-aosp
* commit '67e9e9df929aad9139f1dc776b15f6c5d64f424e':
Manual merge of 40170 (b4a107d8269d1a75b8f270e0516c1fa3b517f8f9) DO NOT MERGE
Merge commit '8368ef0b670f8193f3161671b119e78b1fb659a1' into eclair-plus-aosp
* commit '8368ef0b670f8193f3161671b119e78b1fb659a1':
Manual merge of 40080 DO NOT MERGE
Catch some View methods missed during the first pass of
marking with @RemotableViewMethod annotation. Also adds new
ImageView.setColorFilter(int) to match the android:tint XML
attribute.
When ImageView touches ColorFilter or alpha, mutate the
underlying Drawable. Fix NPE in StateListDrawable.mutate().
obj.toArray() can't return anything more specific than Object[], so use
obj.toArray(new String[obj.size()]) to do this instead.
Change-Id: I87a0a2bb10206a37b28a535652a8f81f94c1f06f
Add a parameter for clearTextEntry to disable the focus controller,
and call clearTextEntry when releasing the trackball.
Requires a change to external/webkit
Fix for http://b/issue?id=2340871
of the sort key".
This is needed for two purposes:
1. To fix the A-Z index, specifically non-English ones and
address the issue of messed up index when sort order does not match
display order.
2. Take the first step toward the introduction of a scrolling
cursor. When we have a scrolling cursor, we will _have_ to
build the index independently of fetching all of the data.
Bug: 2407129
Change-Id: Ie2979ff8e67446329ea6d1c2f5c9f4f215e6ec89
Note in docs that callbacks are on main thread.
Rename to DeviceAdminReceiver?
Document resetPassword is the device's password.
Also hide android.R.attr.neverEncrypt.
Fix potential invalid array access if start index is before the
beginning of the array or start + count is past the end of the array.
Update Javadoc for mirror to reflect the usage of "start" and "count".
Change-Id: I7e596de8eae5c518a2b4ff0d28604bd9c59f9d9d
The core backup/restore classes [BackupManager, BackupAgent, RestoreSession, and
RestoreObserver] are now published for 3rd party developers, as well as the suite
of helper classes that exist so far to aid authorship of backup/restore agents.
In conjunction with the API change, the restore-time automatic data wipe has now
been removed: applications are responsible for managing the logic of wipe vs
merge themselves. If the app's agent onRestore() callback throws, the data
is presumed to be incoherent and a wipe is issued via the Activity Manager;
otherwise, no automatic action is ever taken.
Change-Id: I0b3418b829d4689b58b88be3d9c4ace37a8583a9
