Roman Nurik
da03387dc8
am 0a97435c: Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack." into gingerbread
...
* commit '0a97435c8d776746bb3dcf16824e2cc81eee20aa':
Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack.
2010-12-13 19:15:28 -08:00
Roman Nurik
992b150891
Merge "Update icon guidelines for Gingerbread. Also add new, revamped icon templates pack." into gingerbread
2010-12-13 19:12:42 -08:00
Jeff Brown
5b57dd6493
Merge "Make framework modifier key handling more precise."
2010-12-13 18:33:00 -08:00
Romain Guy
c6eb6e5854
Merge "Refactor OpenGLRenderer to simplify OpenGL drawing code."
2010-12-13 18:30:15 -08:00
Xavier Ducrohet
ecc699b80a
Merge "LayoutLib: implement more of Canvas/Paint."
2010-12-13 18:24:11 -08:00
Gilles Debunne
b0f0fb8b33
Merge "setTextIsSelectable documentation updated."
2010-12-13 18:11:51 -08:00
Adam Powell
b847db0efb
Merge "Fix bug 3281956 - Cherry-picked from GB"
2010-12-13 18:06:00 -08:00
Jaikumar Ganesh
1182c70f3f
Merge "Remove delay with auto connection."
2010-12-13 16:49:50 -08:00
Mathias Agopian
dd17b3eaa9
fix [3176642] Camera preview turns completely black for multiple toggles between camera and camcorder app
...
There was a leak of Surface tokens when a surface was detached from a UserClient.
We now always detach a surface from its client before attaching to the new one,
this guarantees that its token is freed.
Change-Id: Icfad0b16286ed58155bdfafdf36ab161440aa485
2010-12-13 16:49:05 -08:00
Scott Main
bdc5c4631e
Merge "docs: remove getting started guide for preview"
2010-12-13 16:48:43 -08:00
Mathias Agopian
455d18d4c2
minor clean-up. SurfaceFlinger doesn't need libpixelflinger.so.
...
Change-Id: I3bdca74351c8e480a05084bc412a96c5f685221d
2010-12-13 16:47:31 -08:00
Chet Haase
2f0346d46d
Merge "Fix artifact with concurrent add/remove LayoutTransitions"
2010-12-13 16:47:00 -08:00
Brad Fitzpatrick
fcf8fc7564
am 2d5b11ab: am 0927c902: Merge "Fix StrictMode javadoc copy/paste error." into gingerbread
...
* commit '2d5b11aba0fec21e1ce3f358eb0d280b62704899':
Fix StrictMode javadoc copy/paste error.
2010-12-13 16:30:17 -08:00
Nick Kralevich
43ec91762b
am 30ad1e57: am 9dbef975: Merge "Avoid leaking sockets." into gingerbread
...
* commit '30ad1e576a445b8ffec12ef148f5d7253ebb6ef4':
Avoid leaking sockets.
2010-12-13 16:30:10 -08:00
Dianne Hackborn
3c4fe4b1f3
Merge "resolved conflicts for merge of 78e9f4cb to master"
2010-12-13 16:28:01 -08:00
Brad Fitzpatrick
9336c2b4bf
am 0927c902: Merge "Fix StrictMode javadoc copy/paste error." into gingerbread
...
* commit '0927c9026537166cec36b2f9bb8a764ef8a7c606':
Fix StrictMode javadoc copy/paste error.
2010-12-13 15:27:25 -08:00
Brad Fitzpatrick
7ed1f656a6
Merge "Fix StrictMode javadoc copy/paste error." into gingerbread
2010-12-13 15:25:09 -08:00
Alex Sakhartchouk
9ed3d102b5
Merge "Perf test"
2010-12-13 15:24:20 -08:00
Nick Kralevich
82a2c8230a
am 9dbef975: Merge "Avoid leaking sockets." into gingerbread
...
* commit '9dbef975f0f4370dfe48a0fb040e3d8d1eb91d87':
Avoid leaking sockets.
2010-12-13 15:05:20 -08:00
Nick Kralevich
7fcd6df049
Merge "Avoid leaking sockets." into gingerbread
2010-12-13 15:03:28 -08:00
Dianne Hackborn
aa8de55632
resolved conflicts for merge of 78e9f4cb to master
...
Change-Id: I1135361e6d66f524c3f349e2bf1f31bd4191c634
2010-12-13 14:55:25 -08:00
Romain Guy
ed8e999604
Merge "Improve error detection in HardwareRenderer.draw(). Bug #3280872 "
2010-12-13 14:43:41 -08:00
Dianne Hackborn
b8083135a8
am e4a59519: Fix issue #3154576 : battery stats checkin should include UID -> packages+ map
...
* commit 'e4a5951925f16f18dae91ed65567e96528f17fee':
Fix issue #3154576 : battery stats checkin should include UID -> packages+ map
2010-12-13 14:37:09 -08:00
Brian Carlstrom
c690807777
Merge "Update API for CopyOnWriteArrayList "synchronized" changes"
2010-12-13 14:30:39 -08:00
Jim Miller
7c63fbd0a6
Merge "Fix 3253629: Improve Recents panel animation performance."
2010-12-13 14:28:17 -08:00
Louis Huemiller
10623cdf3f
Merge "Hardware Composer Stress Test Enhancements"
2010-12-13 14:17:23 -08:00
Mike Lockwood
cc5c8edf2d
Merge "PowerManager: remove unused import"
2010-12-13 13:54:09 -08:00
Jaikumar Ganesh
57487d2a1d
Merge "Add direct calls to Bluez to add SDP records."
2010-12-13 13:42:42 -08:00
Leon Scroggins
b7346f2d8e
Merge "Use black text on white background for dropdowns."
2010-12-13 13:24:42 -08:00
Louis Huemiller
b526594d84
Hardware Composer Stress Test Enhancements
...
Enhancements include:
+ Change default delay after each set operation
from 0.1 to 0.0 seconds. This significantly
increases the default rate at which operations
are performed.
+ Make sourceCrop to displayFrame scale
factor of 1.0 a frequent occurance.
+ Enable use of RGB888 and YV12 graphic formats.
+ Add initCheck() call after creation of a
GraphicBuffer, to confirm it was created
without any errors.
Change-Id: I1606dff3924a23bdd5cb27ba302bebb4f200d768
2010-12-13 13:19:13 -08:00
Jean-Baptiste Queru
24113ce93a
am 6d13b146: am e78a0009: resolved conflicts for merge of 4b94c451 to stage-korg-master
...
* commit '6d13b146e0444f40f45b9fe5812093c5e611b68e':
Added dropbox broadcast notification
2010-12-13 13:12:36 -08:00
Jean-Baptiste Queru
b7f42b567b
am e78a0009: resolved conflicts for merge of 4b94c451 to stage-korg-master
...
* commit 'e78a000955c283509ee8a21b8b7e448060ac8dd8':
Added dropbox broadcast notification
2010-12-13 13:10:23 -08:00
Jean-Baptiste Queru
fae89a5076
resolved conflicts for merge of 4b94c451 to stage-korg-master
...
Change-Id: I07b974f96ca598677e58623050e4668822e68f23
2010-12-13 13:06:13 -08:00
Brandon Keely
48eca4c4dc
Merge "Massaging system transitions."
2010-12-13 13:04:00 -08:00
Leon Scroggins
a9b6e1255c
Merge "Do not loop forever."
2010-12-13 13:02:39 -08:00
Mike Lockwood
3628bb7912
Merge "MediaScanner: No longer delete playlist files that have no valid entries"
2010-12-13 12:39:28 -08:00
Jean-Baptiste Queru
3436320d8f
Merge "Added dropbox broadcast notification"
2010-12-13 12:34:48 -08:00
Martijn Coenen
2ec468aeca
am 6c247164: am e3f6336b: Fixed API for active NDEF reading and NDEF formatting.
...
* commit '6c2471649b5b1d1d9c19305a43676161823b623a':
Fixed API for active NDEF reading and NDEF formatting.
2010-12-13 12:31:46 -08:00
Jeff Hamilton
d903968200
am 80c78a89: am 641dd621: First pass at advanced NFC tag dispatching APIs and other cleanup.
...
* commit '80c78a896f32461513b9750fc2869cd6b2795888':
First pass at advanced NFC tag dispatching APIs and other cleanup.
2010-12-13 12:31:38 -08:00
Martijn Coenen
ab72ab5d43
am 41e74b99: am b79173f6: Changed technology close() to reconnect to the tag instead of physical disconnect.
...
* commit '41e74b991bc50bfa16ba920e998c76a88aa8ae69':
Changed technology close() to reconnect to the tag instead of physical disconnect.
2010-12-13 12:31:29 -08:00
Martijn Coenen
3f9cdfbc1b
am 2019f533: am fc5a3b6c: Changed transceive on all technologies to "raw", except for Mifare classes.
...
* commit '2019f53396f5b45a307cc4b24123eb19b9a5246f':
Changed transceive on all technologies to "raw", except for Mifare classes.
2010-12-13 12:31:23 -08:00
Martijn Coenen
5609645bf6
am 25556f66: am 3300e4c3: Implemented isWritable() to indicate NDEF capability container r/w state.
...
* commit '25556f666934c72ca53ad0f309078e3d4bd29ca9':
Implemented isWritable() to indicate NDEF capability container r/w state.
2010-12-13 12:31:10 -08:00
Kenny Root
ce8885f91b
Merge "Introduce NDK API for 64-bit assets"
2010-12-13 12:29:06 -08:00
Nick Pelly
f4ac8d5680
Merge "resolved conflicts for merge of 1d0d1188 to master"
2010-12-13 12:25:22 -08:00
Nick Pelly
1b7179d7e4
resolved conflicts for merge of 1d0d1188 to master
...
Change-Id: I80413d5a54a0284ab6f685c4c6197a2c009ea717
2010-12-13 12:22:34 -08:00
Xavier Ducrohet
4cad7c4d73
Merge "LayoutLib: parsed resources were always set as platform res."
2010-12-13 11:35:42 -08:00
Adam Powell
be698aee04
Merge "Update bg drawable properly on ActionBars based on earlier changes"
2010-12-13 10:52:04 -08:00
Adam Powell
780cc56dc5
Merge "Smooth out gesture zooming in WebViews."
2010-12-13 10:47:07 -08:00
James Dong
ef23868431
Merge "Revert "Allows the authoring engine to skip frame.""
2010-12-13 10:33:33 -08:00
Patrick Scott
8cbaea43b8
Merge "Suppress scrollbars during layer fling."
2010-12-13 09:30:27 -08:00