Gilles Debunne
cc326fc48f
am ae245d59: Merge "Bug 5420741: exception when rotating device while suggestion popup is visible"
...
* commit 'ae245d59b384fb4e649d32a3475e4519fafa43ff':
Bug 5420741: exception when rotating device while suggestion popup is visible
2011-10-14 11:13:15 -07:00
Gilles Debunne
932cc3d07d
am b9e78d96: Merge "Spell checher\'s language synced with keyboard."
...
* commit 'b9e78d96b745341c6cd8be950480c0cb0a20974f':
Spell checher's language synced with keyboard.
2011-10-14 11:11:13 -07:00
Gilles Debunne
ae245d59b3
Merge "Bug 5420741: exception when rotating device while suggestion popup is visible"
2011-10-14 11:09:59 -07:00
Gilles Debunne
b9e78d96b7
Merge "Spell checher's language synced with keyboard."
2011-10-14 11:09:44 -07:00
Joe Fernandez
5377b3fac3
am 5a401ddb: am 471fa9d1: Merge "docs: add developer guide cross-references, Project ACRE, Round 2" into ics-mr0
...
* commit '5a401ddbc89c99315b82b27e1554dbf5141137b4':
docs: add developer guide cross-references, Project ACRE, Round 2
2011-10-14 10:57:26 -07:00
Joe Fernandez
5a401ddbc8
am 471fa9d1: Merge "docs: add developer guide cross-references, Project ACRE, Round 2" into ics-mr0
...
* commit '471fa9d10b4fa4da070c0ffb5fa5ea1354c8e6b8':
docs: add developer guide cross-references, Project ACRE, Round 2
2011-10-14 10:54:29 -07:00
Joe Fernandez
471fa9d10b
Merge "docs: add developer guide cross-references, Project ACRE, Round 2" into ics-mr0
2011-10-14 10:52:33 -07:00
Amith Yamasani
b1f8610fc9
am 96307ff9: am 00005385: Merge "Use ringer assets for notification volume since the two volumes are tied." into ics-mr0
...
* commit '96307ff948b92904833c4ba641e04913ec10c1c9':
Use ringer assets for notification volume since the two volumes are tied.
2011-10-14 10:35:35 -07:00
Amith Yamasani
96307ff948
am 00005385: Merge "Use ringer assets for notification volume since the two volumes are tied." into ics-mr0
...
* commit '000053859290d322625dfcbdb0467fc34d5e55f4':
Use ringer assets for notification volume since the two volumes are tied.
2011-10-14 10:33:29 -07:00
Christopher Tate
8f4e49a8fe
Merge "DO NOT MERGE - Require device encryption password for adb backup/restore" into ics-mr0
2011-10-14 10:33:13 -07:00
Amith Yamasani
0000538592
Merge "Use ringer assets for notification volume since the two volumes are tied." into ics-mr0
2011-10-14 10:30:43 -07:00
Jim Miller
ef21bacdd3
am 66d19b85: am 1a59c7e3: Merge "Fix 5358124: Better transport control visibility management in lock screen" into ics-mr0
...
* commit '66d19b85b374fb32b22a2be2a435c42a6ad0f1f0':
Fix 5358124: Better transport control visibility management in lock screen
2011-10-14 10:22:36 -07:00
Jim Miller
66d19b85b3
am 1a59c7e3: Merge "Fix 5358124: Better transport control visibility management in lock screen" into ics-mr0
...
* commit '1a59c7e3973cd2de23e45afde1a5e8fdd8a2d30f':
Fix 5358124: Better transport control visibility management in lock screen
2011-10-14 10:20:48 -07:00
Jim Miller
1a59c7e397
Merge "Fix 5358124: Better transport control visibility management in lock screen" into ics-mr0
2011-10-14 10:19:13 -07:00
Joe Fernandez
558459fe85
docs: add developer guide cross-references, Project ACRE, Round 2
...
Change-Id: I39a534ae3a2a34b4dabc333a09961012ef911d3e
2011-10-14 10:18:33 -07:00
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
Jim Miller
4e6d35829e
Fix 5358124: Better transport control visibility management in lock screen
...
This changes TransportControlView to be "sticky" on lockscreen. Basically, once it
appears on lockscreen, it stays there until unlocked and then locked again in paused state.
Tested basic design goals (using Music2):
- play then lock -> shows
- pause then lock -> not shown
- toggle pause to play while locked and not shown -> shows
- pause after played once while locked -> stays until we unlock and lock again while paused
- remote control play while paused & sleeping -> resume lockscreen -> shows
Also tested:
- configuration changes (orientation) to ensure widget continues to show after it once appears
- remote events while lock screen on -> keeps lockscreen on.
- remote events while sleeping -> doesn't wake.
Change-Id: I23418c5f7dfd1457c0844d2683772e8a3ed0abd1
2011-10-13 23:55:21 -07:00
John Reck
b61bfed7b1
Fixup JNI
...
Bug: 5459736
Change-Id: Iefb5daaf52eb56f2a4c3aaeedc977a16a1cfa086
2011-10-13 19:07:50 -07:00
Christopher Tate
b9c1acfb0b
DO NOT MERGE - Require device encryption password for 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: I278737927a4ecbb765bfb5ecfd28a4cb8dae52ef
2011-10-13 17:39:48 -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
Gilles Debunne
9d8d3f1539
Spell checher's language synced with keyboard.
...
Bug 5379440. The spell check is now using the IME's language to
do the spell checking. Changing the input language triggers a
new spell check of the entire text.
Optimizations: ArrowKeyMovementMethod re-uses the TextView's
wordIterator, already set to the correct language.
One wordIterator shared by all SpellParsers in SpellChecker.
Cannot re-use TextView's because of concurrency issues.
With the current implementation, one has to type a new character
to see the new spell checking take place.
Change-Id: I0e460c0a6777548f89d03d6b68f3deea6606c17f
2011-10-13 16:52:42 -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