Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,663 Commits 3 Branches 0 Tags
a36314e477553d6290756cf5cc232abfa4faa913
Commit Graph

19645 Commits

Author SHA1 Message Date
Steve Block
a36314e477 am ca731c5c: am c0c394ee: Merge "Modify BrowserFrame.requestClientCert() to take the host and port as a String" into ics-mr0 
* commit 'ca731c5c6beb031383e661d1f09730ba1877f457':
  Modify BrowserFrame.requestClientCert() to take the host and port as a String
 2011-10-12 19:38:41 -07:00
Gilles Debunne
90c6bef4ab am b10d396f: Merge "Bug 5385279: IOOB in createMisspelledSuggestionSpan" 
* commit 'b10d396f2e1d0329013f5376bd486621bd177bc8':
  Bug 5385279: IOOB in createMisspelledSuggestionSpan
 2011-10-12 19:38:39 -07:00
Gilles Debunne
8166d28a37 am ba25c013: Merge "Bug 5237623: word no longer underlined after replacement" 
* commit 'ba25c01335232b701232ff2157379b5828a47e52':
  Bug 5237623: word no longer underlined after replacement
 2011-10-12 19:38:37 -07:00
Amith Yamasani
6b88493ec7 am 50f99243: Merge "Backup owner info as part of settings backup." 
* commit '50f9924322fe4c434fc732da5e0d3e3c5875d686':
  Backup owner info as part of settings backup.
 2011-10-12 19:38:33 -07:00
Adam Powell
4a792378dc am 4d9adfe6: am 35af3639: Merge "Fix bug 5173029 - make fast scroller aware of scrolling containers" into ics-mr0 
* commit '4d9adfe6ae87c4bc8766c7d8e526e4c8ef1cd7d6':
  Fix bug 5173029 - make fast scroller aware of scrolling containers
 2011-10-12 19:38:28 -07:00
Romain Guy
f2314133bd am 0bbd8d82: Revert "Check whether an AsyncTask is created/executed on a looper thread." 
* commit '0bbd8d8273c1dde9e0504f67bd8eb159bef2406a':
  Revert "Check whether an AsyncTask is created/executed on a looper thread."
 2011-10-12 19:38:25 -07:00
Romain Guy
d7b6df5b1b am 5e7f2d0b: Revert "Fix the build" 
* commit '5e7f2d0b227df38f6dbc2313ac8b5c9f225c135e':
  Revert "Fix the build"
 2011-10-12 19:38:23 -07:00
Adam Powell
fe52c0f2f0 am cecf2021: am acf7d982: Merge "Fix bug 5434403 - invalidation problem with seek bars at edges" into ics-mr0 
* commit 'cecf20218923c91e1820bba033a85d32a9de11f2':
  Fix bug 5434403 - invalidation problem with seek bars at edges
 2011-10-12 12:38:21 -07:00
Svetoslav Ganov
da04419b64 am f42d34bd: Merge "Add AccessibilityRecord#getMaxScrollX and #getMaxScrollY to the pubic API" 
* commit 'f42d34bdd1934c52e6e588a15cd4c8bd0f66f832':
  Add AccessibilityRecord#getMaxScrollX and #getMaxScrollY to the pubic API
 2011-10-12 12:38:12 -07:00
Michael Kolb
2fb6245959 am 1eb08f0a: am f0f7a913: Merge "Support spellcheck attribute in WebTextView" into ics-mr0 
* commit '1eb08f0acb0220d5ad03579c566a00497b665816':
  Support spellcheck attribute in WebTextView
 2011-10-12 12:37:50 -07:00
Jeff Brown
2b60484225 am 241fe477: am 58bf986c: Merge "Use ashmem for CursorWindows. Bug: 5332296" into ics-mr0 
* commit '241fe477edba539bcc58df4410c307d9540a4233':
  Use ashmem for CursorWindows. Bug: 5332296
 2011-10-12 12:37:46 -07:00
Romain Guy
3ef396bb0a am f751210b: Merge "Fix the build" 
* commit 'f751210b4b040458df789e217f168bccbb95117a':
  Fix the build
 2011-10-12 12:37:22 -07:00
Romain Guy
1f66e8bd4e am df61887f: Merge "Check whether an AsyncTask is created/executed on a looper thread." 
* commit 'df61887feb5348f1d30a2e86b13ae64c271c4acc':
  Check whether an AsyncTask is created/executed on a looper thread.
 2011-10-12 12:37:15 -07:00
Steve Block
ca731c5c6b am c0c394ee: Merge "Modify BrowserFrame.requestClientCert() to take the host and port as a String" into ics-mr0 
* commit 'c0c394ee053c1b62da58247c431c20d5939c4ada':
  Modify BrowserFrame.requestClientCert() to take the host and port as a String
 2011-10-12 10:00:48 -07:00
Steve Block
c0c394ee05 Merge "Modify BrowserFrame.requestClientCert() to take the host and port as a String" into ics-mr0 2011-10-12 09:58:25 -07:00
Gilles Debunne
b10d396f2e Merge "Bug 5385279: IOOB in createMisspelledSuggestionSpan" 2011-10-12 09:51:17 -07:00
Gilles Debunne
ba25c01335 Merge "Bug 5237623: word no longer underlined after replacement" 2011-10-12 09:50:45 -07:00
Amith Yamasani
50f9924322 Merge "Backup owner info as part of settings backup." 2011-10-12 09:45:22 -07:00
Steve Block
8eb83b96ac Modify BrowserFrame.requestClientCert() to take the host and port as a String 
Currently we get the host and port from Chromium as a std::string, convert to a
jbyte array to pass over JNI, then convert to String. It's simpler to convert
directly to jstring and to pass that over JNI.

Requires https://android-git.corp.google.com/g/141234
in external/webkit.

Bug: 5442710

Change-Id: I5480471a841c24481ef09d836a8b0c778251b119
 2011-10-12 09:51:22 +01:00
Adam Powell
4d9adfe6ae am 35af3639: Merge "Fix bug 5173029 - make fast scroller aware of scrolling containers" into ics-mr0 
* commit '35af3639a169b1b8e5f4d96579795e5480080b52':
  Fix bug 5173029 - make fast scroller aware of scrolling containers
 2011-10-11 19:33:29 -07:00
Adam Powell
af5280cc71 Fix bug 5173029 - make fast scroller aware of scrolling containers 
When a ListView with a FastScroller is located in a scrolling
container, defer the start of the drag operation for a short time or
until a touch slop is crossed. This allows these lists to be placed in
containers like ViewPagers without immediately stealing touch events.

Change-Id: I9b10b6993b24113c5e95c485bf57206747c73a84
 2011-10-11 19:06:13 -07:00
Romain Guy
0bbd8d8273 Revert "Check whether an AsyncTask is created/executed on a looper thread." 
This reverts commit 7498ccb6b9.
 2011-10-11 18:13:37 -07:00
Romain Guy
5e7f2d0b22 Revert "Fix the build" 
This reverts commit 4db2504ada.
 2011-10-11 18:13:05 -07:00
Adam Powell
cecf202189 am acf7d982: Merge "Fix bug 5434403 - invalidation problem with seek bars at edges" into ics-mr0 
* commit 'acf7d982ae981c039ec8445a30da91be0a4fbbc5':
  Fix bug 5434403 - invalidation problem with seek bars at edges
 2011-10-11 16:16:09 -07:00
Adam Powell
acf7d982ae Merge "Fix bug 5434403 - invalidation problem with seek bars at edges" into ics-mr0 2011-10-11 16:14:31 -07:00
Gilles Debunne
c08ec615d2 Bug 5385279: IOOB in createMisspelledSuggestionSpan 
Race condition: when spell check result come back, the spell check span may no longer
be in the text, although it should have been removed by removeSpellCheckSpan.

This is possible because onGetSuggestions is called from an other thread
and it can see the text in an inconsistent state where the span may have been removed
from the text, but the listener that calls removeSpellCheckSpan has not yet been called.
As a result, onGetSuggestions still lists the span but getSpanStart returns -1.

Change-Id: Ia40f7ed2b46fc94888fce5a6b209fb0d0d529bbe
 2011-10-11 16:12:23 -07:00
Svetoslav Ganov
f42d34bdd1 Merge "Add AccessibilityRecord#getMaxScrollX and #getMaxScrollY to the pubic API" 2011-10-11 16:00:54 -07:00
Adam Powell
aa4f5c95c3 Fix bug 5434403 - invalidation problem with seek bars at edges 
Explicitly invalidate the seek bar thumb area when we change drawable
states for touch down. This prevents the thumb from only being
half-invalidated at the edges since it extends into the view's padding
region.

Change-Id: Icc4e608aca044b2d05f3a9378eced839c03947e6
 2011-10-11 15:38:30 -07:00
Michael Kolb
1eb08f0acb am f0f7a913: Merge "Support spellcheck attribute in WebTextView" into ics-mr0 
* commit 'f0f7a9139b40e9b90a2981aa7aba49fa2c24ca1d':
  Support spellcheck attribute in WebTextView
 2011-10-11 15:33:37 -07:00
Jeff Brown
241fe477ed am 58bf986c: Merge "Use ashmem for CursorWindows. Bug: 5332296" into ics-mr0 
* commit '58bf986c3e3948242e89654e6d59b97a21345582':
  Use ashmem for CursorWindows. Bug: 5332296
 2011-10-11 15:33:28 -07:00
Michael Kolb
f0f7a9139b Merge "Support spellcheck attribute in WebTextView" into ics-mr0 2011-10-11 15:25:22 -07:00
Gilles Debunne
5915c885de Bug 5237623: word no longer underlined after replacement 
When replacing a word, we need to remove *all* misspelled
suggestion spans, not just the one which triggered that popup.

Change-Id: I7be17ac626b26123b029f5e10c1e2eaa5f94d67c
 2011-10-11 14:54:26 -07:00
Romain Guy
f751210b4b Merge "Fix the build" 2011-10-11 14:51:18 -07:00
Romain Guy
4db2504ada Fix the build 
Change-Id: I3071feab62abee7393557ceb920786b476fb0b02
 2011-10-11 14:48:56 -07:00
Michael Kolb
64b4f16adf Support spellcheck attribute in WebTextView 
Bug: 5267547

    set no suggestions for WebTextView when spellcheck attribute is
    false
    depends on CL: https://android-git.corp.google.com/g/#/c/141326/2

Change-Id: I4ad476270607e9d600567bbb4d9fd321893707b1
 2011-10-11 14:19:53 -07:00
Svetoslav Ganov
8b6c7dd2fe Add AccessibilityRecord#getMaxScrollX and #getMaxScrollY to the pubic API 
The methods were hidden for the previoud release since they were added
too close to the SDK final date.

bug:5424373

Change-Id: I812b9809223db75636b04549500f023820b6eb5a
 2011-10-11 14:16:41 -07:00
Romain Guy
df61887feb Merge "Check whether an AsyncTask is created/executed on a looper thread." 2011-10-11 14:10:10 -07:00
Romain Guy
7498ccb6b9 Check whether an AsyncTask is created/executed on a looper thread. 
Change-Id: I181b253c50a6579f35e61cd4b0c500379462e035
 2011-10-11 14:09:27 -07:00
Jeff Brown
58bf986c3e Merge "Use ashmem for CursorWindows. Bug: 5332296" into ics-mr0 2011-10-11 13:54:45 -07:00
Svetoslav Ganov
a72a80632b Merge "DO NOT MERGE AdapterView does not set setCurrentItemIndex in accessibility event." into ics-mr0 2011-10-11 13:54:28 -07:00
Amith Yamasani
fce776c21e Backup owner info as part of settings backup. 
Added these settings to the whitelist:
Settings.Secure.LOCK_SCREEN_OWNER_INFO_ENABLED
Settings.Secure.LOCK_SCREEN_OWNER_INFO

Bug: 5342797
Change-Id: I1bd4d04b5651b61919efd8c1b25c04acc5806f4a
 2011-10-11 13:53:30 -07:00
Nick Pelly
5eba4d6713 am 79425fd6: Merge "Remove deprecated (and hidden) enableForegroundNdefPush callback API\'s." 
* commit '79425fd600e521f1eb4947c26ef631d3e1d29920':
  Remove deprecated (and hidden) enableForegroundNdefPush callback API's.
 2011-10-11 12:41:32 -07:00
Nick Pelly
79425fd600 Merge "Remove deprecated (and hidden) enableForegroundNdefPush callback API's." 2011-10-11 12:39:46 -07:00
Jeff Brown
24285a1ad3 am e69eaf5c: Merge "Don\'t log BlockGuard violations on ENG builds." 
* commit 'e69eaf5c6de95a0db7d5cddf079169a925bac85f':
  Don't log BlockGuard violations on ENG builds.
 2011-10-11 12:36:25 -07:00
Jeff Brown
e69eaf5c6d Merge "Don't log BlockGuard violations on ENG builds." 2011-10-11 12:35:05 -07:00
Svetoslav Ganov
eb0c52e491 DO NOT MERGE AdapterView does not set setCurrentItemIndex in accessibility event. 
Cherry picking since branching caught us in the middle of review.

bug:5439637

Change-Id: I67d080abb4c14cad88b952e2f91d65e181b2029b
 2011-10-11 11:58:13 -07:00
Svetoslav Ganov
98348517fd DO NOT MERGE AdapterView#isScrollableForAccessibility does not handle null adapter. 
Cherry picking since branching caught us in the middle of review.

1. If an AdapterView has no adapter and the view tries to fire an
   accessibility event we get a null pointer exception.

bug:5439321

Change-Id: Ia3d7a5ad852ef42422d10d8a62c4d3af6792313b
 2011-10-11 11:54:22 -07:00
Jeff Brown
be7c29c9f7 Don't log BlockGuard violations on ENG builds. 
We want to see CloseGuard violations in the log in ENG builds
because they indicate serious problems, but BlockGuard is
too noisy and is best viewed in the aggregate from the
drop box based tools.

Change-Id: I77d4d0a561a4299355c111d0ccb5a2147646245b
 2011-10-11 11:35:23 -07:00
Svetoslav Ganov
9e2660be00 am 0c9698ac: Merge changes I67d080ab,Ia3d7a5ad 
* commit '0c9698aca534f123414e4c5a9419f210473ba11b':
  AdapterView does not set setCurrentItemIndex in accessibility event.
  AdapterView#isScrollableForAccessibility does not handle null adapter.
 2011-10-11 11:32:20 -07:00
Svetoslav Ganov
0c9698aca5 Merge changes I67d080ab,Ia3d7a5ad 
* changes:
  AdapterView does not set setCurrentItemIndex in accessibility event.
  AdapterView#isScrollableForAccessibility does not handle null adapter.
 2011-10-11 11:30:45 -07:00