OSDN Git Service
Craig Mautner [Wed, 13 Feb 2013 23:25:23 +0000 (15:25 -0800)]
am
ee6e27c1: Merge "Stop using AppToken movement and start using Task."
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit '
ee6e27c122491356f5203b105206a55f0e984fe7':
Stop using AppToken movement and start using Task.
Craig Mautner [Wed, 13 Feb 2013 23:22:26 +0000 (23:22 +0000)]
Merge "Stop using AppToken movement and start using Task."
Scott Main [Wed, 13 Feb 2013 23:21:56 +0000 (15:21 -0800)]
am
27b2b04f: am
f796c279: am
e526eedb: am
1f6dbc0d: am
c6608215: am
d51a894a: docs: fix tools sidenav for offline docs
# Via Android Git Automerger (5) and Scott Main (1)
* commit '
27b2b04f3c75315cd95357919d34d937ffeac742':
docs: fix tools sidenav for offline docs
Stephen Hines [Wed, 13 Feb 2013 23:21:54 +0000 (15:21 -0800)]
am
1f884ed2: Merge "Add tests for the new clipped kernel Java reflection."
# Via Android (Google) Code Review (1) and Stephen Hines (1)
* commit '
1f884ed206a2be6542ada58b2a7e033e782ed867':
Add tests for the new clipped kernel Java reflection.
Scott Main [Wed, 13 Feb 2013 23:19:17 +0000 (15:19 -0800)]
am
f796c279: am
e526eedb: am
1f6dbc0d: am
c6608215: am
d51a894a: docs: fix tools sidenav for offline docs
# Via Android Git Automerger (4) and Scott Main (1)
* commit '
f796c2793388184e2642afd8e244762d48d54761':
docs: fix tools sidenav for offline docs
Chris Craik [Wed, 13 Feb 2013 23:18:11 +0000 (15:18 -0800)]
am
c932760f: (-s ours) Merge "Revert "Merge remote-tracking branch \'goog/master-chromium\' into \'goog/master\'" DO NOT MERGE"
# Via Android (Google) Code Review (1) and Chris Craik (1)
* commit '
c932760f667cf56ca7a1aeffde505745dc3632e1':
Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE
Svetoslav [Wed, 13 Feb 2013 23:18:05 +0000 (15:18 -0800)]
am
eb26fbe4: Merge "Fixing a NPE in accessibility manager service."
# Via Android (Google) Code Review (1) and Svetoslav (1)
* commit '
eb26fbe427192bc87bb3dbb7882dbf87f760fab2':
Fixing a NPE in accessibility manager service.
Irfan Sheriff [Wed, 13 Feb 2013 23:18:02 +0000 (15:18 -0800)]
am
6e1a0738: Merge "Expose EAP config API"
# Via Android (Google) Code Review (1) and Irfan Sheriff (1)
* commit '
6e1a0738e9bcefc442ad45e1d6f6af0e5ace7b17':
Expose EAP config API
Stephen Hines [Wed, 13 Feb 2013 23:11:04 +0000 (23:11 +0000)]
Merge "Add tests for the new clipped kernel Java reflection."
Scott Main [Wed, 13 Feb 2013 23:17:02 +0000 (15:17 -0800)]
am
e526eedb: am
1f6dbc0d: am
c6608215: am
d51a894a: docs: fix tools sidenav for offline docs
# Via Android Git Automerger (3) and Scott Main (1)
* commit '
e526eedb8e0145f96991219abd9022ef52f4b976':
docs: fix tools sidenav for offline docs
Chris Craik [Wed, 13 Feb 2013 23:14:26 +0000 (23:14 +0000)]
Merge "Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE"
Scott Main [Wed, 13 Feb 2013 23:14:41 +0000 (15:14 -0800)]
am
1f6dbc0d: am
c6608215: am
d51a894a: docs: fix tools sidenav for offline docs
# Via Android Git Automerger (2) and Scott Main (1)
* commit '
1f6dbc0dccd6eba712848ac36bace4fc16f84fd1':
docs: fix tools sidenav for offline docs
Martijn Coenen [Wed, 13 Feb 2013 23:14:35 +0000 (15:14 -0800)]
am
21654f9e: Merge "Add exception types for NfcEe operations."
# Via Android (Google) Code Review (1) and Martijn Coenen (1)
* commit '
21654f9efc66aed05d35f618aa953d05e78eecad':
Add exception types for NfcEe operations.
Svetoslav [Wed, 13 Feb 2013 23:13:52 +0000 (23:13 +0000)]
Merge "Fixing a NPE in accessibility manager service."
Scott Main [Wed, 13 Feb 2013 23:13:24 +0000 (15:13 -0800)]
am
c6608215: am
d51a894a: docs: fix tools sidenav for offline docs
# Via Android Git Automerger (1) and Scott Main (1)
* commit '
c660821502e5e27d10ea2d9248fb3c700f5560e5':
docs: fix tools sidenav for offline docs
Irfan Sheriff [Wed, 13 Feb 2013 23:12:36 +0000 (23:12 +0000)]
Merge "Expose EAP config API"
Scott Main [Wed, 13 Feb 2013 23:11:19 +0000 (15:11 -0800)]
am
d51a894a: docs: fix tools sidenav for offline docs
# Via Scott Main
* commit '
d51a894a50b6dd48023fdc5b79c6f889a3988903':
docs: fix tools sidenav for offline docs
Stephen Hines [Wed, 13 Feb 2013 23:11:12 +0000 (15:11 -0800)]
am
9b10e27d: Merge "Add rsnScriptForEachClipped() implementation with no param array."
# Via Android (Google) Code Review (1) and Stephen Hines (1)
* commit '
9b10e27d60765b36271848e87230e8c6ca4b1ed2':
Add rsnScriptForEachClipped() implementation with no param array.
Martijn Coenen [Wed, 13 Feb 2013 23:10:56 +0000 (23:10 +0000)]
Merge "Add exception types for NfcEe operations."
Scott Main [Wed, 13 Feb 2013 23:06:41 +0000 (15:06 -0800)]
docs: fix tools sidenav for offline docs
Change-Id: If15ec25f395d9e18f35085488b75be8f84a6d42f
Stephen Hines [Wed, 13 Feb 2013 23:06:34 +0000 (23:06 +0000)]
Merge "Add rsnScriptForEachClipped() implementation with no param array."
Svetoslav [Wed, 13 Feb 2013 22:55:19 +0000 (14:55 -0800)]
Fixing a NPE in accessibility manager service.
There was a missing null checks as a result of a recent
refactoring.
bug:
8185435
Change-Id: I3a1e256b434755b3a27f609dd2b6aeec31aa9a4f
Philip Milne [Wed, 13 Feb 2013 22:27:56 +0000 (14:27 -0800)]
am
fd0fa65e: Merge "Revert "Fix for bug:
8184401 - GridLayout accounts for child\'s size/measurements even when a child is "GONE"""
# Via Android (Google) Code Review
* commit '
fd0fa65eeae00f58863af060950e10f20971726b':
Revert "Fix for bug:
8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE""
Philip Milne [Wed, 13 Feb 2013 22:23:45 +0000 (22:23 +0000)]
Merge "Revert "Fix for bug:
8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE"""
Philip Milne [Wed, 13 Feb 2013 22:07:50 +0000 (22:07 +0000)]
Revert "Fix for bug:
8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE""
Suspected cause of: http://b.corp.google.com/issue?id=
8192858
This reverts commit
e5e0b7f191b64380e9231a2b755ecd3738598dec
Change-Id: I1a35c12c3ca0b1eacfb0c1a4d6ba03601dab664b
Craig Mautner [Wed, 13 Feb 2013 19:56:07 +0000 (11:56 -0800)]
Stop using AppToken movement and start using Task.
Change-Id: I5fbd3b2b692e0e127386051f782b1015515ba384
Chris Craik [Wed, 13 Feb 2013 19:53:45 +0000 (11:53 -0800)]
am
68b60091: Merge "Revert "Use RenderScript for large text blurs""
# Via Android (Google) Code Review
* commit '
68b600913b699da0fbfcd9d913e4c4fdb08e06b8':
Revert "Use RenderScript for large text blurs"
Chris Craik [Wed, 13 Feb 2013 19:50:23 +0000 (19:50 +0000)]
Merge "Revert "Use RenderScript for large text blurs""
Craig Mautner [Wed, 13 Feb 2013 19:48:00 +0000 (11:48 -0800)]
am
769a5b72: Merge "Replace access to mAppTokens with AppTokenIterator"
# Via Android (Google) Code Review (1) and Craig Mautner (1)
* commit '
769a5b72dc076facae20154bf5d55b9810322b87':
Replace access to mAppTokens with AppTokenIterator
Chris Craik [Wed, 13 Feb 2013 19:47:24 +0000 (19:47 +0000)]
Revert "Use RenderScript for large text blurs"
This reverts commit
3f76e65d251ead65fe8ff98e3bd4c7623fbaac07
Change-Id: Ia81cd485e5ca696bb284c419dc8a1d2f3247100e
Jean-Michel Trivi [Wed, 13 Feb 2013 19:44:38 +0000 (11:44 -0800)]
am
0888a067: Merge "Fix AudioFocus for back-to-back notifications"
# Via Android (Google) Code Review (1) and Jean-Michel Trivi (1)
* commit '
0888a06762fb55d48646c86c6a0184a0b96cdc24':
Fix AudioFocus for back-to-back notifications
Craig Mautner [Wed, 13 Feb 2013 19:44:35 +0000 (19:44 +0000)]
Merge "Replace access to mAppTokens with AppTokenIterator"
Jean-Michel Trivi [Wed, 13 Feb 2013 19:41:12 +0000 (11:41 -0800)]
am
23bbe02b: Merge "No AudioFocus for notifications when media played remotely"
# Via Android (Google) Code Review (1) and Jean-Michel Trivi (1)
* commit '
23bbe02b363bb96bd56d4008141e8cf800bb46b7':
No AudioFocus for notifications when media played remotely
Jean-Michel Trivi [Wed, 13 Feb 2013 19:39:51 +0000 (19:39 +0000)]
Merge "Fix AudioFocus for back-to-back notifications"
Romain Guy [Wed, 13 Feb 2013 19:37:49 +0000 (11:37 -0800)]
am
0450086a: Merge "Fix format name typo"
# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit '
0450086a845709091e176f142d60dbe553c1bce3':
Fix format name typo
Jean-Michel Trivi [Wed, 13 Feb 2013 19:37:44 +0000 (19:37 +0000)]
Merge "No AudioFocus for notifications when media played remotely"
Chris Craik [Wed, 13 Feb 2013 19:37:45 +0000 (11:37 -0800)]
am
bce29d2a: Merge "Use RenderScript for large text blurs"
# Via Android (Google) Code Review (1) and Chris Craik (1)
* commit '
bce29d2a549c374e642ad7a41a1daf869b46f53c':
Use RenderScript for large text blurs
Romain Guy [Wed, 13 Feb 2013 19:35:03 +0000 (19:35 +0000)]
Merge "Fix format name typo"
Jeff Sharkey [Wed, 13 Feb 2013 19:34:23 +0000 (11:34 -0800)]
am
eff99182: Merge "Escape arguments before passing to netd."
# Via Android (Google) Code Review (1) and Jeff Sharkey (1)
* commit '
eff99182297f1c762789237a7d66c9bef754a3d7':
Escape arguments before passing to netd.
Romain Guy [Wed, 13 Feb 2013 19:33:26 +0000 (11:33 -0800)]
Fix format name typo
Change-Id: If7d86b74ad9735f12349d9fcb62b335f5a742bb5
Chris Craik [Wed, 13 Feb 2013 19:32:55 +0000 (19:32 +0000)]
Merge "Use RenderScript for large text blurs"
Romain Guy [Wed, 13 Feb 2013 19:30:57 +0000 (11:30 -0800)]
am
93799ba0: Merge "Add a render buffer cache to reuse stencil buffers Bug #
7146141"
# Via Android (Google) Code Review (1) and Romain Guy (1)
* commit '
93799ba01b5f2902d7120db8416a1e15103286e8':
Add a render buffer cache to reuse stencil buffers Bug #
7146141
Jeff Sharkey [Wed, 13 Feb 2013 19:29:48 +0000 (19:29 +0000)]
Merge "Escape arguments before passing to netd."
Romain Guy [Wed, 13 Feb 2013 19:27:58 +0000 (19:27 +0000)]
Merge "Add a render buffer cache to reuse stencil buffers Bug #
7146141"
Jeff Sharkey [Wed, 13 Feb 2013 19:27:24 +0000 (11:27 -0800)]
Escape arguments before passing to netd.
Change-Id: I70bb0cb1e90abd490f8893365c6bdf1844b01d18
Romain Guy [Wed, 13 Feb 2013 00:08:55 +0000 (16:08 -0800)]
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
Fabrice Di Meglio [Wed, 13 Feb 2013 19:14:18 +0000 (11:14 -0800)]
am
0c33ecd2: Merge "Clean Paint.mBidiFlags as it is no longer used"
# Via Android (Google) Code Review (1) and Fabrice Di Meglio (1)
* commit '
0c33ecd209d884a9a2b9ad807cb798583b890a08':
Clean Paint.mBidiFlags as it is no longer used
Fabrice Di Meglio [Wed, 13 Feb 2013 19:11:50 +0000 (19:11 +0000)]
Merge "Clean Paint.mBidiFlags as it is no longer used"
Victoria Lease [Wed, 13 Feb 2013 19:10:52 +0000 (11:10 -0800)]
am
9cabb366: Merge "Count baseGlyphCount once for scripts without typefaces"
# Via Android (Google) Code Review (1) and Victoria Lease (1)
* commit '
9cabb366917ec91d3dc1329ff7ea7c98c89399bb':
Count baseGlyphCount once for scripts without typefaces
Victoria Lease [Wed, 13 Feb 2013 19:07:25 +0000 (19:07 +0000)]
Merge "Count baseGlyphCount once for scripts without typefaces"
Chris Craik [Wed, 13 Feb 2013 18:25:12 +0000 (10:25 -0800)]
Revert "Merge remote-tracking branch 'goog/master-chromium' into 'goog/master'" DO NOT MERGE
This reverts commit
6c0307dd0aefe9a08794b155fc03ee60ebd14f25, reversing
changes made to
a2cd828b749c444d55c2c41c7dbb85088ff94b9f.
Conflicts:
packages/SystemUI/res/values-sv/strings.xml
Change-Id: Ia178efe8b14751583d47b2826bfe3d3d5463dd2e
Irfan Sheriff [Thu, 7 Feb 2013 23:09:22 +0000 (15:09 -0800)]
Expose EAP config API
This API allows apps to setup access to enterprise Wi-Fi networks.
Change-Id: I37573d76b8bd9cad72413afdc4fc62ce57b4dc43
Scott Main [Wed, 13 Feb 2013 18:14:41 +0000 (10:14 -0800)]
am
ed0ea76c: 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 (5) and others
* commit '
ed0ea76cf4caf9b9e4528e776101739f4409a9a7':
docs: add info about secure adb
Scott Main [Wed, 13 Feb 2013 18:12:33 +0000 (10:12 -0800)]
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
Scott Main [Wed, 13 Feb 2013 18:10:08 +0000 (10:10 -0800)]
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
Scott Main [Wed, 13 Feb 2013 18:08:43 +0000 (10:08 -0800)]
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
Scott Main [Wed, 13 Feb 2013 18:07:47 +0000 (10:07 -0800)]
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
Scott Main [Wed, 13 Feb 2013 18:05:41 +0000 (10:05 -0800)]
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
Scott Main [Wed, 13 Feb 2013 18:01:32 +0000 (18:01 +0000)]
Merge "docs: add info about secure adb" into jb-mr1-dev
Joe Fernandez [Wed, 13 Feb 2013 17:50:00 +0000 (09:50 -0800)]
am
bbe99b35: 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 (5) and others
* commit '
bbe99b353db00c061085c12938d2a295c39a0e94':
docs: Keystore/Cert warning for Signing Apps, Issue:
8180111
Joe Fernandez [Wed, 13 Feb 2013 17:47:57 +0000 (09:47 -0800)]
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
Joe Fernandez [Wed, 13 Feb 2013 17:45:59 +0000 (09:45 -0800)]
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
Joe Fernandez [Wed, 13 Feb 2013 17:43:02 +0000 (09:43 -0800)]
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
Jean-Michel Trivi [Tue, 12 Feb 2013 23:42:34 +0000 (15:42 -0800)]
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
Joe Fernandez [Wed, 13 Feb 2013 17:40:59 +0000 (09:40 -0800)]
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
Joe Fernandez [Wed, 13 Feb 2013 17:38:54 +0000 (09:38 -0800)]
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
Joe Fernandez [Wed, 13 Feb 2013 17:35:22 +0000 (17:35 +0000)]
Merge "docs: Keystore/Cert warning for Signing Apps, Issue:
8180111" into jb-mr1-dev
Joe Fernandez [Wed, 13 Feb 2013 00:55:43 +0000 (16:55 -0800)]
docs: Keystore/Cert warning for Signing Apps, Issue:
8180111
Change-Id: Iab2a06fc27922aafbf10b821550098c040e2a4b2
Baligh Uddin [Wed, 13 Feb 2013 17:24:12 +0000 (17:24 +0000)]
Merge "Import translations. DO NOT MERGE" into master-chromium
Baligh Uddin [Wed, 13 Feb 2013 17:19:41 +0000 (09:19 -0800)]
am
222a6e9e: (-s ours) Import translations. DO NOT MERGE
# Via Baligh Uddin
* commit '
222a6e9e98c97743f5aace99ec34d81c6bd9bb29':
Import translations. DO NOT MERGE
Baligh Uddin [Wed, 13 Feb 2013 16:44:42 +0000 (08:44 -0800)]
Import translations. DO NOT MERGE
Change-Id: I8fc81238feb8efe49902b3020c96dc7f1a84665c
Auto-generated-cl: translation import
Baligh Uddin [Wed, 13 Feb 2013 16:43:11 +0000 (08:43 -0800)]
Import translations. DO NOT MERGE
Change-Id: I19f0cf6b89a1bfb5d95aeafc7a639716b86f618e
Auto-generated-cl: translation import
Chet Haase [Wed, 13 Feb 2013 15:32:18 +0000 (07:32 -0800)]
am
f0bb8000: Merge "Fix getHitRect() to return correct rect for transformed child"
# Via Android (Google) Code Review (1) and Chet Haase (1)
* commit '
f0bb8000a3a30cf389f91b70f6954b7397437b7e':
Fix getHitRect() to return correct rect for transformed child
Chet Haase [Wed, 13 Feb 2013 15:29:35 +0000 (15:29 +0000)]
Merge "Fix getHitRect() to return correct rect for transformed child"
Joe Fernandez [Wed, 13 Feb 2013 15:26:25 +0000 (07:26 -0800)]
am
502a15ff: 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 (5) and others
* commit '
502a15ffe83608636a83721214bf06bba60242bf':
docs: Android SDK 21.1.0 Release Notes
Joe Fernandez [Wed, 13 Feb 2013 15:23:26 +0000 (07:23 -0800)]
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
Joe Fernandez [Wed, 13 Feb 2013 15:21:08 +0000 (07:21 -0800)]
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
Joe Fernandez [Wed, 13 Feb 2013 15:18:49 +0000 (07:18 -0800)]
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
Joe Fernandez [Wed, 13 Feb 2013 15:16:16 +0000 (07:16 -0800)]
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
Joe Fernandez [Wed, 13 Feb 2013 15:14:10 +0000 (07:14 -0800)]
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
Joe Fernandez [Wed, 13 Feb 2013 15:10:15 +0000 (15:10 +0000)]
Merge "docs: Android SDK 21.1.0 Release Notes" into jb-mr1-dev
Stephen Hines [Wed, 13 Feb 2013 08:11:57 +0000 (00:11 -0800)]
Add tests for the new clipped kernel Java reflection.
Change-Id: Idb0444823711da356ae0ac025aa79c6ff8068373
Stephen Hines [Wed, 13 Feb 2013 08:09:02 +0000 (00:09 -0800)]
Add rsnScriptForEachClipped() implementation with no param array.
JNI doesn't let us pass down a NULL parameter array (from the usrData part
of our reflection). In this case, we simply clone our existing function, but
remove the offending array parameter.
Change-Id: Ib1d6e202f2a55ba8922eec3da5a93d8daa882250
Scott Main [Wed, 13 Feb 2013 02:36:50 +0000 (18:36 -0800)]
am
7d9cf2b7: 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 (5) and others
* commit '
7d9cf2b74236953671d20f5634f3b4234c25c6fa':
lists.js files for gms and gcm
Scott Main [Wed, 13 Feb 2013 02:34:50 +0000 (18:34 -0800)]
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
Scott Main [Wed, 13 Feb 2013 02:32:33 +0000 (18:32 -0800)]
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
Scott Main [Wed, 13 Feb 2013 02:31:08 +0000 (18:31 -0800)]
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
Scott Main [Wed, 13 Feb 2013 02:30:05 +0000 (18:30 -0800)]
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
Scott Main [Wed, 13 Feb 2013 02:27:57 +0000 (18:27 -0800)]
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
Scott Main [Wed, 13 Feb 2013 02:24:28 +0000 (02:24 +0000)]
Merge "lists.js files for gms and gcm" into jb-mr1-dev
Robert Ly [Wed, 13 Feb 2013 01:52:19 +0000 (17:52 -0800)]
lists.js files for gms and gcm
Change-Id: I786adfc966986a8e71dc2164740f2a00d60c0159
Chris Craik [Thu, 15 Nov 2012 00:11:10 +0000 (16:11 -0800)]
Use RenderScript for large text blurs
Still fall back to simple path for small tasks
Change-Id: I492f1b3f7d6fec1738f3e45cbfb15864bd23a392
Philip Milne [Wed, 13 Feb 2013 01:42:01 +0000 (17:42 -0800)]
am
d9050056: Merge "Fix for bug:
8184401 - GridLayout accounts for child\'s size/measurements even when a child is "GONE""
# Via Android (Google) Code Review (1) and Philip Milne (1)
* commit '
d9050056946132d6dc9821f77f801c584b4206a9':
Fix for bug:
8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE"
Philip Milne [Wed, 13 Feb 2013 01:39:05 +0000 (01:39 +0000)]
Merge "Fix for bug:
8184401 - GridLayout accounts for child's size/measurements even when a child is "GONE""
Fabrice Di Meglio [Wed, 13 Feb 2013 01:31:31 +0000 (17:31 -0800)]
am
615ba0f7: Merge "Fix bug #
8185410 BidiFormatter code should not use the Dir enum anymore"
# Via Android (Google) Code Review (1) and Fabrice Di Meglio (1)
* commit '
615ba0f73652fb008e90479be7748e04d6e225ad':
Fix bug #
8185410 BidiFormatter code should not use the Dir enum anymore
Fabrice Di Meglio [Wed, 13 Feb 2013 01:27:56 +0000 (01:27 +0000)]
Merge "Fix bug #
8185410 BidiFormatter code should not use the Dir enum anymore"
Ying Wang [Wed, 13 Feb 2013 01:23:46 +0000 (17:23 -0800)]
am
4c818473: Remove the unnecessary framework-res-package-target
# Via Ying Wang
* commit '
4c818473d43e0d3dcc325365221b26f48951bcdd':
Remove the unnecessary framework-res-package-target
Fabrice Di Meglio [Wed, 13 Feb 2013 01:22:01 +0000 (17:22 -0800)]
Fix bug #
8185410 BidiFormatter code should not use the Dir enum anymore
- replace Dir enum with static final int constants
Change-Id: Ibfd857e9767f14db92e50edb1681fef0d6598d99
Ying Wang [Wed, 13 Feb 2013 01:18:44 +0000 (17:18 -0800)]
Remove the unnecessary framework-res-package-target
Now the dependency should be correctly established by
framework_docs_LOCAL_JAVA_LIBRARIES.
Change-Id: I4c0ed2d3fb2855539027c7a0eb663f5747ae3ebd
Wink Saville [Wed, 13 Feb 2013 01:12:22 +0000 (17:12 -0800)]
am
35185a9c: Fix broken test.
# Via Wink Saville
* commit '
35185a9ccf016f1d5fbe055e89a6c4c79a247981':
Fix broken test.
OSDN Git Service
