101638 Commits

Author SHA1 Message Date
Andy McFadden
dd3e75fa6b Merge "Publish new MediaCodec API" into jb-mr2-dev 2013-03-08 01:50:00 +00:00
Eric Laurent
2a57ca931f audio service: fix BT SCO intent permission
Clear calling identity before calling BluetoothHeadset
methods from binder call.
Also send BT SCO audio state intents from the
message handler, not from binder calls.

Bug 8242429

Change-Id: I742ba8dc47a258dbee6fb9d57db302f2bffaafd7
2013-03-07 17:29:27 -08:00
Adam Powell
15061d747d Merge "Make View#computeOpaqueFlags recognize OUTSIDE_OVERLAY scrollbars" into jb-mr2-dev 2013-03-08 01:05:51 +00:00
Stephen Hines
8b571d8577 Update RSTest_v14 for stride changes.
Change-Id: I8c5d392ba62050781f27c3a1745dbd1a2321b556
2013-03-07 17:04:27 -08:00
Romain Guy
e526a5b946 Merge "Don't apply scale to glyphs when a perspective is set. Bug #8337925" into jb-mr2-dev 2013-03-08 01:04:04 +00:00
Romain Guy
b09f147126 Don't apply scale to glyphs when a perspective is set.
Bug #8337925

Magazines uses very large scale factors that blow up font cache & CPU.

Change-Id: I1c0ed430ed91b86cc6c6f59f7e8bdcc89a464e46
2013-03-07 17:03:25 -08:00
Elliott Hughes
5acc6e5214 Use getRelativeDayString in getRelativeTimeSpanString.
The bug we're fixing here is that languages that don't
distinguish the "one" case grammatically (such as Japanese)
would say the equivalent of "In 1 day" rather than "Tomorrow"
because of the misuse of getQuantityString.

This has the side-effect of switching us over to the CLDR
strings for relative day names, which have consistent capitalization;
the Android donottranslate-cldr.xml strings varied even within
a language, so although this is a change, it seems like a step
in the right direction.

In a future change, we should actually push all relative
day formatting down into icu4c.

Bug: 7098707
Change-Id: Ia2f9af3d18c441d6093dd5da7956a3d0130e5b06
2013-03-07 16:46:55 -08:00
Scott Main
a2dba054b6 am d9cdde94: am 6d3943b6: am b3d07573: am 49e3d6ba: am d55091f6: change devbytes playlist order to reverse playlist order
* commit 'd9cdde94f3139fac59eb6da73ae9dc53661628d8':
  change devbytes playlist order to reverse playlist order
2013-03-07 16:27:17 -08:00
Scott Main
d9cdde94f3 am 6d3943b6: am b3d07573: am 49e3d6ba: am d55091f6: change devbytes playlist order to reverse playlist order
* commit '6d3943b69d5b766e94a12a8249fcd268d0337c2f':
  change devbytes playlist order to reverse playlist order
2013-03-07 16:25:49 -08:00
Scott Main
6d3943b69d am b3d07573: am 49e3d6ba: am d55091f6: change devbytes playlist order to reverse playlist order
* commit 'b3d07573617656e6008466d01dfb5aebbd7568ba':
  change devbytes playlist order to reverse playlist order
2013-03-07 16:24:41 -08:00
Scott Main
b3d0757361 am 49e3d6ba: am d55091f6: change devbytes playlist order to reverse playlist order
* commit '49e3d6baf55098b8de07cd6a4585ea0984f86d16':
  change devbytes playlist order to reverse playlist order
2013-03-07 16:23:26 -08:00
Scott Main
49e3d6baf5 am d55091f6: change devbytes playlist order to reverse playlist order
* commit 'd55091f6fdec4bb42e2f922369dfa19f8993be8d':
  change devbytes playlist order to reverse playlist order
2013-03-07 16:20:23 -08:00
Scott Main
d55091f6fd change devbytes playlist order to reverse playlist order
Change-Id: Ic6f91cf6adc3999ff4c6394f652a7ef4e2fc3c22
2013-03-07 16:17:06 -08:00
Elliott Hughes
09ed05ceae am 4a1bd464: am d0d1be2d: Merge "Explain why the frameworks/base DateUtilsTest isn\'t merged with CTS\' DateUtilsTest."
* commit '4a1bd4640c5e915ed1ebd320a515725e31992545':
  Explain why the frameworks/base DateUtilsTest isn't merged with CTS' DateUtilsTest.
2013-03-07 15:41:14 -08:00
Elliott Hughes
4a1bd4640c am d0d1be2d: Merge "Explain why the frameworks/base DateUtilsTest isn\'t merged with CTS\' DateUtilsTest."
* commit 'd0d1be2d27af35fe7553835ee8c411fd13d1c8d7':
  Explain why the frameworks/base DateUtilsTest isn't merged with CTS' DateUtilsTest.
2013-03-07 15:39:46 -08:00
Elliott Hughes
d0d1be2d27 Merge "Explain why the frameworks/base DateUtilsTest isn't merged with CTS' DateUtilsTest." 2013-03-07 23:24:40 +00:00
Martijn Coenen
cbe9f48c25 Merge "Update NfcBarcode documentation for Kovio." into jb-mr2-dev 2013-03-07 23:05:40 +00:00
Martijn Coenen
7a6dfb2f72 Update NfcBarcode documentation for Kovio.
Change-Id: I4b6a452805c3dd68247dbe5493db14a263729615
2013-03-07 15:04:41 -08:00
Fabrice Di Meglio
617283c3c0 Merge "Fix bug #8217354 Suspicious behavior in RTL support for a RelativeLayout" into jb-mr2-dev 2013-03-07 22:49:38 +00:00
Elliott Hughes
025148cc4d Explain why the frameworks/base DateUtilsTest isn't merged with CTS' DateUtilsTest.
Change-Id: Icbdb4e9133a9ae1c1b37f822367e1ac86e9e36cb
2013-03-07 14:30:17 -08:00
Andy McFadden
34f17dd1f6 Publish new MediaCodec API
Un-hide two new methods in MediaCodec, one new constant, and a new
EGL extension.

Bug 7991062
Bug 8191230

Change-Id: I028669132d9ffda1e4b34a561bab3997bbd7dae5
2013-03-07 14:20:46 -08:00
Scott Kennedy
b1b6efd082 Merge "Specify the size of the Map in the constructor" into jb-mr2-dev 2013-03-07 22:14:18 +00:00
Daniel Sandler
23d7c70032 Accumulate updates to notifications before archiving.
By only adding notifications to the archive when they are
removed we batch up multiple updates and only store the
final version. Some data is lost in this process, but we
save tons of memory storing otherwise redundant /
uninteresting data (e.g. each step of a download).

Change-Id: I008afefc1242bb7c433d45da2c36fcc626dd3706
2013-03-07 16:32:06 -05:00
Jeff Brown
3afc18af2c Enhance MediaRouter API.
The support library MediaRouter implementation needs a couple
of extra generally useful APIs in the platform MediaRouter to ensure
that it can safely synchronize its state.

Change-Id: I72c5652e10f3b6de48800abfa922affbefbd250f
2013-03-07 13:26:40 -08:00
Daniel Sandler
9f3443c55c Merge "Properly support USER_ALL in notification listener API." into jb-mr2-dev 2013-03-07 20:46:09 +00:00
Adam Powell
f158b52e20 Make View#computeOpaqueFlags recognize OUTSIDE_OVERLAY scrollbars
While the inset scrollbars may change padding and how backgrounds are
drawn such that an otherwise opaque view is no longer opaque. However,
OUTSIDE_OVERLAY scrollbars don't change the padding and should not
affect the determination of opacity.

Change-Id: I8c0c1408aeb540813de3351f0c0d1ad12ba5919c
2013-03-07 12:40:04 -08:00
Scott Main
1f33ebd41d am 4147f866: am 69a98134: am 2da55bd9: am b4d42b02: am 6f6b20d9: Merge "fix rounding errors in dashboard data" into jb-mr1.1-docs
* commit '4147f86699fc0db2fec2e26f339b46e70d2027b4':
  fix rounding errors in dashboard data
2013-03-07 12:21:38 -08:00
Scott Main
2f72454345 am baea90dd: am 77560a3d: am 08664441: am 4ce887bd: am 3378c90a: Merge "update google io banner graphic" into jb-mr1.1-docs
* commit 'baea90ddf50b34f6f49f2ae362a416a5e055d391':
  update google io banner graphic
2013-03-07 12:21:35 -08:00
Trevor Johns
5c562c1154 am f9f02831: am 03740d22: am 2d6f8185: am df4fd7ba: am 34418be0: am 58a54cb3: [docs] Fix issue #8288695: Typo in OAuth2 training
* commit 'f9f0283109b8cc0e4373000cbf5333d98f508e79':
2013-03-07 12:21:33 -08:00
Trevor Johns
3389e19e94 am c19b8661: am ef631700: am b02ca5ef: am 0c9f413b: am 58a54cb3: [docs] Fix issue #8288695: Typo in OAuth2 training
* commit 'c19b86615869c9d3904ac2e7fea72cefd5818150':
  [docs] Fix issue #8288695: Typo in OAuth2 training
2013-03-07 12:21:29 -08:00
Robert Greenwalt
ccca3f39b3 Merge "Revert "Add default route constants to RouteInfo."" into jb-mr2-dev 2013-03-07 20:12:54 +00:00
Robert Greenwalt
7316cd83db Revert "Add default route constants to RouteInfo."
This reverts commit 642eb63a65b58fb31635f264fc8ffe44fdf075c5

Change-Id: Ide6d7f3b935da41477b736ef0ef20ec9872563e1
2013-03-07 20:11:18 +00:00
Lorenzo Colitti
e33f43669f Merge "Add default route constants to RouteInfo." into jb-mr2-dev 2013-03-07 20:01:46 +00:00
Scott Main
4147f86699 am 69a98134: am 2da55bd9: am b4d42b02: am 6f6b20d9: Merge "fix rounding errors in dashboard data" into jb-mr1.1-docs
* commit '69a981342c620b829a4fe09c767a3eb50fbd2464':
  fix rounding errors in dashboard data
2013-03-07 11:49:34 -08:00
Scott Main
baea90ddf5 am 77560a3d: am 08664441: am 4ce887bd: am 3378c90a: Merge "update google io banner graphic" into jb-mr1.1-docs
* commit '77560a3d6e9b37c16f346b98bbe618834a24d6a2':
  update google io banner graphic
2013-03-07 11:49:31 -08:00
Trevor Johns
f9f0283109 am 03740d22: am 2d6f8185: am df4fd7ba: am 34418be0: am 58a54cb3: [docs] Fix issue #8288695: Typo in OAuth2 training
* commit '03740d228396bbbbcdc1589bdd997280f3b428f1':
2013-03-07 11:49:28 -08:00
Trevor Johns
c19b866158 am ef631700: am b02ca5ef: am 0c9f413b: am 58a54cb3: [docs] Fix issue #8288695: Typo in OAuth2 training
* commit 'ef631700eb26a47820eeab2b2450dcfb4213af5c':
  [docs] Fix issue #8288695: Typo in OAuth2 training
2013-03-07 11:49:26 -08:00
Scott Main
69a981342c am 2da55bd9: am b4d42b02: am 6f6b20d9: Merge "fix rounding errors in dashboard data" into jb-mr1.1-docs
* commit '2da55bd9ec4cf3a6f68f7a37f973cc2b28f71ac5':
  fix rounding errors in dashboard data
2013-03-07 11:45:49 -08:00
Scott Main
77560a3d6e am 08664441: am 4ce887bd: am 3378c90a: Merge "update google io banner graphic" into jb-mr1.1-docs
* commit '086644416623741c0aad4a65b2c7c135fb1ef20b':
  update google io banner graphic
2013-03-07 11:45:46 -08:00
Trevor Johns
03740d2283 am 2d6f8185: am df4fd7ba: am 34418be0: am 58a54cb3: [docs] Fix issue #8288695: Typo in OAuth2 training
* commit '2d6f81852c685abe423ce249359b019a2f2f9dc1':
2013-03-07 11:45:44 -08:00
Trevor Johns
ef631700eb am b02ca5ef: am 0c9f413b: am 58a54cb3: [docs] Fix issue #8288695: Typo in OAuth2 training
* commit 'b02ca5efd995f167ccd90fc56572033e88b57032':
  [docs] Fix issue #8288695: Typo in OAuth2 training
2013-03-07 11:45:41 -08:00
Scott Main
2da55bd9ec am b4d42b02: am 6f6b20d9: Merge "fix rounding errors in dashboard data" into jb-mr1.1-docs
* commit 'b4d42b0247576b9ad08600080f5fcec1aecb116f':
  fix rounding errors in dashboard data
2013-03-07 11:42:49 -08:00
Scott Main
0866444166 am 4ce887bd: am 3378c90a: Merge "update google io banner graphic" into jb-mr1.1-docs
* commit '4ce887bdca72478c998baab0f7f85b7ea84d7ba9':
  update google io banner graphic
2013-03-07 11:42:47 -08:00
Trevor Johns
2d6f81852c am df4fd7ba: am 34418be0: am 58a54cb3: [docs] Fix issue #8288695: Typo in OAuth2 training
* commit 'df4fd7baf80e9cb1b86d358957f1df26cac6aba3':
2013-03-07 11:42:39 -08:00
Trevor Johns
b02ca5efd9 am 0c9f413b: am 58a54cb3: [docs] Fix issue #8288695: Typo in OAuth2 training
* commit '0c9f413b898341e2d20ae6045ce0f71e39cf97a4':
  [docs] Fix issue #8288695: Typo in OAuth2 training
2013-03-07 11:42:36 -08:00
Lorenzo Colitti
642eb63a65 Add default route constants to RouteInfo.
Bug: 8276725
Change-Id: I9c3ad7393430de9275f5b1c0189a94e5a27975fc
2013-03-07 11:08:08 -08:00
Daniel Sandler
21ca44d67b Properly support USER_ALL in notification listener API.
Listeners should be notified for any notification if they
register for USER_ALL, or for any notification posted to
USER_ALL.

Bug: 8328357
Change-Id: Ib5024d41287090d1a390539a015d8cb4dfa854a7
2013-03-07 14:01:22 -05:00
Romain Guy
e30f16df47 Merge "Round scale factors to rasterize text" into jb-mr2-dev 2013-03-07 17:53:52 +00:00
Scott Main
b4d42b0247 am 6f6b20d9: Merge "fix rounding errors in dashboard data" into jb-mr1.1-docs
* commit '6f6b20d9675711ef5ff7e776bc5542688d77d144':
  fix rounding errors in dashboard data
2013-03-07 08:55:50 -08:00
Scott Main
6f6b20d967 Merge "fix rounding errors in dashboard data" into jb-mr1.1-docs 2013-03-07 16:52:14 +00:00