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
ef681b7f19
am e33f4366: Merge "Add default route constants to RouteInfo." into jb-mr2-dev
...
* commit 'e33f43669f4f610483062b85cd117e76cbd6ce80':
Add default route constants to RouteInfo.
2013-03-07 20:04:06 +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
9a4f0ee617
am e30f16df: Merge "Round scale factors to rasterize text" into jb-mr2-dev
...
* commit 'e30f16df473a3323b19615f5f2ab2dd670a438da':
Round scale factors to rasterize text
2013-03-07 17:56:56 +00:00
Romain Guy
e30f16df47
Merge "Round scale factors to rasterize text" into jb-mr2-dev
2013-03-07 17:53:52 +00:00
Mathias Agopian
b3a41d4427
am 098b3ba5: Merge "fix JNI use of incStrong/decStrong" into jb-mr2-dev
...
* commit '098b3ba5ef6e472b419c83b5e1d7c79bce05f2f5':
fix JNI use of incStrong/decStrong
2013-03-07 17:30:59 +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
Scott Main
4ce887bdca
am 3378c90a: Merge "update google io banner graphic" into jb-mr1.1-docs
...
* commit '3378c90a09079af9f3f3bd8f9176413aa8644f48':
update google io banner graphic
2013-03-07 08:50:23 -08:00
Scott Main
3378c90a09
Merge "update google io banner graphic" into jb-mr1.1-docs
2013-03-07 16:46:38 +00:00
Scott Main
9b0d5dcd7a
fix rounding errors in dashboard data
...
Change-Id: Ifc65072e95f2bf761fd947231c8512d432f55e24
2013-03-07 08:26:57 -08:00
Mathias Agopian
098b3ba5ef
Merge "fix JNI use of incStrong/decStrong" into jb-mr2-dev
2013-03-07 04:52:01 +00:00
Scott Main
7c063b2f42
update google io banner graphic
...
Change-Id: I20e2b8472f384b4e60d64c412ec226dc1b2aaa44
2013-03-06 19:44:27 -08:00
Romain Guy
8afce816df
Round scale factors to rasterize text
...
Harder, better, faster, stronger.
Change-Id: Iee4125de98c4e61603f56bb7f06002cc86458214
2013-03-06 19:09:59 -08:00
Baligh Uddin
8b0cdba3d1
am 7409c9d5: Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
...
* commit '7409c9d5a2add03b330e2535c89324127f2b3fcb':
Import translations. DO NOT MERGE
2013-03-07 03:03:49 +00:00
Baligh Uddin
7409c9d5a2
Merge "Import translations. DO NOT MERGE" into jb-mr2-dev
2013-03-07 02:59:20 +00:00
Mathias Agopian
b1d90c8f60
fix JNI use of incStrong/decStrong
...
Change-Id: Ia11b404dea483dc19bbc30f4d7bcff516655e180
2013-03-06 17:48:20 -08:00
Santos Cordon
c6d1cba4f0
am e20891e4: Merge "Additional context for sip address types." into jb-mr2-dev
...
* commit 'e20891e4ccdbedc5af9cd94b2fc368dce43c96fb':
Additional context for sip address types.
2013-03-07 01:14:50 +00:00
Santos Cordon
e20891e4cc
Merge "Additional context for sip address types." into jb-mr2-dev
2013-03-07 01:12:40 +00:00
Trevor Johns
df4fd7baf8
am 34418be0: am 58a54cb3: [docs] Fix issue #8288695 : Typo in OAuth2 training
...
* commit '34418be01049ea81312d2e821ec6a8919b617540':
2013-03-06 17:06:24 -08:00
Trevor Johns
34418be010
am 58a54cb3: [docs] Fix issue #8288695 : Typo in OAuth2 training
...
* commit '58a54cb3805e219b2d0a76cd8b9df9b33e41e0d0':
[docs] Fix issue #8288695 : Typo in OAuth2 training
2013-03-06 17:03:02 -08:00
Trevor Johns
0c9f413b89
am 58a54cb3: [docs] Fix issue #8288695 : Typo in OAuth2 training
...
* commit '58a54cb3805e219b2d0a76cd8b9df9b33e41e0d0':
[docs] Fix issue #8288695 : Typo in OAuth2 training
2013-03-06 17:02:55 -08:00
Jeff Sharkey
73a3754c67
am 4861966c: Merge "ArrayUtils.indexOf(), containsAll() with tests." into jb-mr2-dev
...
* commit '4861966cb23e2800efaf74a4780d289e00513b12':
ArrayUtils.indexOf(), containsAll() with tests.
2013-03-07 00:43:28 +00:00
Jeff Sharkey
4861966cb2
Merge "ArrayUtils.indexOf(), containsAll() with tests." into jb-mr2-dev
2013-03-07 00:40:50 +00:00
Dianne Hackborn
6fea1665a9
am 1ab64b81: Merge "Add new sample code for writing a ViewGroup." into jb-mr2-dev
...
* commit '1ab64b819ba3d4b974e63fcae5d21bb73ba5a6a6':
Add new sample code for writing a ViewGroup.
2013-03-07 00:38:44 +00:00
Dianne Hackborn
1ab64b819b
Merge "Add new sample code for writing a ViewGroup." into jb-mr2-dev
2013-03-07 00:34:55 +00:00
Santos Cordon
a05dd8e5e2
Additional context for sip address types.
...
bug: 7285478
Change-Id: I18eb050cbf54ae535b5403e927d352642d726d30
2013-03-06 16:32:53 -08:00
Jeff Sharkey
94c91dca55
ArrayUtils.indexOf(), containsAll() with tests.
...
Change-Id: I040164d4e45126e4a6c1df54bd114f47951da560
2013-03-06 16:28:36 -08:00
Jeff Sharkey
768c5c4d9d
am 18dd9b94: Merge "Use enabled/enabledSetting from PackageParser." into jb-mr2-dev
...
* commit '18dd9b94150bf8960314aa52f2f05e31fd9a7432':
Use enabled/enabledSetting from PackageParser.
2013-03-06 23:31:00 +00:00
Jeff Sharkey
18dd9b9415
Merge "Use enabled/enabledSetting from PackageParser." into jb-mr2-dev
2013-03-06 23:24:56 +00:00
Jeff Sharkey
94d7ddb4b5
Use enabled/enabledSetting from PackageParser.
...
PackageParser.updateApplicationInfo() has already interpreted the
various COMPONENT_ENABLED flags for us, no need to clobber them.
Bug: 8331767
Change-Id: If1363c5651a2f0326ee60e92517cfc0e6f256699
2013-03-06 15:10:57 -08:00
Michael Jurka
469007092f
am 5b532abd: Merge "Fix bug where Recents wasn\'t always properly updated" into jb-mr2-dev
...
* commit '5b532abdc21eba53b41f50010ff773960ed53796':
Fix bug where Recents wasn't always properly updated
2013-03-06 22:57:59 +00:00
Michael Jurka
5b532abdc2
Merge "Fix bug where Recents wasn't always properly updated" into jb-mr2-dev
2013-03-06 22:52:39 +00:00
Trevor Johns
58a54cb380
[docs] Fix issue #8288695 : Typo in OAuth2 training
...
There's a typo in the "Authenticating to OAuth2 Services" training
class, under "Request an Auth Token... Again" (#RequestAgain).
The call to result.get() will fail, because AccountManagerFuture
doesn't support this method. Instead, getResult() needs to be
called first.
Change-Id: Ia25b9364cd14180cf7ddac50057a2ec03e01ed1f
2013-03-06 14:46:47 -08:00
Michael Jurka
0e7757b6a1
Fix bug where Recents wasn't always properly updated
...
Also fix bug where icons were sometimes missing
Change-Id: I98fb30242e0f1bbe4f3088b350bd808cd9c3ae67
2013-03-06 23:29:46 +01:00
Michael Jurka
497c3affe1
am 4aab3c8a: Merge "Fix Recents in RTL/landscape mode" into jb-mr2-dev
...
* commit '4aab3c8a78b492a679cc29037b544b4a5c97cf72':
Fix Recents in RTL/landscape mode
2013-03-06 22:17:15 +00:00