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

28464 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Adam Powell
65d79fbe55 Fix bug 2911396 - documentation fix 
Change-Id: Ia2bbb25dfd6b165f044f5ef1cf291debfe79b1ca
 2010-08-11 22:05:46 -07:00
Dianne Hackborn
9185e26a8f am fb86ce93: Add watermark support. 
Merge commit 'fb86ce93079db4465a61489275c65bcf8ce4669e' into gingerbread-plus-aosp

* commit 'fb86ce93079db4465a61489275c65bcf8ce4669e':
  Add watermark support.
 2010-08-11 22:04:27 -07:00
Adam Powell
7f933daea9 Merge "Fix bug 2911311 and bug 2911700" 2010-08-11 21:59:54 -07:00
Adam Powell
f6148c53f9 Fix bug 2911311 and bug 2911700 
Integrate the action bar overflow menu better with the options menu lifecycle.

Change-Id: I1e3fdba04b01718c3ee3367f92e5dabe7bc84b5c
 2010-08-11 21:56:27 -07:00
Romain Guy
831cffa572 Merge "Bunch of fixes." 2010-08-11 19:38:40 -07:00
Romain Guy
959c91f7f7 Bunch of fixes. 
Fixes memory leak, fixes multiple context support, fix 3d transforms.

Change-Id: I7462cfbc57857dbd4de4e76b9d4cba58a1bce77b
 2010-08-11 19:35:53 -07:00
Chet Haase
949dbf7629 Fix the build from two breaking changes (update to current.xml and ViewRoot import) 
Change-Id: I987b12f7c5fdd4137faa55405fce99bd6f73fc71
 2010-08-11 18:41:06 -07:00
Adam Powell
0df8bfed3c Merge "Fix bug 2911529" 2010-08-11 18:24:47 -07:00
Dianne Hackborn
fb86ce9307 Add watermark support. 
Use these system properties:

ro.watermark.text
ro.watermark.height
ro.watermark.x
ro.watermark.y
ro.watermark.color
ro.watermark.shadow.radius
ro.watermark.shadow.dx
ro.watermark.shadow.dy
ro.watermark.shadow.color

If ro.watermark.text is not set, no watermark will be shown.  All others
have reasonable defaults if they are not set.

Change-Id: Ibe4a01e6f1c576494ae2462e2688cdfaa8c62cb8
 2010-08-11 18:15:29 -07:00
Mathias Agopian
aa17f00405 am 70a7c92e: am 65f2490e: Merge "should fix sim build, hopefully" into gingerbread 
Merge commit '70a7c92e161225f587af453e01d2b124dbf6303f'

* commit '70a7c92e161225f587af453e01d2b124dbf6303f':
  should fix sim build, hopefully
 2010-08-11 18:07:42 -07:00
Adam Powell
3d3da27ab3 Fix bug 2911529 
Change-Id: I18d7f5d8a300bbc73ef721c5d4deb200d6a490b8
 2010-08-11 18:07:31 -07:00
Jeff Brown
b8244f4705 Merge "resolved conflicts for merge of 4e14159a to master" 2010-08-11 18:05:04 -07:00
Jeff Brown
08965fc730 resolved conflicts for merge of 4e14159a to master 
Change-Id: I42dc1efc2218af326a826aeb16daded71722b363
 2010-08-11 18:00:34 -07:00
Chet Haase
811ed1065f Make Fragments use the new animation APIs 
Change-Id: I3e3c271234c737491b6ae37821f16434f4563b1d
 2010-08-11 17:54:24 -07:00
Mathias Agopian
70a7c92e16 am 65f2490e: Merge "should fix sim build, hopefully" into gingerbread 
Merge commit '65f2490e1baa6eac5905cbc638e69581ebcd8dee' into gingerbread-plus-aosp

* commit '65f2490e1baa6eac5905cbc638e69581ebcd8dee':
  should fix sim build, hopefully
 2010-08-11 17:35:58 -07:00
Mathias Agopian
65f2490e1b Merge "should fix sim build, hopefully" into gingerbread 2010-08-11 17:32:25 -07:00
Mathias Agopian
b59beb5ca6 should fix sim build, hopefully 
Change-Id: I5390bd34dcca36fef43b5169386fff1b04cc842b
 2010-08-11 17:31:33 -07:00
Jeff Brown
4e14159a04 am bb65ae02: Merge "Fix ViewRoot bug attempting to finish synthetic KeyEvents." into gingerbread 
Merge commit 'bb65ae020f802bae3e80dd8e05845fee5d6bc2cb' into gingerbread-plus-aosp

* commit 'bb65ae020f802bae3e80dd8e05845fee5d6bc2cb':
  Fix ViewRoot bug attempting to finish synthetic KeyEvents.
 2010-08-11 17:26:16 -07:00
Adam Powell
943fbb4f40 Merge "ActionBar overlay mode, height fetching, show/hide" 2010-08-11 17:26:10 -07:00
Jeff Brown
bb65ae020f Merge "Fix ViewRoot bug attempting to finish synthetic KeyEvents." into gingerbread 2010-08-11 17:22:17 -07:00
James Dong
c6280bce51 Fix all fd leaks in authoring engine 
Change-Id: I17798543f9dd41cc8bef6f6086e66932f9f97be8
 2010-08-11 17:18:30 -07:00
Romain Guy
73b77af861 Merge "Delete shaders after a compile error. Also disable extra logging." 2010-08-11 16:40:28 -07:00
Romain Guy
98173a277f Delete shaders after a compile error. Also disable extra logging. 
Change-Id: I9b1558b0feac3d9b2cca926feeaf73921664cc73
 2010-08-11 16:40:25 -07:00
Mathias Agopian
a0e28da5ab am 5744cd6a: am 90dc48b1: Merge "call into hwcomposer HAL when present" into gingerbread 
Merge commit '5744cd6ac8308b18d32938ee19ad3c8bb8b0fad5'

* commit '5744cd6ac8308b18d32938ee19ad3c8bb8b0fad5':
  call into hwcomposer HAL when present
 2010-08-11 16:30:13 -07:00
Mathias Agopian
5c9cb3843f am 308e6989: am 24d7050c: Merge "don\'t handle the transparent region of a layer in draw()" into gingerbread 
Merge commit '308e69896c2812953d74ea63fe964bebaa68eef4'

* commit '308e69896c2812953d74ea63fe964bebaa68eef4':
  don't handle the transparent region of a layer in draw()
 2010-08-11 16:30:09 -07:00
Mathias Agopian
ebb7ae51c2 am f7db3e21: am 8e7515d9: Merge "get rid of our LayerVector implementation" into gingerbread 
Merge commit 'f7db3e21ef713d4ff743f2a52837ea3d210bb84f'

* commit 'f7db3e21ef713d4ff743f2a52837ea3d210bb84f':
  get rid of our LayerVector implementation
 2010-08-11 16:30:05 -07:00
Mathias Agopian
5744cd6ac8 am 90dc48b1: Merge "call into hwcomposer HAL when present" into gingerbread 
Merge commit '90dc48b17f673b7e334e3254ea633450f994226c' into gingerbread-plus-aosp

* commit '90dc48b17f673b7e334e3254ea633450f994226c':
  call into hwcomposer HAL when present
 2010-08-11 16:28:21 -07:00
Mathias Agopian
47a740b50f am 801d0b33: am 025822a0: Merge "keep a list of visible sorted surfaces" into gingerbread 
Merge commit '801d0b33e845648866472263263a7001b528c3f4'

* commit '801d0b33e845648866472263263a7001b528c3f4':
  keep a list of visible sorted surfaces
 2010-08-11 16:27:39 -07:00
Mathias Agopian
308e69896c am 24d7050c: Merge "don\'t handle the transparent region of a layer in draw()" into gingerbread 
Merge commit '24d7050ca605804efd5fde03f0d0d8d1d052c247' into gingerbread-plus-aosp

* commit '24d7050ca605804efd5fde03f0d0d8d1d052c247':
  don't handle the transparent region of a layer in draw()
 2010-08-11 16:26:05 -07:00
Mathias Agopian
f7db3e21ef am 8e7515d9: Merge "get rid of our LayerVector implementation" into gingerbread 
Merge commit '8e7515d9c938f5addd08d97bccfccfa976e76c11' into gingerbread-plus-aosp

* commit '8e7515d9c938f5addd08d97bccfccfa976e76c11':
  get rid of our LayerVector implementation
 2010-08-11 16:25:59 -07:00
Mathias Agopian
90dc48b17f Merge "call into hwcomposer HAL when present" into gingerbread 2010-08-11 16:24:46 -07:00
Mathias Agopian
801d0b33e8 am 025822a0: Merge "keep a list of visible sorted surfaces" into gingerbread 
Merge commit '025822a03a09337ec382e708c5a798fe805109ed' into gingerbread-plus-aosp

* commit '025822a03a09337ec382e708c5a798fe805109ed':
  keep a list of visible sorted surfaces
 2010-08-11 16:23:06 -07:00
Jeff Brown
b219a83ff6 am f66f8a58: am 95af0c14: Merge "Add support for the PointerLocation overlay." into gingerbread 
Merge commit 'f66f8a58cc4412bd258e1d5b11cac17a617bdc58'

* commit 'f66f8a58cc4412bd258e1d5b11cac17a617bdc58':
  Add support for the PointerLocation overlay.
 2010-08-11 16:22:47 -07:00
Mathias Agopian
24d7050ca6 Merge "don't handle the transparent region of a layer in draw()" into gingerbread 2010-08-11 16:21:01 -07:00
Mathias Agopian
8e7515d9c9 Merge "get rid of our LayerVector implementation" into gingerbread 2010-08-11 16:20:38 -07:00
Mathias Agopian
025822a03a Merge "keep a list of visible sorted surfaces" into gingerbread 2010-08-11 16:19:16 -07:00
Jeff Brown
f66f8a58cc am 95af0c14: Merge "Add support for the PointerLocation overlay." into gingerbread 
Merge commit '95af0c14a64ef264d2b362ded4ca2b5a169d1066' into gingerbread-plus-aosp

* commit '95af0c14a64ef264d2b362ded4ca2b5a169d1066':
  Add support for the PointerLocation overlay.
 2010-08-11 16:18:36 -07:00
Jeff Brown
92ff1dd835 Fix ViewRoot bug attempting to finish synthetic KeyEvents. 
Bug: 2834068
Change-Id: I34ee0c4479cee36b25a2c3e1cdf5d761b663ac1e
 2010-08-11 16:18:13 -07:00
Adam Powell
6b336f835d ActionBar overlay mode, height fetching, show/hide 
Change-Id: Ie931ed26ec885d891d6733132b517a53d95f8491
 2010-08-11 16:17:57 -07:00
Jeff Brown
95af0c14a6 Merge "Add support for the PointerLocation overlay." into gingerbread 2010-08-11 16:15:48 -07:00
Mathias Agopian
e0d5f5bcf5 call into hwcomposer HAL when present 
Change-Id: I70f31c69a9436a43860e78977442863ecba6d27b
 2010-08-11 16:08:45 -07:00
Mathias Agopian
8514b92bc4 don't handle the transparent region of a layer in draw() 
this is already taken into consideration in computeVisibleRegion
and therefore not needed at draw time.

Change-Id: I3fc7336d22f1147dfcd3a20fd71bf79b946d971f
 2010-08-11 16:05:06 -07:00
Mathias Agopian
1efba9a617 get rid of our LayerVector implementation 
we now use SortedVector<> with a special compare implementation.

Change-Id: I910459cf3b3c8993b55ad0786a8c348369262de5
 2010-08-11 16:05:05 -07:00
Mathias Agopian
ff1d410288 keep a list of visible sorted surfaces 
Change-Id: Ib815eeff894f8a3b1e79fbbf8186d5d91bb60285
 2010-08-11 16:04:51 -07:00
James Dong
7ae08a6d79 Fix a crash due to unnecessary check on the codec config data for H263 video track 
Change-Id: I00e8b65d25731153e4d9be6a443eeed91c8fb605
 2010-08-11 15:58:59 -07:00
Freeman Ng
da4c35b951 Merge "add a Skip option" 2010-08-11 15:48:18 -07:00
Freeman Ng
09dbf18440 add a Skip option 
Change-Id: I21dca8feb1dedc362350c41e95a12463e6e4bc61
 2010-08-11 15:45:01 -07:00
Dianne Hackborn
ed6075943f am 2d8b9fe0: am bd1c082c: Merge "New system property "sys.boot_completed" set to 1 when boot completed." into gingerbread 
Merge commit '2d8b9fe0f9fe44c17ccc4d041f726df490548984'

* commit '2d8b9fe0f9fe44c17ccc4d041f726df490548984':
  New system property "sys.boot_completed" set to 1 when boot completed.
 2010-08-11 15:25:42 -07:00
Dianne Hackborn
2d8b9fe0f9 am bd1c082c: Merge "New system property "sys.boot_completed" set to 1 when boot completed." into gingerbread 
Merge commit 'bd1c082cf90d07e3ccb017b72e59b5ccad81dd07' into gingerbread-plus-aosp

* commit 'bd1c082cf90d07e3ccb017b72e59b5ccad81dd07':
  New system property "sys.boot_completed" set to 1 when boot completed.
 2010-08-11 15:20:34 -07:00
Dianne Hackborn
bd1c082cf9 Merge "New system property "sys.boot_completed" set to 1 when boot completed." into gingerbread 2010-08-11 15:16:01 -07:00