John Reck
a566e90d01
am 61d3449d: am d82cc1de: Merge "Fixup JNI" into ics-mr0
...
* commit '61d3449d1a135f17f8aa664f39f6cafcf595ba29':
Fixup JNI
2011-10-14 10:15:01 -07:00
John Reck
61d3449d1a
am d82cc1de: Merge "Fixup JNI" into ics-mr0
...
* commit 'd82cc1de848a678fa4bcaefdbc763307f3df4a75':
Fixup JNI
2011-10-14 10:12:14 -07:00
John Reck
d82cc1de84
Merge "Fixup JNI" into ics-mr0
2011-10-14 10:10:07 -07:00
Jean-Michel Trivi
b0fc6e0285
am 76842baa: am 9ad680ca: Merge "Fix 5380695 Lockscreen transport control must reflect error state" into ics-mr0
...
* commit '76842baa0f6d079bcb8933bb14a7a4dbb89db781':
Fix 5380695 Lockscreen transport control must reflect error state
2011-10-14 09:05:46 -07:00
Jean-Michel Trivi
76842baa0f
am 9ad680ca: Merge "Fix 5380695 Lockscreen transport control must reflect error state" into ics-mr0
...
* commit '9ad680ca2be19679c355de9526d79ded2887ea97':
Fix 5380695 Lockscreen transport control must reflect error state
2011-10-14 09:02:49 -07:00
Jean-Michel Trivi
9ad680ca2b
Merge "Fix 5380695 Lockscreen transport control must reflect error state" into ics-mr0
2011-10-14 09:01:08 -07:00
Mathew Inwood
dd4394328a
am 772158a5: Merge "Allow setting of source bounds on global search intents."
...
* commit '772158a596bc97694fa82e710b5cfbe8c6f40cdc':
Allow setting of source bounds on global search intents.
2011-10-14 06:37:16 -07:00
Mathew Inwood
772158a596
Merge "Allow setting of source bounds on global search intents."
2011-10-14 06:35:26 -07:00
Mathew Inwood
050453eaf5
Allow setting of source bounds on global search intents.
...
This is to allow the launcher to include the source bounds of the
search affordance on the homescreen when launching the global
search app.
Bug: 5235747
Change-Id: I7af1a651d593b6d946aa2fe42d900a9c4470b4e2
2011-10-14 14:11:52 +01:00
John Reck
b61bfed7b1
Fixup JNI
...
Bug: 5459736
Change-Id: Iefb5daaf52eb56f2a4c3aaeedc977a16a1cfa086
2011-10-13 19:07:50 -07:00
Kenny Root
9b43d8e67c
am bc883f4c: am 22dad40d: Merge "Add support for signature in getPackageArchiveInfo" into ics-mr0
...
* commit 'bc883f4cf48ef1e0e533aba423d8ff3529010975':
Add support for signature in getPackageArchiveInfo
2011-10-13 17:14:12 -07:00
Kenny Root
bc883f4cf4
am 22dad40d: Merge "Add support for signature in getPackageArchiveInfo" into ics-mr0
...
* commit '22dad40d3e8ce54a00f337ea06b9b0bbfbd3fd6b':
Add support for signature in getPackageArchiveInfo
2011-10-13 17:12:35 -07:00
Kenny Root
22dad40d3e
Merge "Add support for signature in getPackageArchiveInfo" into ics-mr0
2011-10-13 17:10:17 -07:00
Gilles Debunne
9f1fd14c03
am 19f4b66d: Merge "Bug 5228934: added a flag to disable the display of the soft input on focus"
...
* commit '19f4b66ddc924e1828ddc4082dd381616f57ec06':
Bug 5228934: added a flag to disable the display of the soft input on focus
2011-10-13 16:56:21 -07:00
Gilles Debunne
19f4b66ddc
Merge "Bug 5228934: added a flag to disable the display of the soft input on focus"
2011-10-13 16:54:23 -07:00
Jean-Michel Trivi
261381cf9f
Fix 5380695 Lockscreen transport control must reflect error state
...
When a RemoteControlClient reports an error for its playstate,
make the play/pause button display the warning platform icon.
Note that a specific image description is not available for this
state at this time, but the one being used (the same as for the
play icon) is valid as it correctly describes the action the
button performs.
Change-Id: I59aadab3fe5bcc09a2f7be0b9e4cffb0c500e865
2011-10-13 16:53:08 -07:00
Dave Santoro
a41d11256b
am 4194f15e: am e6063299: Merge "Add hidden API for pre-authorizing URIs." into ics-mr0
...
* commit '4194f15e16c833f78a33ea6286bfe0407649828b':
Add hidden API for pre-authorizing URIs.
2011-10-13 16:38:18 -07:00
Dave Santoro
4194f15e16
am e6063299: Merge "Add hidden API for pre-authorizing URIs." into ics-mr0
...
* commit 'e6063299d874cc3b9d1fa71d0c3772c6ebe62e06':
Add hidden API for pre-authorizing URIs.
2011-10-13 16:34:17 -07:00
Dave Santoro
e6063299d8
Merge "Add hidden API for pre-authorizing URIs." into ics-mr0
2011-10-13 16:32:17 -07:00
Bart Sears
b8e543dc5c
am 0272df85: am bcfe4152: Merge "Improve JavaDoc for WebView.loadData()" into ics-mr0
...
* commit '0272df85061304683a1fa9aa5825ba8dbf102841':
Improve JavaDoc for WebView.loadData()
2011-10-13 16:29:51 -07:00
Bart Sears
0272df8506
am bcfe4152: Merge "Improve JavaDoc for WebView.loadData()" into ics-mr0
...
* commit 'bcfe41529b7bd9f572a2eff31375dc9fdf35b518':
Improve JavaDoc for WebView.loadData()
2011-10-13 16:27:16 -07:00
Steve Block
33f962b22e
Improve JavaDoc for WebView.loadData()
...
Make clear that the charset specified in the mediatype portion of a data URL
overrides that specified in the HTML or XML document itself.
Bug: 5418915
Change-Id: Iff7305b6ac9e656d0fb7ed1b2ffe6fd0e21be49b
2011-10-13 15:32:13 -07:00
Kenny Root
6ccd41265d
Add support for signature in getPackageArchiveInfo
...
GET_SIGNATURES was indicated as supported, but it never actually did
anything.
This is needed for the package verifier development sample.
Change-Id: I09ca6790cd8bf9435aa208c0711359b4d76fb278
2011-10-13 14:57:31 -07:00
Gilles Debunne
2d307279ce
am cbdd2457: Merge "Bug 5428541: Check that span is still in text before deleting"
...
* commit 'cbdd245793fe5dc42d4573c20d0a43ad95d06d53':
Bug 5428541: Check that span is still in text before deleting
2011-10-13 14:25:20 -07:00
Gilles Debunne
cbdd245793
Merge "Bug 5428541: Check that span is still in text before deleting"
2011-10-13 14:23:37 -07:00
Christopher Tate
fc5800432d
am 28e9046e: Merge "Require device encryption password to perform adb backup/restore"
...
* commit '28e9046ed41a04562c34d37cad690aeebec36001':
Require device encryption password to perform adb backup/restore
2011-10-13 14:12:11 -07:00
Adam Powell
9e7b260550
am 9e45b78c: am aa79a5d5: Merge "Fix bug 5455676 - seek bars without thumbs" into ics-mr0
...
* commit '9e45b78c4ec5531a01fb43afc088f5c67880343d':
Fix bug 5455676 - seek bars without thumbs
2011-10-13 14:08:53 -07:00
Daniel Sandler
849a99c197
am 8c05abf1: am dba93565: Break apart DISABLE_HOME and DISABLE_RECENT.
...
* commit '8c05abf15743af7cccceae14c33e590a30a7cacc':
Break apart DISABLE_HOME and DISABLE_RECENT.
2011-10-13 14:08:29 -07:00
Christopher Tate
28e9046ed4
Merge "Require device encryption password to perform adb backup/restore"
2011-10-13 14:06:22 -07:00
Adam Powell
9e45b78c4e
am aa79a5d5: Merge "Fix bug 5455676 - seek bars without thumbs" into ics-mr0
...
* commit 'aa79a5d5a3b06b5b4e40a1ab0ccc6697627b1a8d':
Fix bug 5455676 - seek bars without thumbs
2011-10-13 13:12:42 -07:00
Adam Powell
aa79a5d5a3
Merge "Fix bug 5455676 - seek bars without thumbs" into ics-mr0
2011-10-13 13:10:14 -07:00
Daniel Sandler
8c05abf157
am dba93565: Break apart DISABLE_HOME and DISABLE_RECENT.
...
* commit 'dba935659024a9ca83cb6bd3f1a9970e277f7658':
Break apart DISABLE_HOME and DISABLE_RECENT.
2011-10-13 12:38:00 -07:00
Christopher Tate
32418be49e
Require device encryption password to perform adb backup/restore
...
This supersedes any backup-password that the user might supply. Per
design, the device encryption password is also always used to encrypt
the backup archive.
The CL introduces two new strings, used for prompting the user for
their device encryption password rather than their settings-defined
"backup password" when confirming a full backup or restore operation.
Bug 5382487
Change-Id: I0b03881b45437c944eaf636b6209278e1bba7a9f
2011-10-13 12:29:32 -07:00
Daniel Sandler
dba9356590
Break apart DISABLE_HOME and DISABLE_RECENT.
...
Additionally, start using setSystemUiVisibility() where
possible in the keyguard to allow activities and dialogs to
re-enable some of the navigation keys (notably: home but not
recents).
Finally, stop disabling MENU for activities atop the keyguard.
Bug: 5380495 // no home in driveabout, clock
Bug: 5396134 // able to show home/recent in keyguard
Change-Id: I04eb224554ee8cff79476b85148c4cda75bb0b62
2011-10-13 15:28:10 -04:00
Dave Santoro
e43185e21d
Add hidden API for pre-authorizing URIs.
...
This allows the contacts provider to allow a caller to pre-authorize
a URI for temporary use by another application that would not
otherwise have the special permissions necessary to access it.
Bug 5437453
Change-Id: I3bd7be7c698cac73709c2d305f1723cdcb093ec4
2011-10-13 12:08:42 -07:00
Adam Powell
2c5b8cc71b
Fix bug 5455676 - seek bars without thumbs
...
Change-Id: I9a4257b91a89cceeca7d5acf9358a8254446c784
2011-10-13 11:44:38 -07:00
Fred Quintana
2984971db3
Merge "reworked the flow in the account chooser - resilient to the chooser activity being killed due to memory pressure - back now goes back to the main chooser screen rather than canceling it completely" into ics-mr0
2011-10-13 11:41:19 -07:00
Ben Murdoch
7c2ab75412
am 64f93d4f: Merge "Don\'t redraw when not scrolling, even if finger is held down."
...
* commit '64f93d4f91df8830d3d6cd4490ac2f157a7f0325':
Don't redraw when not scrolling, even if finger is held down.
2011-10-13 10:19:17 -07:00
Ben Murdoch
64f93d4f91
Merge "Don't redraw when not scrolling, even if finger is held down."
2011-10-13 10:17:57 -07:00
Mangesh Ghiware
8b31746395
am df3975c5: am a6708c6a: Merge "Add setting for configuring zoom level on double-tap." into ics-mr0
...
* commit 'df3975c5aee17cc365b854e616d8831b45809db0':
Add setting for configuring zoom level on double-tap.
2011-10-13 09:21:39 -07:00
Mangesh Ghiware
df3975c5ae
am a6708c6a: Merge "Add setting for configuring zoom level on double-tap." into ics-mr0
...
* commit 'a6708c6a462d2a30e51e7ded2559a4054cb651fc':
Add setting for configuring zoom level on double-tap.
2011-10-13 09:19:20 -07:00
Mangesh Ghiware
a6708c6a46
Merge "Add setting for configuring zoom level on double-tap." into ics-mr0
2011-10-13 09:17:10 -07:00
Ben Murdoch
fd8d3dede2
Don't redraw when not scrolling, even if finger is held down.
...
Signal the native side that we are not scrolling when a drag is
held motionless to stop screen updates.
Additionally, in the case that a drag is being held motionless,
send a timed message to keep the scroll bars on screen otherwise
they fade in and out, again causing repaints that shouldn't be
necessary.
Bug: 5440335
Change-Id: I94db0323879885fa48924b41d29e8af03e3b5e7f
2011-10-13 13:23:29 +01:00
Wu-cheng Li
cb1192f03a
am 7a3ba4d7: am 514a6cfb: Merge "Improve camera javadoc and fix some errors." into ics-mr0
...
* commit '7a3ba4d732d5ce394aab9783e4099b2e71f1903f':
Improve camera javadoc and fix some errors.
2011-10-12 23:38:35 -07:00
Wu-cheng Li
7a3ba4d732
am 514a6cfb: Merge "Improve camera javadoc and fix some errors." into ics-mr0
...
* commit '514a6cfb7f7085b266f457155ff63373d2dff8ee':
Improve camera javadoc and fix some errors.
2011-10-12 23:36:14 -07:00
Jim Miller
d7766658ed
am 4defcef1: am 207c6731: Merge "Fix 5444675: Fix vibrate regression on Pattern and PIN unlock screens." into ics-mr0
...
* commit '4defcef1cb643e998b64c594b94af287de317a41':
Fix 5444675: Fix vibrate regression on Pattern and PIN unlock screens.
2011-10-12 21:11:47 -07:00
Daniel Lehmann
0b0a184669
am 5247fb38: am cc21cc01: Merge "Allow clearing out the source bounds" into ics-mr0
...
* commit '5247fb38be85efda56ff062585912a229872749b':
Allow clearing out the source bounds
2011-10-12 21:11:43 -07:00
Adam Powell
bf5ec6d502
am 4bf1b2e6: Merge "Fix bug 5394020 - Menus are pretty sluggish to bring up"
...
* commit '4bf1b2e6568d25faf984a87e7f57a5571543d1f2':
Fix bug 5394020 - Menus are pretty sluggish to bring up
2011-10-12 21:11:39 -07:00
Dianne Hackborn
91c3f2a0b3
am 2c4d954e: am f4b40de6: Merge "Fix issue #5445966 : WindowManager reporting -long on prime when it shouldn\'t be." into ics-mr0
...
* commit '2c4d954ece25324dee2b5f4dc08bd8fb3f5e3dfb':
Fix issue #5445966 : WindowManager reporting -long on prime when it shouldn't be.
2011-10-12 21:11:36 -07:00
Wu-cheng Li
53b30912d3
Improve camera javadoc and fix some errors.
...
bug:5169599
Change-Id: Ic2205770753ff462135f884fee0a888ca8ec832d
2011-10-13 12:04:05 +08:00