Wink Saville
195306cdec
Merge "Add SM_INIT_CMD."
2012-03-26 17:07:36 -07:00
Fabrice Di Meglio
81e829e02e
Merge "Fix bug #6213159 FocusFinder should be able to take care of Views direction"
2012-03-26 17:06:11 -07:00
Romain Guy
56485fe628
Merge "Use a status_t return type for GL functors"
2012-03-26 16:51:22 -07:00
Scott Main
c2a6299a30
am b7fd60bd: am bd26ba48: Merge "docs: update SDK and AVD Manager strings; update android tool doc and update another AVD manager screenshot and finally change "component" to "package" for SDK manager docs" into ics-mr1
...
* commit 'b7fd60bd3b53871c057721bd6341c8cf65423a64':
2012-03-26 16:48:38 -07:00
Scott Main
7822805f5b
am 72d125eb: am bd26ba48: Merge "docs: update SDK and AVD Manager strings; update android tool doc and update another AVD manager screenshot and finally change "component" to "package" for SDK manager docs" into ics-mr1
...
* commit '72d125eb872f2185dd36ef34d04555dff5eb20f3':
docs: update SDK and AVD Manager strings; update android tool doc and update another AVD manager screenshot and finally change "component" to "package" for SDK manager docs
2012-03-26 16:47:30 -07:00
Scott Main
b7fd60bd3b
am bd26ba48: Merge "docs: update SDK and AVD Manager strings; update android tool doc and update another AVD manager screenshot and finally change "component" to "package" for SDK manager docs" into ics-mr1
...
* commit 'bd26ba4871078aa85024320040de35995e90924b':
docs: update SDK and AVD Manager strings; update android tool doc and update another AVD manager screenshot and finally change "component" to "package" for SDK manager docs
2012-03-26 16:45:15 -07:00
Romain Guy
6554943a1d
Use a status_t return type for GL functors
...
WebView needs more fine-grained control over the behavior of the
framework upon execution of the display lists. The new status_t
allows WebView to requests its functor to be re-executed directly
without causing a redraw of the entire hierarchy.
Change-Id: I97a8141dc5c6eeb6805b6024cc1e76fce07d24cc
2012-03-26 16:45:05 -07:00
Scott Main
72d125eb87
am bd26ba48: Merge "docs: update SDK and AVD Manager strings; update android tool doc and update another AVD manager screenshot and finally change "component" to "package" for SDK manager docs" into ics-mr1
...
* commit 'bd26ba4871078aa85024320040de35995e90924b':
docs: update SDK and AVD Manager strings; update android tool doc and update another AVD manager screenshot and finally change "component" to "package" for SDK manager docs
2012-03-26 16:44:47 -07:00
Scott Main
bd26ba4871
Merge "docs: update SDK and AVD Manager strings; update android tool doc and update another AVD manager screenshot and finally change "component" to "package" for SDK manager docs" into ics-mr1
2012-03-26 16:43:03 -07:00
Daniel Sandler
994c26b2a6
Merge "Turn off logspew."
2012-03-26 16:41:09 -07:00
Daniel Sandler
c1ebee40b6
Turn off logspew.
...
Change-Id: I54757796de109d12649d4b0f74fbd07a6d360bf8
2012-03-26 19:39:46 -04:00
Gilles Debunne
1e130b2abc
Added a unit test for DynamicLayout#updateBlocks
...
Change-Id: I1824ebeae2bbb5c60a65de36fe1696bf003347c9
2012-03-26 16:39:25 -07:00
Gilles Debunne
91889e2c86
Merge "Update to TextView#didTouchFocusSelect documentation"
2012-03-26 16:38:57 -07:00
Colin Cross
6510b6e8a0
move hardware feature definitions
...
Move the hardware feature xml files from frameworks/base/data/etc
to frameworks/native/data/etc.
Change-Id: If7dc9d68c0c57516adb8e863b68c8252abd6014c
2012-03-26 16:28:49 -07:00
Scott Main
a7b1b8c78c
docs: update SDK and AVD Manager strings; update android tool doc
...
and update another AVD manager screenshot
and finally change "component" to "package" for SDK manager docs
Change-Id: Iae7de7c0264d0cdff4fba0920e50e4637bcf90e0
2012-03-26 16:07:49 -07:00
Daniel Lam
ae540b9943
rsdGL uses DummyConsumer
...
Using a DummyConsumer instead of a SurfaceTexture avoids
errors such as BufferQueue has been abandoned due to the SurfaceTexture
going out of scope and disconnecting from the BufferQueue.
Bug: 6172739
Change-Id: I775ead2d0392a68fd0f7e724d6eb25298d2fb00d
2012-03-26 15:11:47 -07:00
Wink Saville
cea056f589
Add SM_INIT_CMD.
...
The enter methods of the initial states are now executed
in response to a message and therefore run in the handler
associated with the StateMachine. Previously these would
run in the thread that start() was called from.
I ran into a problem where in an Activities onCreate I called
StateMachine#start(), which called the default states enter,
which invoked Context#bindService. But bindService never
completed because onCreate hadn't returned. But invoking the
enter methods on the StateMachines handler this problem does
not occur.
Change-Id: I2c2e52e5de29a987c098196a0efdba446cbc29d0
2012-03-26 15:03:16 -07:00
Philip Milne
80e4ee4600
Merge "Fixes for bugs: 6104423, 6103563, 6103509, 6103807 & 6103253."
2012-03-26 14:55:36 -07:00
Scott Main
6b59266b0b
am d87f2262: am af9a26b2: Merge "docs: replace the "Contribute" message with "Design"" into ics-mr1
...
* commit 'd87f2262d84ce6f51967f615704503adaecd3ede':
2012-03-26 14:54:14 -07:00
Scott Main
1139a4f1e0
am 8f16f8bc: am 7fa4a28e: docs: add Coolpad to oem driver list
...
* commit '8f16f8bc7299656c1e3200daa525610ae80a3f22':
2012-03-26 14:54:11 -07:00
Romain Guy
9dcd8c2ab1
Merge "Prevent random crashes on SGX architecture Bug #6219894 "
2012-03-26 14:53:36 -07:00
Romain Guy
a9dd820184
Prevent random crashes on SGX architecture
...
Bug #6219894
Change-Id: If77f29da03e557a50e53bae505e1c638a1dbe2cc
2012-03-26 14:52:00 -07:00
Scott Main
3aba4df731
am 0824035b: am af9a26b2: Merge "docs: replace the "Contribute" message with "Design"" into ics-mr1
...
* commit '0824035b56056abcb64e516ab27f669fc0689681':
docs: replace the "Contribute" message with "Design"
2012-03-26 14:48:20 -07:00
Scott Main
0824035b56
am af9a26b2: Merge "docs: replace the "Contribute" message with "Design"" into ics-mr1
...
* commit 'af9a26b21262500c5f864bcd82bc14ee805fdaac':
docs: replace the "Contribute" message with "Design"
2012-03-26 14:44:15 -07:00
Scott Main
d87f2262d8
am af9a26b2: Merge "docs: replace the "Contribute" message with "Design"" into ics-mr1
...
* commit 'af9a26b21262500c5f864bcd82bc14ee805fdaac':
docs: replace the "Contribute" message with "Design"
2012-03-26 14:43:59 -07:00
Scott Main
af9a26b212
Merge "docs: replace the "Contribute" message with "Design"" into ics-mr1
2012-03-26 14:42:22 -07:00
Scott Main
e5f1f3b828
am 123f828d: am 7fa4a28e: docs: add Coolpad to oem driver list
...
* commit '123f828de0339221f8bd7e24fc4a3764de51c8bb':
docs: add Coolpad to oem driver list
2012-03-26 14:35:29 -07:00
Scott Main
8f16f8bc72
am 7fa4a28e: docs: add Coolpad to oem driver list
...
* commit '7fa4a28e1e37cb66d28dc16b7128da1fba01da0e':
docs: add Coolpad to oem driver list
2012-03-26 14:30:01 -07:00
Scott Main
123f828de0
am 7fa4a28e: docs: add Coolpad to oem driver list
...
* commit '7fa4a28e1e37cb66d28dc16b7128da1fba01da0e':
docs: add Coolpad to oem driver list
2012-03-26 14:29:23 -07:00
Wink Saville
0eee33de15
Merge "Telephony: Remove IccFileHandler from PhoneBase"
2012-03-26 14:28:20 -07:00
Scott Main
f3ebd8ff3f
docs: replace the "Contribute" message with "Design"
...
Change-Id: I38c5990b3b5ee6538197c59671cec7adeadea913
2012-03-26 14:25:01 -07:00
Fabrice Di Meglio
0adcd07ccb
Merge "Improve View layoutDirection resolution"
2012-03-26 14:06:56 -07:00
Alex Yakavenka
12ef0981be
Telephony: Remove IccFileHandler from PhoneBase
...
mIccCard is now be multi-thread safe but other similar
variables such as mIccRecords will be cleaned up in
the future and are no worse than before.
Change-Id: Ic2fc31af2575c2dc0bb30e7348dd9e76ec61e763
2012-03-26 13:57:57 -07:00
Alex Sakhartchouk
5ff1959f95
State based shader recompile to support camera input.
...
Change-Id: Ia6c362571e1b44254461522a8c49a8551b46f28d
2012-03-26 13:52:24 -07:00
Eric Fischer
9d4b8811c1
Merge "Import translations. DO NOT MERGE"
2012-03-26 13:49:52 -07:00
Philip Milne
aac722a9c0
Fixes for bugs: 6104423, 6103563, 6103509, 6103807 & 6103253.
...
Add properties to Java API so as to better mirror the framework's XML API.
I'm not familiar with many of these areas so this CL is worth some scrutiny.
Change-Id: Iff63c43521305efaad5a2189c1b5556d2353cbd4
2012-03-26 13:46:33 -07:00
Daniel Sandler
b2a1c23a55
Add text labels to intruder actions.
...
Change-Id: I544bed7b37c043639ee0e6a11bf757c0a191c1fc
2012-03-26 16:25:21 -04:00
Eric Fischer
966f26e75b
Import translations. DO NOT MERGE
...
Change-Id: I4f9ab5611d594523b15cd15609bc76b4a0d54a87
2012-03-26 13:09:00 -07:00
Colin Cross
73ed17cbaf
Merge "move dumpstate and dumpsys from frameworks/base to frameworks/native"
2012-03-26 12:50:24 -07:00
Colin Cross
1249851540
Merge "stagefright: compile without chromium for pdk builds"
2012-03-26 12:40:52 -07:00
Fabrice Di Meglio
9b0e599120
Merge "Fix View textDirection refresh"
2012-03-26 12:40:35 -07:00
Colin Cross
b347e33daf
move dumpstate and dumpsys from frameworks/base to frameworks/native
...
Change-Id: Ifdff51a974a9ee3c8ee7b04648a45d2f278ce4df
2012-03-26 12:39:38 -07:00
Glenn Kasten
8296628ed8
Merge "mv libcpustats from frameworks/base to /native"
2012-03-26 12:28:38 -07:00
Colin Cross
0821013609
stagefright: compile without chromium for pdk builds
...
Change-Id: I7d85e04fb9f0caa8460a111ca6181bba6f6497ac
2012-03-26 12:24:52 -07:00
Glenn Kasten
30b8a65c5c
mv libcpustats from frameworks/base to /native
...
OK to lose history
Change-Id: I05ce0452f16a396cff6e18db5424492f3a6f6861
2012-03-26 12:22:57 -07:00
Fabrice Di Meglio
827d5c09fb
Fix View textDirection refresh
...
- the refresh was no more done correctly after the use of display lists
Change-Id: I5c74bbe565c603fe2e7fd793dd49c3b20036e04b
2012-03-26 12:15:42 -07:00
Craig Mautner
a2c77053b8
Refactor animation out of WindowState.
...
Remove the animation stepping from WindowState and move it into a new
class, WindowStateAnimator. Update all references to moved variables
in related files.
Change-Id: I7540d8f897b370c73975f3ffe450140861cb0cd1
2012-03-26 12:14:43 -07:00
Scott Main
7fa4a28e1e
docs: add Coolpad to oem driver list
...
Change-Id: I0cb6267a35d9a691c6cacea471a9fca9d5dc61b8
2012-03-26 12:12:24 -07:00
Andreas Huber
b3e2e24f78
Merge "Provisional support for secure decryption of media streams."
2012-03-26 11:43:06 -07:00
James Dong
61bf87428c
Merge "Removed code related to simulator build in TimedEventQueue to get rid of the dependency on jni.h"
2012-03-26 11:41:21 -07:00