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

47167 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Brad Fitzpatrick
cd7dfcec4b am 40b207c1: Merge "Using proper key for removing object from the map." 
* commit '40b207c131e224554e30cde30fe4ee49817432ee':
  Using proper key for removing object from the map.
 2011-03-15 11:30:04 -07:00
Brad Fitzpatrick
c73c4a36d2 am b37f7e59: Merge changes I81fc2f90,I5e7fd759 
* commit 'b37f7e59ee38472bdd3ca5fe66cc847890c862e2':
  Using proper key for removing from map.
  Removing wrong equals method in comparator.
 2011-03-15 11:29:56 -07:00
Xavier Ducrohet
48a2a5ad1b Merge "Merge 6f2fb570 from honeycomb. do not merge." into gingerbread 2011-03-15 11:29:16 -07:00
Xavier Ducrohet
14e1f523c6 Merge "Merge c12b4093 from honeycomb. do not merge." into gingerbread 2011-03-15 11:29:07 -07:00
Scott Main
197d775286 am e8f95e7f: docs: update device dashboard 
* commit 'e8f95e7f353d6205dbb09cc440f47256604229ee':
  docs: update device dashboard
 2011-03-15 11:28:50 -07:00
Brad Fitzpatrick
8d25eab105 Merge "Releasing lock even if exception is thrown." 2011-03-15 11:23:44 -07:00
Brad Fitzpatrick
56c4c442c0 Merge "Lazy initialization must be synchronized to avoid parallel instances cretation." 2011-03-15 11:22:43 -07:00
Brad Fitzpatrick
b98c8fca95 Merge "Removing self-assignment statement." 2011-03-15 11:19:23 -07:00
Brad Fitzpatrick
8b5345fb36 Merge "Fixing self-assignment in copying code." 2011-03-15 11:18:18 -07:00
Brad Fitzpatrick
9a01a2f272 Merge "Fixing self-assignment in cloning code." 2011-03-15 11:15:19 -07:00
Brad Fitzpatrick
7972e38280 Merge "Removing repetitive conditional; it simply does nothing except slowing down things." 2011-03-15 11:13:01 -07:00
Romain Guy
ad37cd3b5d Fix disappearing edges in lists/scrollviews/etc. 
Bug #4093871

This bug was introduced by a change that modified the way fade areas
are cleared. The previous change relied on Rect::intersect() to empty
the intersected rect when the two rects don't intersect. Unfortunately
this is not what intersect() does. The fix is rather simple and
sets the layer's bounds to empty when they don't intersect with the
clip or the viewport. This has the side effect of ignoring the layer
which is the expected result.

Change-Id: Icf0038b9a476c53f8eff7084136aba3033d093e6
 2011-03-15 11:12:25 -07:00
Brad Fitzpatrick
38c6e31c88 Merge "Removing repetitive conditional; it simply does nothing except slowing down things." 2011-03-15 11:12:15 -07:00
Dianne Hackborn
f58f041beb am cffde30f: am 44220a56: Merge "Add some debug code to try to track down issue 3183612" into gingerbread 
* commit 'cffde30fc10ecdfca53877fbee61525028eb47ba':
  Add some debug code to try to track down issue 3183612
 2011-03-15 11:03:42 -07:00
Brad Fitzpatrick
29d75c9a10 Merge "Fixing improper boxing to Integer instead of Long." 2011-03-15 11:03:29 -07:00
Brad Fitzpatrick
40b207c131 Merge "Using proper key for removing object from the map." 2011-03-15 11:00:51 -07:00
Brad Fitzpatrick
b37f7e59ee Merge changes I81fc2f90,I5e7fd759 
* changes:
  Using proper key for removing from map.
  Removing wrong equals method in comparator.
 2011-03-15 10:56:16 -07:00
Dianne Hackborn
cffde30fc1 am 44220a56: Merge "Add some debug code to try to track down issue 3183612" into gingerbread 
* commit '44220a56026ead4583a9db96ced5f1113d4b4f07':
  Add some debug code to try to track down issue 3183612
 2011-03-15 10:52:27 -07:00
Robert Greenwalt
8d97f87d1f am eea577e0: Remove redundant network types. 
* commit 'eea577e0c41babadf4f07fd9d5e822bd7faa9385':
  Remove redundant network types.
 2011-03-15 10:48:22 -07:00
Amith Yamasani
7e978441ee Merge "Use more padding on the sides for SearchView" into honeycomb-mr1 2011-03-15 10:47:01 -07:00
Robert Greenwalt
eea577e0c4 Remove redundant network types. 
ServiceStateTracker can use the ServiceState values.
bug:4083436

Change-Id: I5b5b72392d9d48adc55731c44417d622930c4bec
 2011-03-15 10:44:01 -07:00
Jamie Gennis
c570ee21e2 am 41a894ad: am 75597105: Merge "SurfaceTextureClient: Add ISurfaceTexture getter." into honeycomb-mr1 
* commit '41a894ad1379a046b0b7471a33d974c6241a91a9':
  SurfaceTextureClient: Add ISurfaceTexture getter.
 2011-03-15 10:40:26 -07:00
Jamie Gennis
b15ab10c33 am 1b7dbf45: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 
* commit '1b7dbf45f18bea3346a8296cbfd5c1a51cf3e01d':
 2011-03-15 10:40:24 -07:00
Jamie Gennis
73d7036da4 am c8bff5d9: ANativeWindow: add query for the concrete type. 
* commit 'c8bff5d9b72482487e6e62c72236bf14abed2aaf':
  ANativeWindow: add query for the concrete type.
 2011-03-15 10:40:21 -07:00
Jamie Gennis
41a894ad13 am 75597105: Merge "SurfaceTextureClient: Add ISurfaceTexture getter." into honeycomb-mr1 
* commit '75597105e6e03f656bdc1e40acac44afb9a3b01b':
  SurfaceTextureClient: Add ISurfaceTexture getter.
 2011-03-15 10:38:00 -07:00
Jamie Gennis
1b7dbf45f1 Merge branch 'honeycomb-LTE' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 2011-03-15 10:37:59 -07:00
Jamie Gennis
c8bff5d9b7 ANativeWindow: add query for the concrete type. 
This change adds a query to the ANativeWindow interface for getting the
concrete type of the ANativeWindow.

Bug: 4086509
Change-Id: I64aa86d72fbca3b52a98e1fc35608737781a3178
 2011-03-15 10:37:57 -07:00
Jamie Gennis
bae716bc15 SurfaceTexture: disallow unsupported uses. 
This change makes the ANativeWindow_lock NDK function error out if it is
passed an ANativeWindow with a concrete type that is not Surface.  It
also makes eglCreateWindowSurface fail if it is passed a
SurfaceTextureClient as its 'window' argument.

Bug: 4087277
Change-Id: Ie68c50c52d88f72d8a387f6c094908044c83a88c
 2011-03-15 10:37:37 -07:00
Jamie Gennis
ceb7cb1460 am 02805a40: Merge "ANativeWindow: add query for the concrete type." into honeycomb-mr1 
* commit '02805a40d44fa038549e771ec9a15f52b5fa3538':
  ANativeWindow: add query for the concrete type.
 2011-03-15 10:36:01 -07:00
Jamie Gennis
75597105e6 Merge "SurfaceTextureClient: Add ISurfaceTexture getter." into honeycomb-mr1 2011-03-15 10:34:35 -07:00
Jamie Gennis
02805a40d4 Merge "ANativeWindow: add query for the concrete type." into honeycomb-mr1 2011-03-15 10:33:35 -07:00
Dianne Hackborn
44220a5602 Merge "Add some debug code to try to track down issue 3183612" into gingerbread 2011-03-15 10:29:04 -07:00
Scott Main
e8f95e7f35 docs: update device dashboard 
Change-Id: I8764dc12fdba7049d0ab4229dde5d61af29a64c0
 2011-03-15 10:15:40 -07:00
Justin Ho
f8caec7c72 Updated notification asset for DND mode 
Updating placeholder asset for DND mode in system tray when notifications are disabled

Bug: 3408005
Change-Id: Ic816b9384915a23071da71c08bd6b71d218dca79
 2011-03-15 09:33:59 -07:00
Svetoslav Ganov
6d4f318f0c am e65711b2: Merge "Tapping on the week number sends the DatePicker to epoch start." into honeycomb-mr1 
* commit 'e65711b21f1b351f28d4f04819e1e05a9ac8dfee':
  Tapping on the week number sends the DatePicker to epoch start.
 2011-03-14 23:15:24 -07:00
Svetoslav Ganov
e65711b21f Merge "Tapping on the week number sends the DatePicker to epoch start." into honeycomb-mr1 2011-03-14 23:13:49 -07:00
satok
f057524db6 am b02b8369: Merge "Remove a workaround for the data inconsistency of SystemProperties" into honeycomb-mr1 
* commit 'b02b8369c6549417561e2ae1467b615645b5d04c':
  Remove a workaround for the data inconsistency of SystemProperties
 2011-03-14 22:47:11 -07:00
satok
b02b8369c6 Merge "Remove a workaround for the data inconsistency of SystemProperties" into honeycomb-mr1 2011-03-14 22:44:23 -07:00
Bart Sears
faffbd806e am 0c6e9521: Merge "Update Droid Fonts" into honeycomb-mr1 
* commit '0c6e9521f5a8b57910451a92c1bea142edd4b30d':
  Update Droid Fonts
 2011-03-14 19:25:30 -07:00
Bart Sears
0c6e9521f5 Merge "Update Droid Fonts" into honeycomb-mr1 2011-03-14 19:24:02 -07:00
Stephen Hines
413bce45ba Make RS Matrix functions threadable. 
BUG=4100079

Change-Id: I6cefa0eab42481fa974077d6aed98007f9fd87f7
 2011-03-14 19:16:19 -07:00
Svetoslav Ganov
1a730dcc4f Tapping on the week number sends the DatePicker to epoch start. 
bug:4093343

1. If getting a day from location in a week view fails
   the out date was cleared but the client was unaware
   of that failure. I have added a return value indicating
   where getting the day from locations was successfull.

Change-Id: I566a9ee33dfe2e64300a4b50dacc652114e01442
 2011-03-14 18:34:55 -07:00
Adam Powell
15c9ab336e am 57fccf12: Merge "Fix bug 4099023 - Phantom clicks on some websites" into honeycomb-mr1 
* commit '57fccf12e1e71089aa01cbf9867314f82db4e6f9':
  Fix bug 4099023 - Phantom clicks on some websites
 2011-03-14 18:33:56 -07:00
Adam Powell
57fccf12e1 Merge "Fix bug 4099023 - Phantom clicks on some websites" into honeycomb-mr1 2011-03-14 18:32:45 -07:00
Justin Ho
71ee3ba0f0 am f47a1683: Merge "Updated HTML5 media playback controls Bug: 4080127" into honeycomb-mr1 
* commit 'f47a16837cc0516e23811850f69839bb2f7ac95b':
  Updated HTML5 media playback controls Bug: 4080127
 2011-03-14 18:25:45 -07:00
Justin Ho
1586c133a3 am cc886b93: Merge "Fixing naming for disabled paste assets Updated paste assets" into honeycomb-mr1 
* commit 'cc886b93681b75a9b89331930435e0f527b2c3d7':
  Fixing naming for disabled paste assets Updated paste assets
 2011-03-14 18:25:43 -07:00
Justin Ho
7bc341cf80 am 3e317542: Merge "Updated textfield search assets Bug: 3321263" into honeycomb-mr1 
* commit '3e3175428c81501d72cda3c026b927ca6408243f':
  Updated textfield search assets Bug: 3321263
 2011-03-14 18:25:40 -07:00
Ying Wang
a7ec506e4a am e422f7a2: am bf079216: Dist classes.jar with full class files inside 
* commit 'e422f7a21aa094c10489d92d38c70bf688c3c5a8':
  Dist classes.jar with full class files inside
 2011-03-14 18:25:01 -07:00
Mike Lockwood
70882ca39f am ccdac700: (-s ours) am 78b8e1be: Merge "DO NOT MERGE: backport recent USB accessory changes from honeycomb" into gingerbread 
* commit 'ccdac700df7089a87e6bf284e45a30a7a6a62602':
  DO NOT MERGE: backport recent USB accessory changes from honeycomb
 2011-03-14 18:24:58 -07:00
Simon Wilson
321e4c9c8f am 81e1ed7e: (-s ours) am ee3f6ef2: Merge "DO NOT MERGE Support WiMAX Settings & ticker message" into gingerbread 
* commit '81e1ed7eb5e02edf714cd5f416d1f6ebeaeebae0':
  DO NOT MERGE Support WiMAX Settings & ticker message
 2011-03-14 18:24:48 -07:00