Scott Main
82ced8250f
am f755a2e8: Merge "docs: a couple notes for a11y methods in View and cleanup to the A11y service HTML to be semantically correct and thus improve its accessibility :)" into ics-mr0
...
* commit 'f755a2e8aabfd6b26df4f3f56f0e9cdfb06cc173':
docs: a couple notes for a11y methods in View and cleanup to the A11y service HTML to be semantically correct and thus improve its accessibility :)
2011-10-17 11:30:58 -07:00
Bart Sears
b29553e5b0
am b227cce3: Merge "Check MediaPlayer state, do not teardown() from UI thread." into ics-mr0
...
* commit 'b227cce31641c39a1a586739561b4776019945a4':
Check MediaPlayer state, do not teardown() from UI thread.
2011-10-17 11:30:52 -07:00
Mathias Agopian
4b1415ebd9
am 57337eb7: Merge "Add a LayerScreenshot" into ics-mr0
...
* commit '57337eb78e65c160fb9c46a01e04c476d1bfdca1':
Add a LayerScreenshot
2011-10-17 11:30:33 -07:00
Steve Block
b22a69f2ca
Build fix
...
Fix after https://android-git.corp.google.com/g/#/c/125775
Bug: 5461416
Change-Id: Ifee29b287c9fcd2a35b0b676db00ef2a4fc8c5a8
2011-10-17 12:25:00 +01:00
Steve Block
cfece91c1e
Merge "Improve documentation for WebChromeClient.onCreateWindow()"
2011-10-17 02:30:41 -07:00
Steve Block
3593414863
Merge "Clean up documentation for WebView.loadUrl()"
2011-10-17 02:30:00 -07:00
Steve Block
f71dea025a
Clean up documentation for WebView.loadUrl()
...
Bug: 5461416
Change-Id: I3bb6ac4abab7def8e06de087c5ae7be906bc962e
2011-10-17 10:29:03 +01:00
Jeff Brown
aac01f699f
Merge "Add a CrossProcessCursorWrapper. Bug: 5220669"
2011-10-14 21:06:22 -07:00
Jeff Brown
04263dc591
Merge "AbstractWindowedCursor is not special."
2011-10-14 21:06:15 -07:00
Jeff Brown
d00851082f
Merge "Make default implementation of fillWindow typesafe. Bug: 5218310"
2011-10-14 21:06:08 -07:00
Jeff Brown
a39a055304
Merge "Deprecate local-only CursorWindows."
2011-10-14 21:05:58 -07:00
Scott Main
f755a2e8aa
Merge "docs: a couple notes for a11y methods in View and cleanup to the A11y service HTML to be semantically correct and thus improve its accessibility :)" into ics-mr0
2011-10-14 17:19:17 -07:00
Scott Main
b303d8381d
docs: a couple notes for a11y methods in View and cleanup to the
...
A11y service HTML to be semantically correct and thus improve its accessibility :)
Change-Id: I483a8a441d802b056f68f82e0e782d86a73298ac
2011-10-14 17:03:35 -07:00
Bart Sears
b227cce316
Merge "Check MediaPlayer state, do not teardown() from UI thread." into ics-mr0
2011-10-14 16:09:46 -07:00
Romain Guy
436e270fbb
Merge "Disable hardware acceleration for apps in compatibility mode"
2011-10-14 15:48:40 -07:00
Romain Guy
856d4e1a87
Disable hardware acceleration for apps in compatibility mode
...
Change-Id: I2d1c01a30c6fe6fff85c2a9bd6ee6de98e1ed422
2011-10-14 15:47:55 -07:00
Mathias Agopian
57337eb78e
Merge "Add a LayerScreenshot" into ics-mr0
2011-10-14 15:35:54 -07:00
Mathias Agopian
d6809f40cf
Add a LayerScreenshot
...
A LayerScreenshot is a special type of layer that contains a screenshot of
the screen acquired when its created. It works just like LayerDim.
Bug: 5446982
Change-Id: I7814aff2380e7e146937f2b641907be2a30c76cc
2011-10-14 14:32:48 -07:00
Ben Murdoch
817d6d5e8e
Check MediaPlayer state, do not teardown() from UI thread.
...
The teardown() function should only be called from the native
thread when WebCore is happy for us to release the media player.
When we lose audio focus, simply stop playback. Also be careful
not to check the playing state of the MediaPlayer if we are in
the error state.
Bug: 5461143
Change-Id: Iba03bdad5c39b104b3071129430d7ef2177e9358
2011-10-14 22:11:26 +01:00
Martijn Coenen
fafc43b349
am 202b38cb: Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0
...
* commit '202b38cb71d123e4ebc8741643e84fa455ecd002':
Remove NfcFragment from activity when no longer sharing.
2011-10-14 13:00:45 -07:00
Martijn Coenen
202b38cb71
Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0
2011-10-14 12:57:34 -07:00
satok
69db986cf0
am e6fee18d: Merge "Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it\'s removed." into ics-mr0
...
* commit 'e6fee18d16a86c266afef48f7705268435a99111':
Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it's removed.
2011-10-14 11:16:57 -07:00
satok
e6fee18d16
Merge "Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it's removed." into ics-mr0
2011-10-14 11:15:05 -07:00
Jim Miller
eecd9ac0fb
am 83e160d3: Fix build.
...
* commit '83e160d3b3ad839b0c2faf40f4477a2468098995':
Fix build.
2011-10-14 11:12:41 -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
Jim Miller
83e160d3b3
Fix build.
...
Change-Id: Ifd5fe7933065f555f50ea91c4c301f87ca09dcdc
2011-10-14 11:06:33 -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
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
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
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
Martijn Coenen
2ec83936a1
Remove NfcFragment from activity when no longer sharing.
...
This fixes scenarios where the same activity sets, unsets
and re-sets an NdefMessage and/or callback.
Bug: 5454848
Change-Id: I5ed98047b9cfe90d2f48656d978f2d08bb4bf0cc
2011-10-14 10:01:25 -07:00
satok
75e126f2df
Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it's removed.
...
Bug: 5460262
Change-Id: I4ca71020a6d4b7057f60ca99944c479775cca8b7
2011-10-15 01:24:44 +09: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
Steve Block
89e00a90d5
Improve documentation for WebChromeClient.onCreateWindow()
...
Bug: 5461416
Change-Id: I9beac56374fb3ce97da4b20fa5646b5b5f05bad9
2011-10-14 16:29:01 +01: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
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
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