OSDN Git Service
Craig Mautner [Wed, 13 Feb 2013 23:22:54 +0000 (15:22 -0800)]
Remove unused App methods.
Now that the Task methods have replaced the App methods remove
the App methods.
Change-Id: I0e7432f2c6f99708759ed8c871d20eb5bd38c3c2
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: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
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
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
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: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:50:23 +0000 (19:50 +0000)]
Merge "Revert "Use RenderScript for large text blurs""
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
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:39:51 +0000 (19:39 +0000)]
Merge "Fix AudioFocus for back-to-back notifications"
Jean-Michel Trivi [Wed, 13 Feb 2013 19:37:44 +0000 (19:37 +0000)]
Merge "No AudioFocus for notifications when media played remotely"
Romain Guy [Wed, 13 Feb 2013 19:35:03 +0000 (19:35 +0000)]
Merge "Fix format name typo"
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"
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:11:50 +0000 (19:11 +0000)]
Merge "Clean Paint.mBidiFlags as it is no longer used"
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: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: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 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:29:35 +0000 (15:29 +0000)]
Merge "Fix getHitRect() to return correct rect for transformed child"
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: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: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:27:56 +0000 (01:27 +0000)]
Merge "Fix bug #
8185410 BidiFormatter code should not use the Dir enum anymore"
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:07:21 +0000 (17:07 -0800)]
Fix broken test.
Change-Id: I8c5649c9b3d917cf13b94d49da44eaf510643df6
Tim Murray [Wed, 13 Feb 2013 00:42:37 +0000 (00:42 +0000)]
Merge "Pass through null LaunchOption structs to standard forEach."
Tim Murray [Wed, 13 Feb 2013 00:22:34 +0000 (16:22 -0800)]
Pass through null LaunchOption structs to standard forEach.
Change-Id: I4dcde6996400207c7e361ff4b7723ec7db832e80
Craig Mautner [Tue, 12 Feb 2013 19:30:16 +0000 (11:30 -0800)]
Replace access to mAppTokens with AppTokenIterator
More switching from Activity-based to Task-based control.
Change-Id: Ida47d71a52b875a6a6bd77cb62911053f942da15
Amith Yamasani [Wed, 13 Feb 2013 00:00:22 +0000 (00:00 +0000)]
Merge "Hacks to fix lockdown"
Geoffrey Borggaard [Thu, 24 Jan 2013 15:03:20 +0000 (10:03 -0500)]
Hacks to fix lockdown
Change-Id: Icf715e84ac7f8bd12eabd01f35860c36a60a8caf
Craig Mautner [Tue, 12 Feb 2013 23:57:09 +0000 (23:57 +0000)]
Merge "Add AppWindowTokens to TaskList."
Dianne Hackborn [Tue, 12 Feb 2013 23:54:56 +0000 (23:54 +0000)]
Merge "Implement issue #
6646859: 4K!!!! 4K!!!! 4K!!!!"
Xavier Ducrohet [Tue, 12 Feb 2013 23:54:02 +0000 (15:54 -0800)]
am
36ee5485: am
5d5c05de: am
b7a4aed9: am
f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev
# Via Android Git Automerger (3) and others
* commit '
36ee5485b85e34008dc31e0f7bace1b2516c5db5':
Fix DateFormat for layoutlib.
Xavier Ducrohet [Tue, 12 Feb 2013 23:52:46 +0000 (15:52 -0800)]
am
5d5c05de: am
b7a4aed9: am
f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev
# Via Android Git Automerger (2) and others
* commit '
5d5c05dee9911eaf8add2d4298641e60f2a113d5':
Fix DateFormat for layoutlib.
Xavier Ducrohet [Tue, 12 Feb 2013 23:50:16 +0000 (15:50 -0800)]
am
b7a4aed9: am
f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev
# Via Android (Google) Code Review (1) and others
* commit '
b7a4aed94eb02731057fdf78eb7bafc8ececadc9':
Fix DateFormat for layoutlib.
Xavier Ducrohet [Tue, 12 Feb 2013 23:48:07 +0000 (15:48 -0800)]
am
f70b8c1c: Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev
# Via Android (Google) Code Review (1) and Xavier Ducrohet (1)
* commit '
f70b8c1cebbf873031bc92bb6ae3be813830d300':
Fix DateFormat for layoutlib.
Xavier Ducrohet [Tue, 12 Feb 2013 23:44:39 +0000 (23:44 +0000)]
Merge "Fix DateFormat for layoutlib." into jb-mr1.1-dev
Dianne Hackborn [Tue, 12 Feb 2013 23:41:49 +0000 (15:41 -0800)]
Implement issue #
6646859: 4K!!!! 4K!!!! 4K!!!!
Change-Id: Ib05a2eb6a03db50074805a437a3639a7d10684a0
Fabrice Di Meglio [Tue, 12 Feb 2013 23:36:44 +0000 (23:36 +0000)]
Merge "Add BidiFormatter utility"
Jean-Baptiste Queru [Tue, 12 Feb 2013 23:36:24 +0000 (15:36 -0800)]
am
2d130cee: am
c5748148: Merge "Revert "makefile changes for gcm javadocs""
# By Robert Ly
# Via Android Git Automerger (1) and others
* commit '
2d130ceede3dd3af8bcc1d154fb086188c075803':
Revert "makefile changes for gcm javadocs"
Jean-Michel Trivi [Wed, 6 Feb 2013 20:35:07 +0000 (12:35 -0800)]
No AudioFocus for notifications when media played remotely
Don't use AudioFocus when playing a notification when media is
playing remotely. This behavior may be accompanied by
rules in the device's audio policy to not route the notifications
to the remote display.
Bug
7485803
Change-Id: I8b96aa59cace75f6e9a0e73799ef8c75e9ee97aa
Dianne Hackborn [Tue, 12 Feb 2013 23:27:43 +0000 (23:27 +0000)]
Merge "App ops: media ops, set up to be callable from native code."
Jean-Baptiste Queru [Tue, 12 Feb 2013 23:22:06 +0000 (15:22 -0800)]
am
c5748148: Merge "Revert "makefile changes for gcm javadocs""
# By Robert Ly
# Via Gerrit Code Review (1) and Jean-Baptiste Queru (1)
* commit '
c5748148c56e129e7b5cec7fac0921ce7967d054':
Revert "makefile changes for gcm javadocs"
Svetoslav [Tue, 12 Feb 2013 23:04:18 +0000 (23:04 +0000)]
Merge "Adding public event callback instead of the internal one to UiAutomation."
Dianne Hackborn [Tue, 12 Feb 2013 22:59:53 +0000 (14:59 -0800)]
App ops: media ops, set up to be callable from native code.
This is to help implementation of bug #
8181262 and maybe
bug #
8181261
Adds some definition for media ops (though nothing is yet using
them), and re-arranges things a bit so we can implement native
calling in to the app ops service.
Also add some java docs.
Change-Id: I637959745db820e676f23a35a5d2224f51bc6689
Dianne Hackborn [Tue, 12 Feb 2013 23:02:41 +0000 (23:02 +0000)]
Merge "Fix issue #
6595555: deal better with fragmentless headers."
Svetoslav [Tue, 12 Feb 2013 22:56:29 +0000 (14:56 -0800)]
Adding public event callback instead of the internal one to UiAutomation.
It appears that com.android.internal.util.Predicate is in the public
APIs but it is in the internal package. Leaking the predicate APIs is
a mistake and while we cannot fix that, this change is adding legit
public filter interface.
bug:
8183223
Change-Id: I3e2c0ef685d7a832630aaa3ec2e8eae3fb058289
Christopher Tate [Tue, 12 Feb 2013 22:57:58 +0000 (22:57 +0000)]
Merge "For now enable backup/restore DEBUG logs"
Christopher Tate [Tue, 12 Feb 2013 22:57:04 +0000 (14:57 -0800)]
For now enable backup/restore DEBUG logs
Change-Id: I5733251f1e11c8eedb0601ae6751a35134d6419d
Svetoslav [Tue, 12 Feb 2013 22:55:55 +0000 (22:55 +0000)]
Merge "Adding new APIs to UiAutomation."
Irfan Sheriff [Tue, 12 Feb 2013 22:55:11 +0000 (22:55 +0000)]
Merge "Track keys per config and allow cert push from apps"
Stephen Hines [Tue, 12 Feb 2013 22:50:25 +0000 (22:50 +0000)]
Merge "Update RSTest_Compat for stride changes."
Stephen Hines [Tue, 12 Feb 2013 22:47:46 +0000 (22:47 +0000)]
Merge "Check Element in all API levels for copy2DRangeFrom()."
Victoria Lease [Tue, 12 Feb 2013 21:36:22 +0000 (13:36 -0800)]
Count baseGlyphCount once for scripts without typefaces
Characters from complex scripts without dedicated typefaces were
getting baseGlyphCount counted twice: once in shapeFontRun() and
then a second time during SkScalerContext::getNextContext()
chaining.
This was a problem for text runs beginning with full-width Latn
characters - shapeFontRun() would get the base glyph count for
the typeface containing those characters, then realise it had no
typeface specified for the Latn script, resetting the typeface
to default without resetting the base glyph count along with it.
Mojibake full-width Latn characters, ho!
The same issue also affected Cherokee text, which this fix also
addresses.
Bug:
8127795
Bug:
8034351
Change-Id: I058d81cffbbf86426cc3c5aafcc91a76f4fe6b62