Siva Velusamy
b48e029107
Merge "Expose a function to set OpenGL Trace level."
2012-03-12 18:10:19 -07:00
Xia Wang
4b87e4a56c
Merge "Fix test flakiness"
2012-03-12 17:55:18 -07:00
Jeff Sharkey
b8c81768d9
Merge "Let <path-permission> block unprotected providers."
2012-03-12 17:54:33 -07:00
James Dong
b9e8d86b74
Merge "Removed the include header path since it is not needed."
2012-03-12 17:51:05 -07:00
Dianne Hackborn
1743b64d87
Dejank: also animate window moves due to requested size changes.
...
This performance an animation when, for example, a dialog window is
moved because the size of its content has changed.
Change-Id: I2d79a1a57f94e0f2f8ef706a473fca6c9cc637cf
2012-03-12 17:04:43 -07:00
Daniel Lehmann
0e87370077
Remove the country detector logging
...
Bug:6156714
Change-Id: Id0ff60b0530142e2bce055ee8cf8dde94e974aa5
2012-03-12 17:04:17 -07:00
Fabrice Di Meglio
7d9ec65da0
Merge "Fix the build"
2012-03-12 16:44:39 -07:00
Fabrice Di Meglio
8cbc26f0aa
Fix the build
...
- was missing the update to current.txt
Change-Id: I7bbd363f989c3deae071dce60af75a76c9477695
2012-03-12 16:42:37 -07:00
Omari Stephens
3d441a1c4f
Merge "Refactor smoke tests to enable one-app-per-testcase runs"
2012-03-12 16:38:35 -07:00
Irfan Sheriff
90d57dfac3
Improve network avoidance
...
Adds a back-off based technique where the amount of time we wait before
avoiding wi-fi is increased.
This will reduce power consumption on devices that are experiencing high
variance on wi-fi
Change-Id: I40da03edfb5373ddb51056818ca0744dc26a5600
2012-03-12 16:12:55 -07:00
Fabrice Di Meglio
34ba5a0a16
Merge "Make public more RTL APIs"
2012-03-12 16:09:21 -07:00
Andrew Flynn
fafebf85bd
am b0a07985: (-s ours) am 4326da7e: Merge "DO NOT MERGE Fix back button state issue" into ics-scoop
...
* commit 'b0a07985b99308109d8ca8e8758caca7a43c1bb2':
DO NOT MERGE Fix back button state issue
2012-03-12 16:06:36 -07:00
Andrew Flynn
3a67442348
am a443d352: (-s ours) am 53935258: Merge "DO NOT MERGE" into ics-scoop
...
* commit 'a443d3520a3b399daee7504940274e09316fe38c':
DO NOT MERGE
2012-03-12 16:06:29 -07:00
Andrew Flynn
b0a07985b9
am 4326da7e: Merge "DO NOT MERGE Fix back button state issue" into ics-scoop
...
* commit '4326da7e0d5d63bad718e9848294405971f8f9ab':
DO NOT MERGE Fix back button state issue
2012-03-12 16:04:15 -07:00
Andrew Flynn
a443d3520a
am 53935258: Merge "DO NOT MERGE" into ics-scoop
...
* commit '5393525809115fcf5027f292a243ebe34cfbfb7c':
DO NOT MERGE
2012-03-12 16:04:12 -07:00
Wink Saville
a59e1bf6d7
am 752c5db2: am 4f50ff1e: am f4ae6aab: Allow CDMA on LTE devices to get data connections even if otasp is needed.
...
* commit '752c5db2cb0bb4104dbdcd99a5ae1103b650fc66':
2012-03-12 16:02:43 -07:00
Andrew Flynn
4326da7e0d
Merge "DO NOT MERGE Fix back button state issue" into ics-scoop
2012-03-12 16:00:44 -07:00
Andrew Flynn
5393525809
Merge "DO NOT MERGE" into ics-scoop
2012-03-12 16:00:36 -07:00
Wink Saville
33c67dcb23
am 2a0eed20: am 442612a2: am f4ae6aab: Allow CDMA on LTE devices to get data connections even if otasp is needed.
...
* commit '2a0eed20b5828877b2db24bf49468e10c3f1b36b':
Allow CDMA on LTE devices to get data connections even if otasp is needed.
2012-03-12 16:00:09 -07:00
Wink Saville
752c5db2cb
am 4f50ff1e: am f4ae6aab: Allow CDMA on LTE devices to get data connections even if otasp is needed.
...
* commit '4f50ff1ee39cdb3c93d2ef88c0007195765ec1c6':
2012-03-12 15:59:44 -07:00
Wink Saville
2a0eed20b5
am 442612a2: am f4ae6aab: Allow CDMA on LTE devices to get data connections even if otasp is needed.
...
* commit '442612a273981a1b21fdb2e9c19a887ab710224d':
Allow CDMA on LTE devices to get data connections even if otasp is needed.
2012-03-12 15:57:44 -07:00
Glenn Kasten
81916df733
Clean up assertion checks
...
Use ALOG_ASSERT instead of assert.
Use compile-time asserts where appropriate.
Fix typo in an ALOGV.
Change-Id: I58f1c1ffc14319a022c88b5a88b8d0368660da8b
2012-03-12 15:56:50 -07:00
Wink Saville
442612a273
am f4ae6aab: Allow CDMA on LTE devices to get data connections even if otasp is needed.
...
* commit 'f4ae6aabbcefe39b3c85b03729c74044f02369d4':
Allow CDMA on LTE devices to get data connections even if otasp is needed.
2012-03-12 15:54:38 -07:00
Wink Saville
4f50ff1ee3
am f4ae6aab: Allow CDMA on LTE devices to get data connections even if otasp is needed.
...
* commit 'f4ae6aabbcefe39b3c85b03729c74044f02369d4':
Allow CDMA on LTE devices to get data connections even if otasp is needed.
2012-03-12 15:53:52 -07:00
Jeff Brown
ed6aa3da03
Merge "Fix potential NPE in SQLiteProgram."
2012-03-12 15:53:33 -07:00
Glenn Kasten
4d367c54d1
Merge "MediaPlayer doc for setDataSource by file pathname"
2012-03-12 15:52:54 -07:00
Chet Haase
81a0647c30
Merge "Handle view properties at the native level"
2012-03-12 15:48:32 -07:00
Fabrice Di Meglio
25ba197fa7
Make public more RTL APIs
...
- LocaleUtil will help developers to get the layout direction from a Locale
Change-Id: I184ebcc9c208464b20f0454e7a915426640c74f0
2012-03-12 15:44:15 -07:00
Chet Haase
a1cff5043d
Handle view properties at the native level
...
Basic functionality of handling View properties (transforms,
left/right/top/bottom, and alpha) at the native DisplayList level.
This logic is disabled for now (via compile-time flags in View.java and
DisplayListRenderer.h) as we continue work on it (there is no advantage
to the new approach until we optimize invalidation and rendering paths
to use the new code path).
Change-Id: I370c8d21fbd291be415f55515ab8dced6f6d51a3
2012-03-12 15:41:48 -07:00
Jeff Brown
b2679481b5
Fix potential NPE in SQLiteProgram.
...
Bug: 6122537
Change-Id: I76a12f58f08b708065dfdd11c78f54701d90873b
2012-03-12 15:35:28 -07:00
Michael Jurka
d0e46d8820
DO NOT MERGE Fix back button state issue
...
Back button / down chevron button (eg when you have an IME visible)
was not getting synced on rotation changes
Bug: 6133831
Change-Id: Iefaf3babf92898fcc87a0b14c10b037de04d84e2
2012-03-12 15:28:53 -07:00
Dianne Hackborn
035c20f5b4
Merge "Add new READ_EXTERNAL_STORAGE permission."
2012-03-12 15:26:46 -07:00
Omari Stephens
5ae3dfe59d
Refactor smoke tests to enable one-app-per-testcase runs
...
Also creates a special TestRunner which runs one app per testcase. Note that
running the smoke tests with android.test.InstrumentationTestRunner will /also/
work, but will run all of the launchable activites in a single testcase called
testRunAllActivities.
Bug: 6128185
Change-Id: Iffedff7e6105bbca614778a4d294d3be421f19d6
2012-03-12 15:26:11 -07:00
Eric Fischer
bdc5afeee5
Merge "Import translations. DO NOT MERGE"
2012-03-12 15:17:37 -07:00
Daniel Sandler
ea193cebef
DO NOT MERGE
...
System bar now renders the back button for recents
We used to render the back button in Recents
itself, but that had an inconsistent visual
experience.
As a part of this change, add the early beginning
of support for private status bar APIs for dimming
navigation buttons.
Bug: 3448536
Change-Id: Ie64369e3df3178178f35b56763ea96d380b6ddd4
2012-03-12 15:16:29 -07:00
Glenn Kasten
9779e9f5ac
Inline applyVolume() into threadLoop_mix()
...
Also the declaration of applyVolume in PlaybackThread was dead.
Change-Id: I4b1a9848d07d3d7f340baea05b17f667c78df868
2012-03-12 15:14:24 -07:00
Dianne Hackborn
7924512aa1
Add new READ_EXTERNAL_STORAGE permission.
...
Also adds some initial compatibility code for dealing with it.
Change-Id: I104bff11798349e4aaa6da9b7be787b257daa1bb
2012-03-12 15:07:31 -07:00
Glenn Kasten
80515d2adf
Merge "Remove unnecessary friend declarations"
2012-03-12 15:05:51 -07:00
Glenn Kasten
db9c21e754
Merge "Remove virtual from methods that don't need it"
2012-03-12 15:05:21 -07:00
Andreas Huber
b8f8809472
Merge "Documentation/API update for MediaCodec/MediaExtractor, fixes to MediaCodec."
2012-03-12 15:03:26 -07:00
Romain Guy
a007b7c39b
Merge "Don't allocate new typefaces when not needed."
2012-03-12 14:56:10 -07:00
Romain Guy
4692669899
Don't allocate new typefaces when not needed.
...
The Typeface.create(Typeface, int) API can be used to create a new
typeface derived from an existing typeface. The implementation would
however create a new Typeface instance on every call, creating
unnecessary garbage in text-heavy applications. This changelist
adds a small cache of derived typefaces to avoid allocations whenever
possible.
Change-Id: Ib7290b3183e372aae12cf66033690e15cd4d0691
2012-03-12 14:54:01 -07:00
George Mount
0fe3c9aa2f
Merge "Remove Logs inadvertently added to AutoCompletePopup."
2012-03-12 14:53:48 -07:00
Fabrice Di Meglio
25182b8af9
Merge "Improve View Javadoc for padding"
2012-03-12 14:51:55 -07:00
Andreas Huber
c52b980277
Documentation/API update for MediaCodec/MediaExtractor, fixes to MediaCodec.
...
and MediaExtractor.readSampleData now works with a non-direct byte buffer.
Change-Id: Ifbe5c152d9550c34d3b1d493e12a223eb98e8b4e
2012-03-12 14:49:43 -07:00
James Dong
1b5fa0f811
Removed the include header path since it is not needed.
...
o related-to-bug: 6044894
Change-Id: I15aec441dc0c75804aa33fc3e7ef977f7490922d
2012-03-12 14:46:41 -07:00
Eric Fischer
e7ee9a0504
Import translations. DO NOT MERGE
...
Change-Id: I183552feb00f1764db73bf6c7f16d5f5ef0f3b0f
2012-03-12 14:45:39 -07:00
Stephen Hines
3c4b03d484
Merge "Fix argument passing with dimLOD."
2012-03-12 14:45:32 -07:00
Stephen Hines
d091526841
Fix argument passing with dimLOD.
...
BUG=6152130
Change-Id: I5c857b692af8ec45e4cbef8140c44d72aec6600e
2012-03-12 14:42:05 -07:00
Eric Fischer
dd4a464741
Merge "Import translations. DO NOT MERGE"
2012-03-12 14:30:43 -07:00