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

68012 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Xavier Ducrohet
5e6c219477 am f8e737cb: am 22701ec5: am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1 
* commit 'f8e737cb61ab86b90ec318591fbcfec40fac63cf':
  Make sure resource references are resolved.
 2012-02-23 12:22:40 -08:00
Jean-Baptiste Queru
6822c97898 am 32916f7a: am fc4215ee: am 2d03a93e: Merge "Xcode 4.3 compatibility checkin" 
* commit '32916f7a22f2abf5c1e7021f44c2337ca172f2e5':
  Xcode 4.3 compatibility checkin
 2012-02-23 12:22:35 -08:00
Jean-Baptiste Queru
afb902be67 am 9f207a85: (-s ours) am aff90790: am 4280891d: Merge "The bigger touch slop still has a problem" 
* commit '9f207a850f6c5744db895692f21159d9a88966c5':
  The bigger touch slop still has a problem
 2012-02-23 12:22:29 -08:00
Andreas Huber
b07ae06e75 Merge "Be more greedy when it comes to gathering input and output buffers." 2012-02-23 11:54:08 -08:00
Adam Powell
6723dd9561 Merge "Bug 6058721 - optimize changing checked states in AbsListView" 2012-02-23 11:49:05 -08:00
Andreas Huber
a2798e252a Be more greedy when it comes to gathering input and output buffers. 
Change-Id: I54c4f608e5155917ca35eba5655b4c06357fb112
 2012-02-23 11:21:43 -08:00
Rich Hyndman
d2b44e0706 am 46074f4d: am 3ebde8a2: am 942b823c: Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1 
* commit '46074f4d4aa8334249a9bd71e6d0bc25066d5cae':
 2012-02-23 11:20:43 -08:00
Rich Hyndman
0b2a139142 am f2381328: am 22c98df9: am 942b823c: Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1 
* commit 'f238132853d2482979ec98a9d4f81ea24273768d':
  docs: Added Lint into Android Training and removed Layoutopt.
 2012-02-23 11:20:40 -08:00
The Android Open Source Project
1e5a331be6 am d4c617ae: am 41cea4b5: Reconcile with ics-mr1-release 
* commit 'd4c617aed18ba4080c773ff40a2b0f75b4a73645':
 2012-02-23 11:20:36 -08:00
The Android Open Source Project
77252c664c am f815dc4e: am 64a907c5: Reconcile with ics-mr1-release 
* commit 'f815dc4e4a09ec53f183a391495ef87dd21ccc6f':
 2012-02-23 11:20:30 -08:00
The Android Open Source Project
9d3864c942 am c6a1c584: am 6815d49c: Reconcile with ics-mr1-release 
* commit 'c6a1c58452bc9207cc7dba8ad40ad0535fb356bb':
 2012-02-23 11:20:16 -08:00
The Android Open Source Project
4c569c5f89 am 5cfee77e: am 8013fd39: Reconcile with ics-mr1-release 
* commit '5cfee77e400a6e1f51b37e03ce090bc233f1bb8a':
 2012-02-23 11:19:58 -08:00
Dianne Hackborn
a2514f3a95 am 536a3b18: am f08beab2: am 01011c3d: Fix issue #6037252: Screen shifts after all apps are upgraded 
* commit '536a3b185bb0a2f7bc11b78e00123ee502c99f2f':
 2012-02-23 11:19:50 -08:00
Adam Powell
29382d9d9d Bug 6058721 - optimize changing checked states in AbsListView 
Instead of treating a checked state change as a full data set change,
simply modify the checked or activated state of on-screen views.
Any resulting layout changes will be serviced as appropriate.

Change-Id: Ia846de16bbc54f0729608259aa4b530da9404245
 2012-02-23 11:04:38 -08:00
Dianne Hackborn
b8678d76c3 resolved conflicts for merge of 210c1a26 to master 
Change-Id: Ic44193e62215086c22225f2def5eee3159d26ae8
 2012-02-23 10:54:06 -08:00
Dianne Hackborn
c42067d7d7 Merge "Fix issue #6049410: 3rd party app crashing in JB: Uber" 2012-02-23 10:45:11 -08:00
Dianne Hackborn
81873e95de Fix issue #6049410: 3rd party app crashing in JB: Uber 
Change-Id: Ie3f8c91a2c0fdd5a80824fe2fa7da2afd2913174
 2012-02-23 10:25:35 -08:00
Stephen Hines
a16c98c155 Merge "Support running ForEach on non-root functions." 2012-02-23 09:58:56 -08:00
Gilles Debunne
a172b6e969 Merge "Updated min/maxLines and singleLine documentation" 2012-02-23 09:26:25 -08:00
Andreas Huber
05e8074eaa Merge "Add new APIs AMessage::(set|find)Buffer to make it safer to pass" 2012-02-23 09:13:45 -08:00
Jean-Baptiste Queru
812c623563 am ad3102d0: am f3d94b44: am a91b052e: am fc24982a: Merge "Call onTimeChanged when AM/PM changed." 
* commit 'ad3102d06bc6060f739e0803d0e45dec8020703b':
  Call onTimeChanged when AM/PM changed.
 2012-02-23 08:35:03 -08:00
Tsu Chiang Chuang
453057a9d5 am 7b306ae2: am 90cfe0f2: am 2d559b53: Merge "fix NPE in race condition." into ics-mr1 
* commit '7b306ae225b0a7337972f4d8bff51e8f79be3a03':
 2012-02-23 08:34:56 -08:00
Tsu Chiang Chuang
541710a9ae am c16d9de7: am a626f8d6: am 2d559b53: Merge "fix NPE in race condition." into ics-mr1 
* commit 'c16d9de72996950ec7f55af80d2864cd2abad1c2':
  fix NPE in race condition.
 2012-02-23 08:34:44 -08:00
Adam Powell
a4b8a2e4d1 am 49913d8c: am 8035db11: am 482ae5f2: Bug 6021294 - Contextual action bar animation tweaks 
* commit '49913d8c60a2add8989435bcda532959e86f99b1':
 2012-02-23 07:30:09 -08:00
Adam Powell
1f0f9d28a1 am c0d0dddc: am fef000e3: am 482ae5f2: Bug 6021294 - Contextual action bar animation tweaks 
* commit 'c0d0dddc20827846dcf3235f7307ad76d2893ba6':
  Bug 6021294 - Contextual action bar animation tweaks
 2012-02-23 07:30:01 -08:00
Jean-Baptiste Queru
68e696b137 am 058bd2ec: am 1d4c4d42: am 44c1f012: Merge "Return error code when composing PDU fails" 
* commit '058bd2ecbcf8057511b00685eddc4ff5061bdbc1':
  Return error code when composing PDU fails
 2012-02-23 07:29:46 -08:00
Jean-Baptiste Queru
d7170f3262 am 4b3ec09b: am 99ccf407: am c2461eb3: Merge "Add support for bmp and wav content types in MMS" 
* commit '4b3ec09b8199d3c70fbb025a73e8f0a46dcd22c9':
  Add support for bmp and wav content types in MMS
 2012-02-23 07:29:42 -08:00
The Android Open Source Project
bd06f16077 am e3804813: am f5f5d61c: Reconcile with ics-mr1-release 
* commit 'e380481381b8679bf4bd4afb922e82e0a849b2bb':
 2012-02-23 07:29:21 -08:00
Jean-Baptiste Queru
00ef7e8f2f am 50ff08a2: am 8a33803d: am a1ee18f1: Merge "Increase PDU parts buffer size for performance reasons" 
* commit '50ff08a24e7a94c196f9b5c0b5b9ebdc03064a36':
  Increase PDU parts buffer size for performance reasons
 2012-02-23 07:29:15 -08:00
The Android Open Source Project
12c5502612 am a4ea7a8f: am c30fdda0: Reconcile with ics-mr1-release 
* commit 'a4ea7a8f204890aee9a50d2e65b410bb443b7149':
 2012-02-23 07:29:06 -08:00
Marc Blank
0d1490bd3b am cedcdc98: (-s ours) am d3ea7331: am 094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE 
* commit 'cedcdc984cf36d3b3aeca359b4866e5680427c51':
 2012-02-23 07:28:54 -08:00
Marc Blank
9b99df6ce6 am cdbf0efc: (-s ours) am 970c74ac: am 094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE 
* commit 'cdbf0efcdc42ea0ef7290c4d73da16f596c8e8be':
  Use ' for apostrophe in HTML encoding DO NOT MERGE
 2012-02-23 07:28:51 -08:00
Steve Block
2eb7309388 Merge "Drop support for Android HTTP stack" 2012-02-23 04:29:30 -08:00
Gilles Debunne
0b5a6b2e8a Merge "Fixed comment for selectAllOnFocus" 2012-02-22 18:27:27 -08:00
Gilles Debunne
e58b7f45ec Fixed comment for selectAllOnFocus 
Pre-focusable in touch mode ? cursor moves to tapped position.
or previous position when using d-pad/keyboard.

Change-Id: Iac725ff233bfeac2dc14e870118047a9a8418ff9
 2012-02-22 18:26:04 -08:00
Gilles Debunne
e35a07050d Updated min/maxLines and singleLine documentation 
Bug http://code.google.com/p/android/issues/detail?id=24891

Change-Id: I0b35d2e0583f285f38e14e43563433433a8984d1
 2012-02-22 18:24:17 -08:00
George Mount
ebb8e95657 Merge "Characters sent directly to InputConnection treated as changes." 2012-02-22 17:33:03 -08:00
George Mount
6420ec4cd5 Characters sent directly to InputConnection treated as changes. 
Bug 6045123

Change-Id: Iab8c1e3c307ec84c4f6934abfa2d0cea726d9efe
 2012-02-22 17:23:23 -08:00
Svetoslav Ganov
2822111948 Merge "Add check for no children in VIew hosting virtual view tree." 2012-02-22 16:49:36 -08:00
Svetoslav Ganov
311a63af40 Add check for no children in VIew hosting virtual view tree. 
1. For accessibility purposes View may report a virtual tree
   rooted at them to convey the logical structure they draw.
   These are usually custom Views. Such views cannot have
   children and this patch adds a check for that.

bug:6022217

Change-Id: I3795a613b4aef1a7ec5810db8584a11b648870f2
 2012-02-22 16:45:10 -08:00
Andreas Huber
5c850396b3 Add new APIs AMessage::(set|find)Buffer to make it safer to pass 
ABuffer objects through messages.

Change-Id: I9f8b4e4c4767d0d70a0105e0c0813b754379b49d
 2012-02-22 16:20:59 -08:00
George Mount
49cc3d98e2 Merge "Changes that don't map to keys sent as text changes." 2012-02-22 16:02:30 -08:00
Dima Zavin
77d9ee4df6 Merge "libui: add ability to force a framebuffer format for EGL's use" 2012-02-22 16:00:49 -08:00
Dima Zavin
180600dec8 libui: add ability to force a framebuffer format for EGL's use 
This does not actually change the framebuffer format. It merely
fakes this format to surfaceflinger so that when it creates
framebuffer surfaces it will use this format. It's really a giant
HACK to allow interworking with buggy gralloc+GPU driver
implementations. You should *NEVER* need to set this for shipping
devices.

Change-Id: I03eeb5b4d72838ef219df386ecc489fc20ab9cc7
Signed-off-by: Dima Zavin <dima@android.com>
 2012-02-22 15:44:46 -08:00
John Reck
29cc47e62e Merge "Fix drawing focus node rect in touch mode" 2012-02-22 15:39:23 -08:00
Stephen Hines
473a2048d3 Support running ForEach on non-root functions. 
BUG=6000538

Change-Id: Ie2b16893b150cc5955ee4b9d028c988f69a82744
 2012-02-22 15:24:29 -08:00
George Mount
592b213608 Merge "Add caret thumb following selection handle logic." 2012-02-22 15:17:00 -08:00
Andreas Huber
0ae6b481e4 Merge "Implementation of a java media codec interface and associated tools." 2012-02-22 15:13:44 -08:00
George Mount
7bc111cc9d Add caret thumb following selection handle logic. 
Webkit Change: I3cb0499c5fa3a7de241025d9be04ff44f54f2a74

Change-Id: I669653ca6890fe1136fdd42e24f4c3a34c00d1e4
 2012-02-22 15:13:19 -08:00
George Mount
3c30d14560 Changes that don't map to keys sent as text changes. 
Bug 6033096

Change-Id: I61da4d398ac140fdacfdd344dc0e2885da907ce0
 2012-02-22 15:10:08 -08:00