Adam Powell
0006864852
Merge "Action bar work for phones"
2011-04-25 17:44:22 -07:00
Mike Lockwood
8a10d516ee
Merge "MTP: Implement GetThumb command"
2011-04-25 17:42:39 -07:00
Adam Powell
a3a953253f
Merge "Only set the accelerated drawable state for views when the hardware renderer is available."
2011-04-25 17:19:59 -07:00
Jamie Gennis
6c847f4052
Merge "EGL: Allow creating a SurfaceTexture EGLSurface."
2011-04-25 17:00:19 -07:00
Mathias Agopian
29e6c48cd1
Merge "libgui: Fix the tests so they build."
2011-04-25 16:58:01 -07:00
Jamie Gennis
1b528fb9d8
EGL: Allow creating a SurfaceTexture EGLSurface.
...
This change removes the check that disallowed the creation of an
EGLSurface that would send frames to a SurfaceTexture.
Change-Id: I44c6d5df503cc676a88144d72d39b414692ce4c9
2011-04-25 16:41:11 -07:00
Jamie Gennis
fc850124b3
libgui: Fix the tests so they build.
...
Change-Id: I7205b0819e5801ac549109ff562c3ab1b113d176
2011-04-25 16:40:05 -07:00
Robert Greenwalt
b7f462b9f7
Merge "Make new networkAttribute parameter non-optional." into honeycomb-LTE
2011-04-25 16:19:30 -07:00
Mathias Agopian
92cf0ce426
Merge "Add some basic STL compatibility to Vector<>"
2011-04-25 15:29:40 -07:00
Mathias Agopian
e60e1fd23d
Add some basic STL compatibility to Vector<>
...
Change-Id: Iaf72623170ee415372c7989d7ba9ff627167449e
2011-04-25 15:28:17 -07:00
Robert Greenwalt
fe7b45477e
Merge "Expose more net types to the public."
2011-04-25 15:05:24 -07:00
Chet Haase
8a4ccee8db
Merge "Minor cleanup in GLrenderer code"
2011-04-25 14:51:48 -07:00
Mike Lockwood
79d22dfda7
Merge "MTP: Fix file descriptor leak in file editing extensions"
2011-04-25 13:37:44 -07:00
Jean-Baptiste Queru
26603203b6
Merge "Re-assingning local variable if mStringBlocks was initialized here. NPE is thrown otherwise."
2011-04-25 13:33:37 -07:00
Chet Haase
8e28b0534f
Merge "Fix bitfield bug with vertex shader selection"
2011-04-25 12:56:34 -07:00
James Dong
65fcadccbf
Merge "Return status code from invoke()"
2011-04-25 10:21:43 -07:00
Mike Lockwood
08dfde760f
Merge "MediaScanner: reimplement the ".nomedia" feature for hiding files from the media provider"
2011-04-25 09:52:26 -07:00
Mike Lockwood
e757212c0d
Merge "Remove log spam"
2011-04-25 09:52:10 -07:00
Eino-Ville Talvala
44e301faf5
Merge "Clarify the meaning of weight in the focus and metering area HAL."
2011-04-25 09:39:28 -07:00
Brian Carlstrom
43fb20dfb6
Merge "Expose Credentials.UNLOCK_ACTION for callers that want to use startActivityForResult"
2011-04-23 21:01:35 -07:00
Mike Lockwood
57a2c88f6f
Merge "Revert "Remove permission android.permission.WRITE_MEDIA_STORAGE""
2011-04-23 08:56:11 -07:00
Mike Lockwood
5ec0d0e5d5
Merge "MTP: Add extended operations to support in-place editing of files"
2011-04-23 08:55:59 -07:00
Svetoslav Ganov
fbc2fae31e
Merge "Touch exploration feature, event bubling, refactor"
2011-04-22 18:33:09 -07:00
David Li
086d075258
Merge "GLES2Dbg: noop - format & comment"
2011-04-22 18:22:40 -07:00
Adam Powell
f1c85cde0e
Merge "Revert "Touch exploration feature, event bubling, refactor""
2011-04-22 17:30:46 -07:00
Joe Fernandez
798024df38
am 7f90b316: am 41f665a5: am c84362a7: am a29e2cca: docs: Fixing Issue with code for Adding Tabs topic bug 4293013
...
* commit '7f90b316b6731b6e8beb3babe71088d0d8bd3a57':
docs: Fixing Issue with code for Adding Tabs topic bug 4293013
2011-04-22 17:30:10 -07:00
Freeman Ng
c7b130ee41
am 1e2e390f: am 3b9089c1: new LTE prepay related values
...
* commit '1e2e390fc715ef0aa264f4706fabde1a157668fc':
new LTE prepay related values
2011-04-22 17:29:51 -07:00
Jason Sams
86278771cd
Merge "Add matrix logging."
2011-04-22 16:56:49 -07:00
Fabrice Di Meglio
d74291bc18
Merge "Clean getTextRunAdvances() APIs"
2011-04-22 16:54:37 -07:00
Joe Fernandez
7b339d2592
am 41f665a5: am c84362a7: am a29e2cca: docs: Fixing Issue with code for Adding Tabs topic bug 4293013
...
* commit '41f665a5f9d4e73ba8dabceb721c9c8873591bac':
docs: Fixing Issue with code for Adding Tabs topic bug 4293013
2011-04-22 16:48:44 -07:00
Freeman Ng
62bc73e09e
am 3b9089c1: new LTE prepay related values
...
* commit '3b9089c1fa6970974fa5234dfea46455811c8c7a':
new LTE prepay related values
2011-04-22 16:46:52 -07:00
Joe Fernandez
7d6a9fb6e2
am c84362a7: am a29e2cca: docs: Fixing Issue with code for Adding Tabs topic bug 4293013
...
* commit 'c84362a72ab958c4ffe34c16d8cf76883d48f0e8':
docs: Fixing Issue with code for Adding Tabs topic bug 4293013
2011-04-22 16:46:37 -07:00
Adam Powell
6b59c8b357
Merge "Framework: fixed bug in multiselectlistpreference."
2011-04-22 16:46:10 -07:00
Joe Fernandez
0582a8bc1f
am a29e2cca: docs: Fixing Issue with code for Adding Tabs topic bug 4293013
...
* commit 'a29e2cca5d0e3ff222c09165fd69ca8f4d0f634e':
docs: Fixing Issue with code for Adding Tabs topic bug 4293013
2011-04-22 16:36:33 -07:00
Svetoslav Ganov
b61224d576
Merge "Touch exploration feature, event bubling, refactor"
2011-04-22 16:29:07 -07:00
Adam Powell
944c7ac1d3
Merge "Fix a bug when showing the menu panel with an action bar/menu items present."
2011-04-22 15:43:21 -07:00
Jason Sams
e21ae62aff
Merge "Fix rsRand(float, float)"
2011-04-22 15:29:22 -07:00
Gilles Debunne
1dba0e24e9
Merge "Refactoring in TextViews' handles"
2011-04-22 14:42:55 -07:00
Alex Sakhartchouk
4c10fa1378
Merge "sped up the ui in image processing test app"
2011-04-22 13:52:32 -07:00
Eric Fischer
e1292217e5
Merge "Import revised translations."
2011-04-22 12:31:02 -07:00
hongteng
54d9706e70
Merge "Fix for issue 3385135 "source code cleanup" engine part - remove the unused header files"
2011-04-22 12:28:39 -07:00
Dianne Hackborn
2182a9f00b
Merge "Start work on simulating landscape/portrait when orientation is locked."
2011-04-22 11:37:25 -07:00
Brian Carlstrom
6c3ae9d44d
Merge "Adding KeyChain API and IKeyChainService"
2011-04-22 11:29:28 -07:00
Josh Stone
e6b21626a5
libutils: Fix an improper const-cast in RefBase
...
Under Fedora 15 Beta, gcc 4.6.0 warns:
frameworks/base/libs/utils/RefBase.cpp: In member function
‘void android::RefBase::weakref_type::trackMe(bool, bool)’:
frameworks/base/libs/utils/RefBase.cpp:483:67: error: passing
‘const android::RefBase::weakref_impl’ as ‘this’ argument of
‘void android::RefBase::weakref_impl::trackMe(bool, bool)’
discards qualifiers [-fpermissive]
trackMe is not a const function, so don't use const in the static_cast
to a weakref_impl pointer.
Change-Id: I3c9ba73eb127985f5f54197ffecf2939c50f632c
2011-04-22 11:13:35 -07:00
Shyam Pallapothu
b673d90aa6
Merge "Fix for issue 4133431 "Remove OSAL layer" in JNI part"
2011-04-21 19:59:17 -07:00
Scott Main
9adbcb8271
am 66140cc1: am a2c180a0: am caf60ebd: am 48c187f9: docs: fix typo in 3.0 notes
...
* commit '66140cc1eadce6de4370d1078172e1a7eca6b919':
docs: fix typo in 3.0 notes
2011-04-21 17:43:52 -07:00
Scott Main
b2b2227c12
am a2c180a0: am caf60ebd: am 48c187f9: docs: fix typo in 3.0 notes
...
* commit 'a2c180a0dde842d76d75c8b22ee7db29b482757e':
docs: fix typo in 3.0 notes
2011-04-21 17:42:25 -07:00
Scott Main
caeae23123
am caf60ebd: am 48c187f9: docs: fix typo in 3.0 notes
...
* commit 'caf60ebdbdf9769624f17395aabac4cf11ee130d':
docs: fix typo in 3.0 notes
2011-04-21 17:39:30 -07:00
Scott Main
b724172599
am 48c187f9: docs: fix typo in 3.0 notes
...
* commit '48c187f9cf2bcb51f446a5a62346f9ef5920c7f3':
docs: fix typo in 3.0 notes
2011-04-21 17:36:40 -07:00
Dianne Hackborn
514515f5c1
Merge "Fix bug in deciding which rotation to use for an orientation."
2011-04-21 17:34:22 -07:00