Tim Murray
6b9b2caf2b
Add MIRRORED_REPEAT.
...
Change-Id: I7565da24912a3c33d8f824da9ea0899a423d3c40
2013-02-15 14:53:09 -08:00
Craig Mautner
769a5b72dc
Merge "Replace access to mAppTokens with AppTokenIterator"
2013-02-13 19:44:35 +00:00
Jean-Michel Trivi
0888a06762
Merge "Fix AudioFocus for back-to-back notifications"
2013-02-13 19:40:33 +00:00
Jean-Michel Trivi
23bbe02b36
Merge "No AudioFocus for notifications when media played remotely"
2013-02-13 19:37:45 +00:00
Romain Guy
0450086a84
Merge "Fix format name typo"
2013-02-13 19:35:33 +00:00
Romain Guy
2b44eb75c4
Fix format name typo
...
Change-Id: If7d86b74ad9735f12349d9fcb62b335f5a742bb5
2013-02-13 11:33:26 -08:00
Chris Craik
bce29d2a54
Merge "Use RenderScript for large text blurs"
2013-02-13 19:32:56 +00:00
Jeff Sharkey
eff9918229
Merge "Escape arguments before passing to netd."
2013-02-13 19:29:58 +00:00
Romain Guy
93799ba01b
Merge "Add a render buffer cache to reuse stencil buffers Bug #7146141 "
2013-02-13 19:27:59 +00:00
Jeff Sharkey
0c232f5a99
Escape arguments before passing to netd.
...
Change-Id: I70bb0cb1e90abd490f8893365c6bdf1844b01d18
2013-02-13 11:27:24 -08:00
Romain Guy
8d4aeb7111
Add a render buffer cache to reuse stencil buffers
...
Bug #7146141
This new cache is used in a similar way to LayerCache. It helps
reuse already allocated stencil buffers and thus avoid churning
memory on every frame.
Change-Id: I19551d72da52c40039e65904563600e492c8b193
2013-02-13 11:27:05 -08:00
Fabrice Di Meglio
0c33ecd209
Merge "Clean Paint.mBidiFlags as it is no longer used"
2013-02-13 19:11:50 +00:00
Victoria Lease
9cabb36691
Merge "Count baseGlyphCount once for scripts without typefaces"
2013-02-13 19:07:26 +00:00
Scott Main
ed0ea76cf4
am 1214e975: am 3baf1b6f: am 60d8836e: am be4d1dcd: am dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev
...
# Via Android Git Automerger (4) and others
* commit '1214e975d65dc5604ac95ed3ce7565333fa3e364':
docs: add info about secure adb
2013-02-13 10:12:33 -08:00
Scott Main
1214e975d6
am 3baf1b6f: am 60d8836e: am be4d1dcd: am dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev
...
# Via Android Git Automerger (3) and others
* commit '3baf1b6f44c8f9f851e165f1b818a475b4b09fed':
docs: add info about secure adb
2013-02-13 10:10:08 -08:00
Scott Main
3baf1b6f44
am 60d8836e: am be4d1dcd: am dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev
...
# Via Android Git Automerger (2) and others
* commit '60d8836e0dcd46645d73ef7fb34257aef5e5a927':
docs: add info about secure adb
2013-02-13 10:08:43 -08:00
Scott Main
60d8836e0d
am be4d1dcd: am dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev
...
# Via Android (Google) Code Review (1) and others
* commit 'be4d1dcd0118e2933c8467a13d5e8cb7abbb9707':
docs: add info about secure adb
2013-02-13 10:07:47 -08:00
Scott Main
be4d1dcd01
am dd8b5845: Merge "docs: add info about secure adb" into jb-mr1-dev
...
# Via Android (Google) Code Review (1) and Scott Main (1)
* commit 'dd8b58457c6ce18ec98f1b2419300aa8c9cd326d':
docs: add info about secure adb
2013-02-13 10:05:41 -08:00
Scott Main
dd8b58457c
Merge "docs: add info about secure adb" into jb-mr1-dev
2013-02-13 18:01:48 +00:00
Joe Fernandez
bbe99b353d
am 4c28487a: am 45df16aa: am 6e372639: am 30890f28: am c5cb262c: Merge "docs: Keystore/Cert warning for Signing Apps, Issue: 8180111" into jb-mr1-dev
...
# Via Android Git Automerger (4) and others
* commit '4c28487acd5f0f52d212190925d424d898fbb672':
docs: Keystore/Cert warning for Signing Apps, Issue: 8180111
2013-02-13 09:47:57 -08:00
Joe Fernandez
4c28487acd
am 45df16aa: am 6e372639: am 30890f28: am c5cb262c: Merge "docs: Keystore/Cert warning for Signing Apps, Issue: 8180111" into jb-mr1-dev
...
# Via Android Git Automerger (3) and others
* commit '45df16aa73c6665f55c86f4a9998e6b383b751ca':
docs: Keystore/Cert warning for Signing Apps, Issue: 8180111
2013-02-13 09:45:59 -08:00
Joe Fernandez
45df16aa73
am 6e372639: am 30890f28: am c5cb262c: Merge "docs: Keystore/Cert warning for Signing Apps, Issue: 8180111" into jb-mr1-dev
...
# Via Android Git Automerger (2) and others
* commit '6e372639f8c9a3ccda58a9d6cc321abb60eb62b1':
docs: Keystore/Cert warning for Signing Apps, Issue: 8180111
2013-02-13 09:43:02 -08:00
Jean-Michel Trivi
6313cbe1d0
Fix AudioFocus for back-to-back notifications
...
A single instance of NotificationPlayer will play notifications
back-to-back, and was, for each requesting AudioFocus. But as
a new notification was about to be played, its accompanying
thread was terminated, and the completion listener was never
called, and therefore AudioFocus was not released (e.g. two
requests for one release).
The fix consists in requesting AudioFocus only once and
abandonning it when the only reported completion is received.
Added a FIXME note about a better solution to be implemented.
Bug 7680947
Change-Id: Ica9d5c1eb5d57c89ceebe66282af69f0f7d43667
2013-02-13 09:41:10 -08:00
Joe Fernandez
6e372639f8
am 30890f28: am c5cb262c: Merge "docs: Keystore/Cert warning for Signing Apps, Issue: 8180111" into jb-mr1-dev
...
# Via Android (Google) Code Review (1) and others
* commit '30890f2853dc7d2871d4485e2af3467bb7960b88':
docs: Keystore/Cert warning for Signing Apps, Issue: 8180111
2013-02-13 09:40:59 -08:00
Joe Fernandez
30890f2853
am c5cb262c: Merge "docs: Keystore/Cert warning for Signing Apps, Issue: 8180111" into jb-mr1-dev
...
# Via Android (Google) Code Review (1) and Joe Fernandez (1)
* commit 'c5cb262cc6bd47a5a2ad71866cb6d9961713842a':
docs: Keystore/Cert warning for Signing Apps, Issue: 8180111
2013-02-13 09:38:54 -08:00
Joe Fernandez
c5cb262cc6
Merge "docs: Keystore/Cert warning for Signing Apps, Issue: 8180111" into jb-mr1-dev
2013-02-13 17:35:22 +00:00
Joe Fernandez
798da53fa8
docs: Keystore/Cert warning for Signing Apps, Issue: 8180111
...
Change-Id: Iab2a06fc27922aafbf10b821550098c040e2a4b2
2013-02-13 09:26:57 -08:00
Baligh Uddin
222a6e9e98
Import translations. DO NOT MERGE
...
Change-Id: I19f0cf6b89a1bfb5d95aeafc7a639716b86f618e
Auto-generated-cl: translation import
2013-02-13 08:43:11 -08:00
Chet Haase
f0bb8000a3
Merge "Fix getHitRect() to return correct rect for transformed child"
2013-02-13 15:29:36 +00:00
Joe Fernandez
502a15ffe8
am c698a855: am d1c9d6e8: am 3b8381e1: am 7bb37c87: am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev
...
# Via Android Git Automerger (4) and others
* commit 'c698a855d27520bac00677f78136b48e617ba333':
docs: Android SDK 21.1.0 Release Notes
2013-02-13 07:23:26 -08:00
Joe Fernandez
c698a855d2
am d1c9d6e8: am 3b8381e1: am 7bb37c87: am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev
...
# Via Android Git Automerger (3) and others
* commit 'd1c9d6e84969ee36f8a3b74515bae715727866a1':
docs: Android SDK 21.1.0 Release Notes
2013-02-13 07:21:08 -08:00
Joe Fernandez
d1c9d6e849
am 3b8381e1: am 7bb37c87: am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev
...
# Via Android Git Automerger (2) and others
* commit '3b8381e1ed71258957718b8cc8dca46ee587c0fe':
docs: Android SDK 21.1.0 Release Notes
2013-02-13 07:18:49 -08:00
Joe Fernandez
3b8381e1ed
am 7bb37c87: am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev
...
# Via Android (Google) Code Review (1) and others
* commit '7bb37c8748b6c7e36a18b7e55cc0b8af65b45099':
docs: Android SDK 21.1.0 Release Notes
2013-02-13 07:16:16 -08:00
Joe Fernandez
7bb37c8748
am 0480d5d8: Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev
...
# Via Android (Google) Code Review (1) and Joe Fernandez (1)
* commit '0480d5d88c95abebb073dc1ea5a2f20d5ffdef38':
docs: Android SDK 21.1.0 Release Notes
2013-02-13 07:14:10 -08:00
Joe Fernandez
0480d5d88c
Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev
2013-02-13 15:10:16 +00:00
Scott Main
7d9cf2b742
am 8d21b881: am 6d32f4e8: am 64aa66d1: am b861a945: am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev
...
# By Robert Ly
# Via Android Git Automerger (4) and others
* commit '8d21b8811cddd716411390f48f918c80b286e412':
lists.js files for gms and gcm
2013-02-12 18:34:50 -08:00
Scott Main
8d21b8811c
am 6d32f4e8: am 64aa66d1: am b861a945: am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev
...
# By Robert Ly
# Via Android Git Automerger (3) and others
* commit '6d32f4e86e0fa67561c26582b9a25581744212f1':
lists.js files for gms and gcm
2013-02-12 18:32:33 -08:00
Scott Main
6d32f4e86e
am 64aa66d1: am b861a945: am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev
...
# By Robert Ly
# Via Android Git Automerger (2) and others
* commit '64aa66d126b2c382ccbcc50e8690e75175074168':
lists.js files for gms and gcm
2013-02-12 18:31:08 -08:00
Scott Main
64aa66d126
am b861a945: am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev
...
# By Robert Ly
# Via Android (Google) Code Review (1) and others
* commit 'b861a9455ce8018b859d8b670e58324d79d9fd3a':
lists.js files for gms and gcm
2013-02-12 18:30:05 -08:00
Scott Main
b861a9455c
am 4cb43d97: Merge "lists.js files for gms and gcm" into jb-mr1-dev
...
# By Robert Ly
# Via Android (Google) Code Review (1) and Robert Ly (1)
* commit '4cb43d977bb610fc8e2789dc53334569f2aa55e8':
lists.js files for gms and gcm
2013-02-12 18:27:57 -08:00
Scott Main
4cb43d977b
Merge "lists.js files for gms and gcm" into jb-mr1-dev
2013-02-13 02:24:57 +00:00
Robert Ly
373264b776
lists.js files for gms and gcm
...
Change-Id: I786adfc966986a8e71dc2164740f2a00d60c0159
2013-02-12 18:15:04 -08:00
Chris Craik
3f76e65d25
Use RenderScript for large text blurs
...
Still fall back to simple path for small tasks
Change-Id: I492f1b3f7d6fec1738f3e45cbfb15864bd23a392
2013-02-12 17:45:28 -08:00
Philip Milne
d905005694
Merge "Fix for bug: 8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE""
2013-02-13 01:39:06 +00:00
Fabrice Di Meglio
615ba0f736
Merge "Fix bug #8185410 BidiFormatter code should not use the Dir enum anymore"
2013-02-13 01:28:55 +00:00
Fabrice Di Meglio
4d1937b731
Fix bug #8185410 BidiFormatter code should not use the Dir enum anymore
...
- replace Dir enum with static final int constants
Change-Id: Ibfd857e9767f14db92e50edb1681fef0d6598d99
2013-02-12 17:22:01 -08:00
Ying Wang
4c818473d4
Remove the unnecessary framework-res-package-target
...
Now the dependency should be correctly established by
framework_docs_LOCAL_JAVA_LIBRARIES.
Change-Id: I4c0ed2d3fb2855539027c7a0eb663f5747ae3ebd
2013-02-12 17:18:44 -08:00
Wink Saville
35185a9ccf
Fix broken test.
...
Change-Id: I8c5649c9b3d917cf13b94d49da44eaf510643df6
2013-02-12 17:07:21 -08:00
Tim Murray
43aed48fac
Merge "Pass through null LaunchOption structs to standard forEach."
2013-02-13 00:42:37 +00:00
Tim Murray
ba9dd06176
Pass through null LaunchOption structs to standard forEach.
...
Change-Id: I4dcde6996400207c7e361ff4b7723ec7db832e80
2013-02-12 16:23:19 -08:00