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

63113 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nick Pelly
09588f64a2 Fix BasicNfcEeTest java package. 
It was in com.android.nfc_extras, which caused it to get bundled with
com.android.nfc_extras.jar, which caused all kinds of confusion when
trying to push new versions of the test.

It should be in com.android.nfc_extras.tests

Also fix getContext() -> getTargetContext().

Change-Id: I1e3afa150809a3ed8c4f88531f039fe7797aca1d
 2011-12-09 14:35:32 -08:00
Romain Guy
7da48db9c5 Merge "Clip text correctly Bug #5706056" 2011-12-05 11:56:09 -08:00
Romain Guy
8f9a9f61ab Clip text correctly 
Bug #5706056

A newly introduced optimization relied on the display list renderer
to properly measure text to perform fast clipping. The paint used
to measure text needs to have AA and glyph id encoding set to return
the correct results. Unfortunately these properties were set by
the GL renderer and not by the display list renderer. This change
simply sets the properties in the display list renderer instead.

This change also improves the error message printed out when the
application attempts to use a bitmap larger than the max texture
size.

Change-Id: I4d84e1c7d194aed9ad476f69434eaa2c8f3836a8
 2011-12-05 11:53:26 -08:00
Dianne Hackborn
315e468763 am 803caff1: am 003c15d7: Merge "Fix issue #5614559: Registering surface error in..." into ics-mr1 
* commit '803caff1dc307a8895e9f3560112f969fa3f6f39':
  Fix issue #5614559: Registering surface error in...
 2011-12-05 10:45:16 -08:00
Dianne Hackborn
803caff1dc am 003c15d7: Merge "Fix issue #5614559: Registering surface error in..." into ics-mr1 
* commit '003c15d72ccd3856d5abfe6d66a2a40d0eca85bc':
  Fix issue #5614559: Registering surface error in...
 2011-12-05 10:42:51 -08:00
Dianne Hackborn
003c15d72c Merge "Fix issue #5614559: Registering surface error in..." into ics-mr1 2011-12-05 10:40:59 -08:00
Michael Kolb
58915ce922 am 32e914fc: am 277cbe5a: Merge "set System UI visibility based on MediaController state" into ics-mr1 
* commit '32e914fc0366401b896f34d60119f92f625e6973':
  set System UI visibility based on MediaController state
 2011-12-05 09:28:51 -08:00
Michael Kolb
32e914fc03 am 277cbe5a: Merge "set System UI visibility based on MediaController state" into ics-mr1 
* commit '277cbe5a951840558166020568fb1510285e2594':
  set System UI visibility based on MediaController state
 2011-12-05 09:26:21 -08:00
Michael Kolb
277cbe5a95 Merge "set System UI visibility based on MediaController state" into ics-mr1 2011-12-05 09:24:25 -08:00
The Android Open Source Project
0975d53f17 Reconcile with ics-mr1-release 
Change-Id: I35fea7fba390129cec15616718e2880bfa3b414c
 2011-12-05 08:53:06 -08:00
Narayan Kamath
6075e3df8f Merge "Simplify the implementation of AudioPlaybackHandler." 2011-12-05 07:41:59 -08:00
Mathias Agopian
b5119aa774 Merge "fix an issue where invalidate/transactions could be missed" 2011-12-04 00:45:50 -08:00
Jeff Brown
f3a0a60917 Merge "Remove type tests when recycling input events." 2011-12-03 17:35:19 -08:00
Jeff Brown
92cc2d8dc3 Remove type tests when recycling input events. 
Change-Id: I1c2d5980a763c457a0546bbf601e686c601a4c03
 2011-12-03 17:31:17 -08:00
Mathias Agopian
5edbf4f366 fix an issue where invalidate/transactions could be missed 
Change-Id: I84a1fcba1317b2631f5441de7b7ecd12af5ad022
 2011-12-03 14:47:29 -08:00
Dianne Hackborn
61566cc193 Fix issue #5614559: Registering surface error in... 
...Background Replacement on Stingray

This is how I should have done it in the first place.  We get the
new surface from the window manager, and then just copy it in to
the constant Surface object we have for the holder.

Change-Id: I537a9e413829a18f689dfb46687014676b27156e
 2011-12-03 11:16:49 -08:00
Jesse Hall
f1195be710 am a91e54fe: am f57c1388: Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1 
* commit 'a91e54fed6a0690d59c97bab9b081b2614880563':
  SurfaceFlinger: fix layer removal race condition
 2011-12-02 18:35:54 -08:00
Jesse Hall
a91e54fed6 am f57c1388: Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1 
* commit 'f57c1388860486a70cc773f2cfeaa3ea3b38a473':
  SurfaceFlinger: fix layer removal race condition
 2011-12-02 18:33:14 -08:00
Jesse Hall
f57c138886 Merge "SurfaceFlinger: fix layer removal race condition" into ics-mr1 2011-12-02 18:31:03 -08:00
Robert Greenwalt
2a1152ac96 am 00f1ac80: am 2a7b5ab1: Merge "Be careful sharing connections when dun is in play" into ics-mr1 
* commit '00f1ac8001b2bfe2ab70730d9c039ca4e633a2c2':
  Be careful sharing connections when dun is in play
 2011-12-02 17:57:37 -08:00
Gilles Debunne
f240ac99d6 am 0c7e894e: am 2f1e1e4a: Merge "Handle animations in Views\' rectangle clipping methods." into ics-mr1 
* commit '0c7e894e79bea35f979d30e4e3bb6115b102cafd':
  Handle animations in Views' rectangle clipping methods.
 2011-12-02 17:57:31 -08:00
John Reck
4b747570f7 am 6d3e51d4: am 43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1 
* commit '6d3e51d4c453b43b1f1950884c3d08c285d2ce90':
  Fix updateDoubleTapZoom logic
 2011-12-02 17:57:29 -08:00
Mike Lockwood
cab522de85 am 9f3f3c2f: (-s ours) am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1 
* commit '9f3f3c2fbe23a4d9360cffc9975e5cc99f67107e':
  MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
 2011-12-02 17:57:19 -08:00
Mike Lockwood
ec61b5cb12 am 7bbc3c4b: (-s ours) am 7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1 
* commit '7bbc3c4bbe9e542abba2ad30072efb1b25fd9ea2':
  MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
 2011-12-02 17:57:17 -08:00
Chia-chi Yeh
3dd71147db am 939a3dd4: am 25bcbbb5: am 431c3e4c: Merge "Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html" into ics-mr0 
* commit '939a3dd4e7e2282786a8c5270855b611317ad241':
  Documentation for the VPN sample for ICS SDK. Staging server: http://fredchung.i:9999/resources/samples/ToyVpn/index.html
 2011-12-02 17:57:14 -08:00
Jesse Hall
a6062265bd am 54cf27d7: am 6d90c1c6: Merge "Disable GLES20Canvas on emu w/o native GL" into ics-mr1 
* commit '54cf27d7bbe27b1096f5e060c540f07dac07f1d0':
  Disable GLES20Canvas on emu w/o native GL
 2011-12-02 17:57:09 -08:00
Roman Nurik
4ac6d7fae2 am 04bd27eb: (-s ours) am 55347e65: am cd0e446d: Merge "Reduce file size for ADL presentation shareable." into ics-mr0 
* commit '04bd27ebed36d396dfdca0b6c8e6f6b08d8e7e0d':
  Reduce file size for ADL presentation shareable.
 2011-12-02 17:57:07 -08:00
Amith Yamasani
89972657bd am f8dad0b3: am afd01086: Merge "Further volume improvements." into ics-mr1 
* commit 'f8dad0b37d9aa2476ef3ab84b9f4a7a9f4c960e4':
  Further volume improvements.
 2011-12-02 17:49:31 -08:00
Gilles Debunne
97c7bbbba7 am 99019d52: (-s ours) am f96aa3b1: Merge "(de)activating spell check taken into account immediately" into ics-mr1 
* commit '99019d522335690df4c563e1dbe489bf843fe58e':
  (de)activating spell check taken into account immediately
 2011-12-02 17:49:28 -08:00
Robert Greenwalt
00f1ac8001 am 2a7b5ab1: Merge "Be careful sharing connections when dun is in play" into ics-mr1 
* commit '2a7b5ab16af697f386ad7ae346e1bf9229086fa8':
  Be careful sharing connections when dun is in play
 2011-12-02 16:54:04 -08:00
Robert Greenwalt
2a7b5ab16a Merge "Be careful sharing connections when dun is in play" into ics-mr1 2011-12-02 16:52:29 -08:00
Mathias Agopian
77f3e581e6 Merge "fix an issue where updates could starve transactions" 2011-12-02 16:49:06 -08:00
Robert Greenwalt
7cb88dda5b Be careful sharing connections when dun is in play 
A request for a DUN connection should only use the carriers requested dun connection.  Don't
share another connection unless it matches the carriers settings.

bug:5701374
Change-Id: I75a65fcfce1b218bd9ca4ce2ab85cbe850813321
 2011-12-02 16:42:18 -08:00
The Android Automerger
1cfeff393d merge in ics-mr1-release history after reset to ics-mr1 2011-12-02 16:21:23 -08:00
Fabrice Di Meglio
868d1bdf3c Merge "TextLayoutCache Fix compilation issue" 2011-12-02 16:21:14 -08:00
Michael Kolb
c07b678522 set System UI visibility based on MediaController state 
Bug: 5494143

    still doesn't remove the buttons in dimmed state,
    but at least dims them correctly

Change-Id: Idcfc10616d31f6ccf8cd84b706a17d048bf505a1
 2011-12-02 16:12:02 -08:00
Mathias Agopian
21808bb46d fix an issue where updates could starve transactions 
Bug: 5700586
Change-Id: Iaa4adc1a6aea1db6e2943efe4caca1f6cbebfa72
 2011-12-02 16:11:19 -08:00
Fabrice Di Meglio
5448f0378e TextLayoutCache Fix compilation issue 
- fix compilation after refactoring and when setting DEBUG_ADVANCES to 1

Change-Id: I8eef7e3c4550c505325459948d3c8eebbdd5215a
 2011-12-02 15:56:19 -08:00
Siva Velusamy
3d53e57e31 Merge "glestrace: Framework for GLES tracing library" 2011-12-02 15:49:01 -08:00
Gilles Debunne
0c7e894e79 am 2f1e1e4a: Merge "Handle animations in Views\' rectangle clipping methods." into ics-mr1 
* commit '2f1e1e4ab9ca20920d85574317c9d7c9e9e73161':
  Handle animations in Views' rectangle clipping methods.
 2011-12-02 15:31:07 -08:00
Siva Velusamy
db97468fd2 glestrace: Framework for GLES tracing library 
This patch provides a framework for tracing GLES 1.0 and 2.0
functions. It is missing a lot of features, but here are the
things it accomplishes:

- Stop building the glesv2dbg library, and build the
    glestrace library instead.
- Replace the hooks for glesv2dbg with the ones for glestrace.
- Add the basics for the trace library. Currently, this
    traces all GL functions, but not all required data is
    sent for all the functions.  As a result, it will not
    be possible to reconstruct the entire GL state on the
    host side.

The files gltrace.pb.* and gltrace_api.* are both generated
using the tools/genapi.py script.

Change-Id: Id60a468f7278657f008bc6ea1df01f9bdfecfdd3
 2011-12-02 15:30:17 -08:00
Gilles Debunne
2f1e1e4ab9 Merge "Handle animations in Views' rectangle clipping methods." into ics-mr1 2011-12-02 15:28:56 -08:00
John Reck
6d3e51d4c4 am 43bc6b09: Merge "Fix updateDoubleTapZoom logic" into ics-mr1 
* commit '43bc6b094edda6baa8123115a33afaf454525376':
  Fix updateDoubleTapZoom logic
 2011-12-02 14:49:19 -08:00
John Reck
43bc6b094e Merge "Fix updateDoubleTapZoom logic" into ics-mr1 2011-12-02 14:47:04 -08:00
Hong Teng
29f1c32eea am 5126f1d4: am 613ed4c6: Merge "Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, 
* commit '5126f1d413b4fcb0aff5b364e1e5a41c89ca665c':
  Fixd for 5490443 Native crash while exporting a video - Add new onError callback to PreviewProgressListener, which is used to indicate video editor application for the error that has occurred during priviewing. With this modification, the application must implement the onError method, and then VideoEditorPreviewTest.java is changed accordingly.
 2011-12-02 13:44:10 -08:00
Mike Lockwood
9f3f3c2fbe am 1a3ece9f: Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1 
* commit '1a3ece9f871c94eb524543ae618a2a1c88cab2cd':
  MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE
 2011-12-02 13:22:17 -08:00
Mike Lockwood
7bbc3c4bbe am 7f87d9cf: Merge "MTP: Don\'t attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1 
* commit '7f87d9cf666c38b9f43b7b2d99acbd9c8f91d8d1':
  MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE
 2011-12-02 13:22:15 -08:00
Mike Lockwood
1a3ece9f87 Merge "MTP: Add support for restricting PTP to only certain subdirectories of the storage DO NOT MERGE" into ics-mr1 2011-12-02 13:20:49 -08:00
Mike Lockwood
7f87d9cf66 Merge "MTP: Don't attempt to read more than 16K at a time from the MTP driver DO NOT MERGE" into ics-mr1 2011-12-02 13:20:39 -08:00
Jeff Sharkey
7ea817e58d Merge "Move native netd calls to varargs." 2011-12-02 13:19:14 -08:00