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

47997 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Gloria Wang
5c96c65f69 Bug fixes of DRM framework. 
- Add death listener to clean-up drmserver appropriately
  when drmserver died.
- Remove "static" declaration of mUniqueIdVector because it was not
  needed to be static variable.
- Remove "class DrmContentIds;" because the class does not exist.
- contentPath in saveRights() could be empty because
  it is not required by some DRM schemes.
- Fix naming convention to use sXXX for static variables.
- Fix typo

Change-Id: I7d440488fc074c200f1009d1bafafeffebd690b2
 2011-03-15 11:17:22 -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
491d1fef99 am f58f041b: am cffde30f: am 44220a56: Merge "Add some debug code to try to track down issue 3183612" into gingerbread 
* commit 'f58f041beb8a00db201eb3c8eb801dc1b702253d':
  Add some debug code to try to track down issue 3183612
 2011-03-15 11:06:14 -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
79d6ffabd9 am 8d97f87d: am eea577e0: Remove redundant network types. 
* commit '8d97f87d1fc7b67d57d5894915a4451629d98551':
  Remove redundant network types.
 2011-03-15 10:51:23 -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
Jamie Gennis
4a1f8a4e87 am c570ee21: am 41a894ad: am 75597105: Merge "SurfaceTextureClient: Add ISurfaceTexture getter." into honeycomb-mr1 
* commit 'c570ee21e2c2b9802c9d1f58dba024e884b225e6':
  SurfaceTextureClient: Add ISurfaceTexture getter.
 2011-03-15 10:45:01 -07:00
Jamie Gennis
032c5c57d7 am b15ab10c: am 1b7dbf45: Merge branch \'honeycomb-LTE\' of ssh://android-git:29418/platform/frameworks/base into honeycomb-LTE 
* commit 'b15ab10c33058a8a89410085e0b58fd793a0ca54':
 2011-03-15 10:44:59 -07:00
Jamie Gennis
36f3699abd am 73d7036d: am c8bff5d9: ANativeWindow: add query for the concrete type. 
* commit '73d7036da461505af01f2899792f609dc3cdadc9':
  ANativeWindow: add query for the concrete type.
 2011-03-15 10:44:56 -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
f38d253ccd am ceb7cb14: am 02805a40: Merge "ANativeWindow: add query for the concrete type." into honeycomb-mr1 
* commit 'ceb7cb1460484eda1a3cb9cd271d7caf3a3dcbd1':
  ANativeWindow: add query for the concrete type.
 2011-03-15 10:42:06 -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
Eric Fischer
0d1d2a7a2c Import revised translations. 
Change-Id: Ic97284d3867608cbc0f018eb2472affbc783b675
 2011-03-15 10:37:23 -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
James Dong
005de48cfb Fix an issue where the timestamp provided by WAVExtractor does not start with 0 
Change-Id: Ie8eb86e26f026c07a3c3be43e35027b19de4a2c3
 2011-03-15 09:45:22 -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
James Dong
aa88f3bef7 Merge "Add memory leak tracking/debugging code to drm server" 2011-03-15 09:29:11 -07:00
Svetoslav Ganov
9406eb13d5 am 6d4f318f: am e65711b2: Merge "Tapping on the week number sends the DatePicker to epoch start." into honeycomb-mr1 
* commit '6d4f318f0c836c0c2eac3a1d99debedc6c03578a':
  Tapping on the week number sends the DatePicker to epoch start.
 2011-03-14 23:17:58 -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
d46bbaeb27 am f057524d: am b02b8369: Merge "Remove a workaround for the data inconsistency of SystemProperties" into honeycomb-mr1 
* commit 'f057524db620c490e96fa886238f3b31bd973060':
  Remove a workaround for the data inconsistency of SystemProperties
 2011-03-14 22:51:21 -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
8bbff52cf6 am faffbd80: am 0c6e9521: Merge "Update Droid Fonts" into honeycomb-mr1 
* commit 'faffbd806e6d5b66dbd1bba46f050a055116be74':
  Update Droid Fonts
 2011-03-14 19:29:33 -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
Ying Wang
a738a7d981 Merge "Add screen layout size as one of the resource filtering axes." 2011-03-14 19:20:00 -07:00
Stephen Hines
413bce45ba Make RS Matrix functions threadable. 
BUG=4100079

Change-Id: I6cefa0eab42481fa974077d6aed98007f9fd87f7
 2011-03-14 19:16:19 -07:00
James Dong
ed73246b32 Add memory leak tracking/debugging code to drm server 
bug - 4099038

Change-Id: I6c048eaf3d7f34bc144b8daaa5fdef1ed474af66
 2011-03-14 18:48:19 -07:00
Adam Powell
75a1ef8d14 am 15c9ab33: am 57fccf12: Merge "Fix bug 4099023 - Phantom clicks on some websites" into honeycomb-mr1 
* commit '15c9ab336eff66cafa365e9ea3a81f9f1b5c2635':
  Fix bug 4099023 - Phantom clicks on some websites
 2011-03-14 18:37:18 -07:00