Joe Fernandez
eed0b7dfd3
am e2b98cf3: am c6e3f6f1: am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1
...
* commit 'e2b98cf359c82a2c4181c1d9cd1d9130bd96be66':
2012-02-23 18:49:41 -08:00
Xavier Ducrohet
3c261d3f16
am 54c8c3d9: (-s ours) am b3c780f1: am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.
...
* commit '54c8c3d920ee863716638483602a011943da6484':
Move the automatic namespace outside of the res namespace. do not merge.
2012-02-23 18:47:08 -08:00
inazaruk
95ef87a7ee
am 85eb3f0a: (-s ours) am 9694910e: am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
...
* commit '85eb3f0af00aa35cceebbf162de4434418bf5a84':
Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
2012-02-23 18:47:06 -08:00
Joe Fernandez
e2b98cf359
am c6e3f6f1: am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1
...
* commit 'c6e3f6f1a758a91d486cbcebb8241f8413c6e770':
2012-02-23 18:45:51 -08:00
Xavier Ducrohet
54c8c3d920
am b3c780f1: am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.
...
* commit 'b3c780f16c37d2fb41a4eb211ea062b4c0b4e366':
Move the automatic namespace outside of the res namespace. do not merge.
2012-02-23 18:44:16 -08:00
inazaruk
85eb3f0af0
am 9694910e: am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
...
* commit '9694910e17a18c307e61811284f88a26db2bfbae':
Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
2012-02-23 18:44:14 -08:00
Xavier Ducrohet
b3c780f16c
am 816b873d: Move the automatic namespace outside of the res namespace. do not merge.
...
* commit '816b873df1ab98d0e79913cf589b7b1fbaf14e85':
Move the automatic namespace outside of the res namespace. do not merge.
2012-02-23 18:42:01 -08:00
inazaruk
9694910e17
am eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
...
* commit 'eed8d0b3af8e76d6146ce4ed3fbe6ef7e172c8cd':
Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
2012-02-23 18:41:54 -08:00
Jason Sams
4344b72484
Merge "More RS cpp binding work. All classes for compute should be partially implemented at this time."
2012-02-23 18:20:00 -08:00
Xavier Ducrohet
816b873df1
Move the automatic namespace outside of the res namespace. do not merge.
...
(cherry picked from commit d9fe8018ff )
Change-Id: I48ca78d5fccc75392b3f1cf9525890e5145293c4
2012-02-23 18:10:20 -08:00
inazaruk
eed8d0b3af
Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
...
Added support for predefined namespace http://schemas.android.com/apk/res/auto
that aapt tool recognizes and treats as namespace with package name
taken from current application's AndroidManifest.xml, //manifest/package attribute.
Signed-off-by: inazaruk <ievgenii.nazaruk@gmail.com >
(cherry picked from commit e348909c19 )
Change-Id: I4bff836c42a309bac36e5d1ce1899131b3c4c194
2012-02-23 18:09:31 -08:00
Xavier Ducrohet
c97a2b6ed4
Merge "Move the automatic namespace outside of the res namespace."
2012-02-23 18:08:13 -08:00
Jason Sams
170dc848ae
More RS cpp binding work. All classes for
...
compute should be partially implemented at this time.
Change-Id: Iddf9405cc69513b708975d20783395f0be04c680
2012-02-23 17:14:39 -08:00
Romain Guy
34c55d3085
Merge "Only recreate path textures when necessary"
2012-02-23 17:11:49 -08:00
Romain Guy
4bcb7467a1
Only recreate path textures when necessary
...
When a drawPath command is recorded in a display list, a copy of the
source path is made to preserve against possible modifications of the
said source path. Copies are discarded when a display list is cleared,
which usually happens on invalidate(). This means that even if a path
is never modified, the texture generated to draw it on screen is
destroyed every time an invalidate() is issued. This change fixes this
problem by introducing a reference to the source path in the copy.
If both the copy and the source path have the same genID, they are
the same path and can share the same texture.
Change-Id: I34849311c183e06336a1391d2d1568a087f973f6
2012-02-23 17:08:38 -08:00
Xavier Ducrohet
d9fe8018ff
Move the automatic namespace outside of the res namespace.
...
Change-Id: I107ee94af0a13f008ef4a8844a9038b84f97a247
2012-02-23 16:59:27 -08:00
Alex Sakhartchouk
5d3bc7d3e4
Merge "Adding a few more howto elements to scenegraph example."
2012-02-23 16:57:00 -08:00
George Mount
583e885bef
Merge "Add javascript key events for special characters."
2012-02-23 14:43:02 -08:00
Joe Fernandez
a83a6b3ce8
am fad35e3b: am 53c0d46d: am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1
...
* commit 'fad35e3b9190c25700c62cc1c4b3d369f5d42a60':
docs: NDK overview, remove x86 instruction set mention (b/6044027)
2012-02-23 14:31:38 -08:00
Joe Fernandez
fad35e3b91
am 53c0d46d: am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1
...
* commit '53c0d46d85a651093382a92466b0b0658ef1920c':
docs: NDK overview, remove x86 instruction set mention (b/6044027)
2012-02-23 14:28:07 -08:00
Joe Fernandez
53c0d46d85
am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1
...
* commit '566328a2a5fcd8c40fc67d8974d6df0df48b0056':
docs: NDK overview, remove x86 instruction set mention (b/6044027)
2012-02-23 14:25:01 -08:00
Joe Fernandez
c6e3f6f1a7
am 566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1
...
* commit '566328a2a5fcd8c40fc67d8974d6df0df48b0056':
docs: NDK overview, remove x86 instruction set mention (b/6044027)
2012-02-23 14:24:53 -08:00
Joe Fernandez
566328a2a5
Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1
2012-02-23 14:22:41 -08:00
Jason Sams
a23c4ebe04
Merge "start new headers"
2012-02-23 14:19:43 -08:00
James Dong
b8c247bde9
Merge "Fix memory leakage due to unreleased MuxOMX objects after disconnection"
2012-02-23 14:17:39 -08:00
James Dong
ca88e35764
Fix memory leakage due to unreleased MuxOMX objects after disconnection
...
o related-to-bug: 5984232
Change-Id: I20cbeff6ae865e995d02342549f1e09320543740
2012-02-23 14:04:20 -08:00
Romain Guy
1ea55cf3c7
Merge "Perform early intersect to avoid unnecessary draws"
2012-02-23 13:53:47 -08:00
Romain Guy
cfef12374c
Perform early intersect to avoid unnecessary draws
...
Change-Id: I48d61c4488e622f93733d8e53a50c93e6a20166d
2012-02-23 13:50:37 -08:00
John Reck
1aa939759c
Merge "Support mIntentUrl for addresses"
2012-02-23 13:40:25 -08:00
Eric Fischer
b442eca2b1
Merge "Import translations. DO NOT MERGE"
2012-02-23 13:17:10 -08:00
Eric Fischer
6c89da2963
Import translations. DO NOT MERGE
...
Change-Id: I49ba9b62c775d42d0f785a54d7c575bd93380a85
2012-02-23 13:14:21 -08:00
Jean-Baptiste Queru
111a7a107c
am 0842a226: am fe99051c: am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
...
* commit '0842a2262d03fc98e42541cb38f51a341d346ae0':
Fix for issue 9656 - custom xml attributes in Android Libraries
2012-02-23 13:04:24 -08:00
Jean-Baptiste Queru
0842a2262d
am fe99051c: am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
...
* commit 'fe99051c78994e0cc5153468eeba6f75f3e04b8e':
Fix for issue 9656 - custom xml attributes in Android Libraries
2012-02-23 13:01:59 -08:00
Jean-Baptiste Queru
fe99051c78
am 0e25e4cd: am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
...
* commit '0e25e4cd292dbc6bce330a876dedb7154e5cd847':
Fix for issue 9656 - custom xml attributes in Android Libraries
2012-02-23 12:59:22 -08:00
Jean-Baptiste Queru
0e25e4cd29
am 63e43ba5: Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
...
* commit '63e43ba56a95708c229eec539a544967f1bbb7d7':
Fix for issue 9656 - custom xml attributes in Android Libraries
2012-02-23 12:57:03 -08:00
Jean-Baptiste Queru
63e43ba56a
Merge "Fix for issue 9656 - custom xml attributes in Android Libraries"
2012-02-23 12:38:14 -08:00
Michael Jurka
61fd70a34f
am 08cb8352: am a7e1d8d5: am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen
...
* commit '08cb8352ef208730e4e3e1e71ebc47a59f0363de':
2012-02-23 12:26:18 -08:00
Michael Jurka
b7ee8e2cb4
am 6ad5d69d: am 0a232673: am bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen
...
* commit '6ad5d69da5cff2e4b5fb7acdb2699e2315b83307':
Don't allow screen invalidations to go outside bounds of screen
2012-02-23 12:26:16 -08:00
Scott Main
6bf8742ff9
am 8857f669: am 2a24914c: am 68d97aa2: Merge "docs: fix broken link" into ics-mr1
...
* commit '8857f669f902acd5f3763ea65b023a0987e6ea0e':
2012-02-23 12:26:01 -08:00
Scott Main
3fcf93b037
am cb4ebcb2: am ce980d8e: am 68d97aa2: Merge "docs: fix broken link" into ics-mr1
...
* commit 'cb4ebcb20b8540cc8027ae03dd578ce3846e9af1':
docs: fix broken link
2012-02-23 12:25:53 -08:00
Xavier Ducrohet
68466c5220
am 3c84c30a: am 1f46d79f: am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1
...
* commit '3c84c30a8605b56d63847081eaba79562dc1fa83':
2012-02-23 12:25:46 -08:00
Jean-Baptiste Queru
9f0094d7df
am 9379ac38: (-s ours) am 1cd83102: am b92aee4e: am 69e9c30c: Merge "Add stubs for improved compatibility"
...
* commit '9379ac3878f8ef104eb540566048d56577004190':
Add stubs for improved compatibility
2012-02-23 12:25:44 -08:00
Xavier Ducrohet
5e6c219477
am f8e737cb: am 22701ec5: am 503247f2: Merge "Make sure resource references are resolved." into ics-mr1
...
* commit 'f8e737cb61ab86b90ec318591fbcfec40fac63cf':
Make sure resource references are resolved.
2012-02-23 12:22:40 -08:00
Jean-Baptiste Queru
6822c97898
am 32916f7a: am fc4215ee: am 2d03a93e: Merge "Xcode 4.3 compatibility checkin"
...
* commit '32916f7a22f2abf5c1e7021f44c2337ca172f2e5':
Xcode 4.3 compatibility checkin
2012-02-23 12:22:35 -08:00
Jean-Baptiste Queru
afb902be67
am 9f207a85: (-s ours) am aff90790: am 4280891d: Merge "The bigger touch slop still has a problem"
...
* commit '9f207a850f6c5744db895692f21159d9a88966c5':
The bigger touch slop still has a problem
2012-02-23 12:22:29 -08:00
Andreas Huber
b07ae06e75
Merge "Be more greedy when it comes to gathering input and output buffers."
2012-02-23 11:54:08 -08:00
Adam Powell
6723dd9561
Merge "Bug 6058721 - optimize changing checked states in AbsListView"
2012-02-23 11:49:05 -08:00
Andreas Huber
a2798e252a
Be more greedy when it comes to gathering input and output buffers.
...
Change-Id: I54c4f608e5155917ca35eba5655b4c06357fb112
2012-02-23 11:21:43 -08:00
Rich Hyndman
d2b44e0706
am 46074f4d: am 3ebde8a2: am 942b823c: Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1
...
* commit '46074f4d4aa8334249a9bd71e6d0bc25066d5cae':
2012-02-23 11:20:43 -08:00
Rich Hyndman
0b2a139142
am f2381328: am 22c98df9: am 942b823c: Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1
...
* commit 'f238132853d2482979ec98a9d4f81ea24273768d':
docs: Added Lint into Android Training and removed Layoutopt.
2012-02-23 11:20:40 -08:00