Mathias Agopian
72afd6fb6f
am a3dca6fd: am 840b8a67: Revert "Add a LayerScreenshot"
...
* commit 'a3dca6fdaacf9ffea4a844848a53c1adeb089897':
Revert "Add a LayerScreenshot"
2011-10-17 11:39:25 -07:00
Jim Miller
459e7a071f
am eb4173ae: am 7b5dd873: Fix 5466793: Fix memory leak in system process when face lock is enabled.
...
* commit 'eb4173ae298dc31bd27895c2b84125c95dbda093':
Fix 5466793: Fix memory leak in system process when face lock is enabled.
2011-10-17 11:39:10 -07:00
Uriel Rodriguez
f678d03cdf
am af0aec58: am d814d4fa: Merge "going directly to backup after face unlock fails 15 times" into ics-mr0
...
* commit 'af0aec584a824dbc772170038128755954dc12ac':
going directly to backup after face unlock fails 15 times
2011-10-17 11:39:04 -07:00
Scott Main
4b54d4bd09
am 82ced825: 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 '82ced8250f78aff7b96f7c6ae75bcfaf1023d336':
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:39:02 -07:00
Bart Sears
c73237602d
am b29553e5: am b227cce3: Merge "Check MediaPlayer state, do not teardown() from UI thread." into ics-mr0
...
* commit 'b29553e5b00c0ef4cde959783ac5563d178537d3':
Check MediaPlayer state, do not teardown() from UI thread.
2011-10-17 11:39:00 -07:00
Mathias Agopian
f3bd5f1332
am 4b1415eb: am 57337eb7: Merge "Add a LayerScreenshot" into ics-mr0
...
* commit '4b1415ebd9bf39fa3e4ee62eef14cf613ea37dec':
Add a LayerScreenshot
2011-10-17 11:38:58 -07:00
Mathias Agopian
a3dca6fdaa
am 840b8a67: Revert "Add a LayerScreenshot"
...
* commit '840b8a678537519c27ddf2f818494eaa20a135d4':
Revert "Add a LayerScreenshot"
2011-10-17 11:32:19 -07:00
Jim Miller
eb4173ae29
am 7b5dd873: Fix 5466793: Fix memory leak in system process when face lock is enabled.
...
* commit '7b5dd87351ac476dd872c51f9b819d2a3e572382':
Fix 5466793: Fix memory leak in system process when face lock is enabled.
2011-10-17 11:32:08 -07:00
Uriel Rodriguez
af0aec584a
am d814d4fa: Merge "going directly to backup after face unlock fails 15 times" into ics-mr0
...
* commit 'd814d4fa0c76a0384f7e32816e1ca36f237911c6':
going directly to backup after face unlock fails 15 times
2011-10-17 11:31:19 -07:00
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
abad99a41c
am b22a69f2: Build fix
...
* commit 'b22a69f2caa4805159027ac06f540da3714d99f0':
Build fix
2011-10-17 04:46:20 -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
c55e80defd
am cfece91c: Merge "Improve documentation for WebChromeClient.onCreateWindow()"
...
* commit 'cfece91c1eb79cc0b686129ed622fe1d839e421e':
Improve documentation for WebChromeClient.onCreateWindow()
2011-10-17 02:33:21 -07:00
Steve Block
882f63b2f2
am 35934148: Merge "Clean up documentation for WebView.loadUrl()"
...
* commit '35934148635e6c5f4dce75c305a54f741f991085':
Clean up documentation for WebView.loadUrl()
2011-10-17 02:33:19 -07: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
Mathias Agopian
840b8a6785
Revert "Add a LayerScreenshot"
...
This reverts commit d6809f40cf .
2011-10-16 23:54:25 -07:00
Jim Miller
7b5dd87351
Fix 5466793: Fix memory leak in system process when face lock is enabled.
...
Previously, the code was not unregistering the callback when we unlocked
the device, which kept a reference to LockPatternKeyguardView indirectly
by a reference to mFaceLockCallback.
It now correcly removes the callback when we unlock the device.
Change-Id: Ie592d007a1dfc2416b9e8956aba2c34e3d0120ee
2011-10-16 12:46:06 -07:00
Uriel Rodriguez
d814d4fa0c
Merge "going directly to backup after face unlock fails 15 times" into ics-mr0
2011-10-15 08:44:21 -07:00
Jeff Brown
88e7723895
am aac01f69: Merge "Add a CrossProcessCursorWrapper. Bug: 5220669"
...
* commit 'aac01f699f9f6ccf285bdec7e89ff864f180409d':
Add a CrossProcessCursorWrapper. Bug: 5220669
2011-10-14 21:10:04 -07:00
Jeff Brown
a9a1dc7dc2
am 04263dc5: Merge "AbstractWindowedCursor is not special."
...
* commit '04263dc591b07a4d5a9b53163dcb421ccffd34d4':
AbstractWindowedCursor is not special.
2011-10-14 21:10:02 -07:00
Jeff Brown
975beeb43c
am d0085108: Merge "Make default implementation of fillWindow typesafe. Bug: 5218310"
...
* commit 'd00851082f913d834c3474e6af025d9574cd14b0':
Make default implementation of fillWindow typesafe. Bug: 5218310
2011-10-14 21:10:01 -07:00
Jeff Brown
f8b952f3e4
am a39a0553: Merge "Deprecate local-only CursorWindows."
...
* commit 'a39a055304968e799c49e99b700399667eab006a':
Deprecate local-only CursorWindows.
2011-10-14 21:09:58 -07: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
fe077041ee
am 436e270f: Merge "Disable hardware acceleration for apps in compatibility mode"
...
* commit '436e270fbb607d62d59e3694ff46c87fa156f78b':
Disable hardware acceleration for apps in compatibility mode
2011-10-14 15:50:53 -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
Uriel Rodriguez
fd2ed6910f
going directly to backup after face unlock fails 15 times
...
- after 15 failed face unlock attempts, go to backup until the backup method is successful
- if the backup method times out (because too many unsuccessful unlocking attempts),
face unlock will not be launched until the backup method is used sucessfully
- fixes 5365919
Change-Id: I9aef7a4f1abcceefc5d6f1c0458ae5cbe8a902df
2011-10-14 16:25:42 -04:00
Martijn Coenen
2378ba1619
am fafc43b3: am 202b38cb: Merge "Remove NfcFragment from activity when no longer sharing." into ics-mr0
...
* commit 'fafc43b349c6b4e8d77ce60f6cac7290cdacdd1a':
Remove NfcFragment from activity when no longer sharing.
2011-10-14 13:03:13 -07: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
3d9670ccc3
am 69db986c: am e6fee18d: Merge "Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it\'s removed." into ics-mr0
...
* commit '69db986cf01c74094747f82758e229da9f007a74':
Invalidate SuggestionSpan with FLAG_AUTO_CORRECTION when it's removed.
2011-10-14 11:23:48 -07:00
Jim Miller
005e526682
am eecd9ac0: am 83e160d3: Fix build.
...
* commit 'eecd9ac0fbe0335916b8f72a89d479dd64341988':
Fix build.
2011-10-14 11:23:47 -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
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
Jim Miller
eecd9ac0fb
am 83e160d3: Fix build.
...
* commit '83e160d3b3ad839b0c2faf40f4477a2468098995':
Fix build.
2011-10-14 11:12:41 -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