drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
61,667 Commits 1 Branch 0 Tags
Commit Graph

61667 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Amith Yamasani
b7618e013f am 120c48aa: (-s ours) am 421648ed: (-s ours) Merge "Backup owner info as part of settings backup. DO NOT MERGE." into ics-mr0 
* commit '120c48aab80f4344c3bf2bd890743783d0802223':
  Backup owner info as part of settings backup. DO NOT MERGE.
 2011-10-12 19:38:43 -07:00
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
Robert Ly
674316fb81 am cde59f2f: Merge "docs: restructure animation and add container doc" 
* commit 'cde59f2fddd1e2d69ab6f7e409fdd25da8c68af5':
  docs: restructure animation and add container doc
 2011-10-12 19:38:36 -07:00
Robert Ly
3c07a0d380 am c37bfc3f: Merge "docs: restructure graphics docs and add hw-acceleration docs" 
* commit 'c37bfc3f925f97b4273614fc57d731cf9f4f6717':
  docs: restructure graphics docs and add hw-acceleration docs
 2011-10-12 19:38:34 -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
Jean-Michel Trivi
98179c599b am b5d9176d: (-s ours) am 49f61439: (-s ours) Merge "DO NOT MERGE Fix 5389442 RemoteControlClient javadoc" into ics-mr0 
* commit 'b5d9176d3b9952004608753a6707d9950297d25e':
  DO NOT MERGE Fix 5389442 RemoteControlClient javadoc
 2011-10-12 19:38:32 -07:00
Jake Hamby
29a30b71fc am 59033013: am 34877877: Merge "Fix bug in CDMA WDP datagram handling (fixes incoming MMS)." into ics-mr0 
* commit '5903301304c3d4fb879478b2edff01de2f40a38a':
  Fix bug in CDMA WDP datagram handling (fixes incoming MMS).
 2011-10-12 19:38:30 -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
Svetoslav Ganov
fda63b2655 am 9dbe4143: am 52763734: Merge "Dragging in touch explore mode should not become exploring." into ics-mr0 
* commit '9dbe41432c1a580b33f8820a2712e0a4d1c9fad4':
  Dragging in touch explore mode should not become exploring.
 2011-10-12 19:38:27 -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
Justin Ho
6dae097957 am 696ba727: Merge "Integrating updated system bar assets Bug: 5353986" 
* commit '696ba72729067b2ec6aace568c43ec77ebd0b849':
  Integrating updated system bar assets Bug: 5353986
 2011-10-12 19:38:19 -07:00
Jake Hamby
4cd4d8f117 am 690c9df1: am c5b28bd0: Merge "Change DCS of MO SMS to the correct value for UCS-2 encoding." into ics-mr0 
* commit '690c9df12cc46a43cab9c8da5ea9e07ec71305fb':
  Change DCS of MO SMS to the correct value for UCS-2 encoding.
 2011-10-12 19:38:19 -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
Michael Jurka
b701fe81cf am c15666ad: am 78bbcd31: Merge "Refactoring loading of recent apps" into ics-mr0 
* commit 'c15666adea2e22096a586bfc4f7c122640ebcacf':
  Refactoring loading of recent apps
 2011-10-12 12:37:49 -07:00
Adam Powell
d42c029100 am b24f45d5: am 1a4c4334: Merge "Fix bug 5396097 - menu theme consistency" into ics-mr0 
* commit 'b24f45d542d2838c6f910e4fd57dc5bf738a1ffd':
  Fix bug 5396097 - menu theme consistency
 2011-10-12 12:37:47 -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
Svetoslav Ganov
2ac1d424c7 am 5d98d67d: (-s ours) am a72a8063: (-s ours) Merge "DO NOT MERGE AdapterView does not set setCurrentItemIndex in accessibility event." into ics-mr0 
* commit '5d98d67d3198055228587d1f36e0272876f57405':
  DO NOT MERGE AdapterView does not set setCurrentItemIndex in accessibility event.
 2011-10-12 12:37:44 -07:00
Svetoslav Ganov
e2aa29b6df am a8490f1a: (-s ours) am 52f7fcf8: (-s ours) Merge "DO NOT MERGE AdapterView#isScrollableForAccessibility does not handle null adapter." into ics-mr0 
* commit 'a8490f1a4d50cd06af5a253e5addce7b2b1172b3':
  DO NOT MERGE AdapterView#isScrollableForAccessibility does not handle null adapter.
 2011-10-12 12:37:42 -07:00
Jean-Michel Trivi
1b3fb2fc92 am 21e188fd: Merge "Fix 5389442 RemoteControlClient javadoc" 
* commit '21e188fd6f264d93746d5c412fa7a210050680e8':
  Fix 5389442 RemoteControlClient javadoc
 2011-10-12 12:37:37 -07:00
Jeff Sharkey
a2c6f16047 am 69f364ae: Merge "Update internal state when iface is removed." 
* commit '69f364ae879cfde8716de07cc3358a4bc515a05b':
  Update internal state when iface is removed.
 2011-10-12 12:37:23 -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
Romain Guy
fabdc4fba7 am bd3f526e: Merge "Correctly apply transforms when getting a TextureView\'s bitmap Bug #5439406" 
* commit 'bd3f526eabcdb77cb2b3ed062072a959924dd95b':
  Correctly apply transforms when getting a TextureView's bitmap Bug #5439406
 2011-10-12 12:37:13 -07:00
Amith Yamasani
120c48aab8 am 421648ed: (-s ours) Merge "Backup owner info as part of settings backup. DO NOT MERGE." into ics-mr0 
* commit '421648ed06a2c944bc6a5fa866d461761533005b':
  Backup owner info as part of settings backup. DO NOT MERGE.
 2011-10-12 10:00:54 -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
Amith Yamasani
421648ed06 Merge "Backup owner info as part of settings backup. DO NOT MERGE." into ics-mr0 2011-10-12 09:59:11 -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
Robert Ly
cde59f2fdd Merge "docs: restructure animation and add container doc" 2011-10-12 09:50:31 -07:00
Robert Ly
c37bfc3f92 Merge "docs: restructure graphics docs and add hw-acceleration docs" 2011-10-12 09:50:26 -07:00
Amith Yamasani
aee2687e61 Backup owner info as part of settings backup. DO NOT MERGE. 
[Cherry pick from master]

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-12 09:46:43 -07:00
Amith Yamasani
50f9924322 Merge "Backup owner info as part of settings backup." 2011-10-12 09:45:22 -07:00
Jean-Michel Trivi
b5d9176d3b am 49f61439: (-s ours) Merge "DO NOT MERGE Fix 5389442 RemoteControlClient javadoc" into ics-mr0 
* commit '49f61439db7f8960745b0a5664795b5a5ad31ef8':
  DO NOT MERGE Fix 5389442 RemoteControlClient javadoc
 2011-10-12 09:42:48 -07:00
Jean-Michel Trivi
49f61439db Merge "DO NOT MERGE Fix 5389442 RemoteControlClient javadoc" into ics-mr0 2011-10-12 09:40:17 -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
Jake Hamby
5903301304 am 34877877: Merge "Fix bug in CDMA WDP datagram handling (fixes incoming MMS)." into ics-mr0 
* commit '34877877bb563e7e20600e6777cca4dc358a12d9':
  Fix bug in CDMA WDP datagram handling (fixes incoming MMS).
 2011-10-12 01:21:34 -07:00
Jake Hamby
34877877bb Merge "Fix bug in CDMA WDP datagram handling (fixes incoming MMS)." into ics-mr0 2011-10-12 01:10:28 -07: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
35af3639a1 Merge "Fix bug 5173029 - make fast scroller aware of scrolling containers" into ics-mr0 2011-10-11 19:30:08 -07:00
Jake Hamby
929ca5e497 Fix bug in CDMA WDP datagram handling (fixes incoming MMS). 
CDMA WDP datagram handling was refactored to use the same method
that handles concatenated SMS messages. WDP datagram sequence numbers
start at 0, but GSM/CDMA concatenated sequence numbers start at 1.
Changed SMSDispatcher.processMessagePart() to count from 0 when
handling WDP datagrams.

Also changed CdmaSMSDispatcher.processCdmaWapPdu() to correctly
decode segment numbers > 127 (signed byte conversion bug)
and to reject PDUs with an out-of-range segment number (invalid
ranges are already rejected for regular concatenated messages).

Bug: 5433331
Change-Id: I25c9567769de8edca789c0d1707d4916a4c46885
 2011-10-11 19:15:32 -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
Jean-Michel Trivi
09b4d99822 DO NOT MERGE Fix 5389442 RemoteControlClient javadoc 
Extend RemoteControlClient class description with an example
 of instance creation showing how the PendingIntent is created
 and how it uses the same ComponentName as the one used
 in AudioManager.registerMediaButtonEventReceiver()

Change-Id: I1af61ddbf5cfb9160ea5b814bed7b881d51b7eff
 2011-10-11 18:59:34 -07:00
Robert Ly
4b3e912102 docs: restructure animation and add container doc 
Change-Id: I1d0eedf59f804bf8b1117d22f899b0d71040d63d
 2011-10-11 18:45:26 -07:00
Svetoslav Ganov
9dbe41432c am 52763734: Merge "Dragging in touch explore mode should not become exploring." into ics-mr0 
* commit '5276373430af24448324941af6b911d90a3ddd10':
  Dragging in touch explore mode should not become exploring.
 2011-10-11 18:41:05 -07:00