OSDN Git Service
Michael Wright [Tue, 12 Mar 2013 02:57:10 +0000 (19:57 -0700)]
Remove unused interface IInputConnectionCallback
Bug:
8276952
Change-Id: I3755df557388bee55f0cc4780adc300672cbe9a1
Jim Miller [Mon, 11 Mar 2013 22:58:33 +0000 (22:58 +0000)]
Merge "Remove unnecessary userid check" into jb-mr2-dev
Eric Laurent [Mon, 11 Mar 2013 22:40:47 +0000 (22:40 +0000)]
Merge "audio service: fix BT SCO intent permission" into jb-mr2-dev
Elliott Hughes [Mon, 11 Mar 2013 22:35:36 +0000 (15:35 -0700)]
am
a45bafc2: am
c9e0cd2a: Merge "Fix DateFormat k and h, and implement K and H for the first time."
* commit '
a45bafc2f025d2ef513f3e3dcac162ba6a95d575':
Fix DateFormat k and h, and implement K and H for the first time.
Elliott Hughes [Mon, 11 Mar 2013 22:27:52 +0000 (15:27 -0700)]
am
c9e0cd2a: Merge "Fix DateFormat k and h, and implement K and H for the first time."
* commit '
c9e0cd2ac7b1df3e60f0ca8bab6a7240bade07d9':
Fix DateFormat k and h, and implement K and H for the first time.
Elliott Hughes [Mon, 11 Mar 2013 22:03:18 +0000 (22:03 +0000)]
Merge "Fix DateFormat k and h, and implement K and H for the first time."
Elliott Hughes [Mon, 11 Mar 2013 21:49:44 +0000 (14:49 -0700)]
Fix DateFormat k and h, and implement K and H for the first time.
Bug:
8359981
Change-Id: I52ef937a77e9e28f2719c2ee6f59e4b74514f0b2
ztenghui [Mon, 11 Mar 2013 21:45:19 +0000 (21:45 +0000)]
Merge "Java API for MediaMuxer" into jb-mr2-dev
Elliott Hughes [Mon, 11 Mar 2013 21:21:17 +0000 (14:21 -0700)]
am
7c1e8dbd: am
21d3f294: Merge "use Calendar in DateUtils format method"
* commit '
7c1e8dbd3159c88df27d24aa2699358ee139d49b':
use Calendar in DateUtils format method
Elliott Hughes [Mon, 11 Mar 2013 21:19:14 +0000 (14:19 -0700)]
am
21d3f294: Merge "use Calendar in DateUtils format method"
* commit '
21d3f294831f7a15c5e746b3dae3e6ec0de883a8':
use Calendar in DateUtils format method
Jim Miller [Mon, 11 Mar 2013 20:54:38 +0000 (13:54 -0700)]
Remove unnecessary userid check
This removes code used to verify the userid's were consistent, which
is no longer needed.
Fixes bug
8167800
Change-Id: I592e4bc1158fb7775bd31ae8a26c1782b60f0fa0
Jeff Sharkey [Mon, 11 Mar 2013 20:25:47 +0000 (20:25 +0000)]
Merge "Handle corrupt RegisteredServicesCache XML." into jb-mr2-dev
Jeff Sharkey [Mon, 11 Mar 2013 20:22:16 +0000 (13:22 -0700)]
Handle corrupt RegisteredServicesCache XML.
Avoid getting stuck in infinite loop.
Bug:
8360183
Change-Id: I81728dcfbc35b456c9166cf5c5175d0a376df56f
Elliott Hughes [Mon, 11 Mar 2013 20:11:20 +0000 (20:11 +0000)]
Merge "use Calendar in DateUtils format method"
Lorenzo Colitti [Mon, 11 Mar 2013 19:33:31 +0000 (19:33 +0000)]
Merge "Unbreak documentation build." into jb-mr2-dev
ztenghui [Wed, 13 Feb 2013 22:07:02 +0000 (14:07 -0800)]
Java API for MediaMuxer
Implement the Java API for MediaMuxer.
bug:
7991013
Change-Id: Ibf3aa256cc1d89f1c7636b74c9fb53073d173636
Lorenzo Colitti [Mon, 11 Mar 2013 19:30:47 +0000 (04:30 +0900)]
Unbreak documentation build.
Change-Id: I1e904b111e23d221dcb5f917201d4c27f0c1c05b
Elliott Hughes [Mon, 11 Mar 2013 18:29:26 +0000 (11:29 -0700)]
am
31bb1dec: am
5b543775: Merge "update preloaded-classes"
* commit '
31bb1dec27c1f8e5c96e52d0a7655a231412376f':
update preloaded-classes
Sungmin Choi [Thu, 28 Feb 2013 11:17:15 +0000 (20:17 +0900)]
use Calendar in DateUtils format method
The DatePickerDialog is using DateUtils to format the dialog's title
and the DateUtils class does not work with dates outside to the
specified range.
For example, if user selects 2038-03-07, DatePickerDialog shows
1902-01-30 on Title.
The reason for the DateUtils class not being able to format dates
outside the range of 1902 and 2036 is because internally it is using
the Time class which does not support such dates.
To fix it, use Calendar class in DataUilts format method.
Steps to reproduce:
1. Settings -> Date & time
2. uncheck Automatic date & time
3. Set Date
4. choose any date before 1902 or after 2037
5. update wrong date on Title
Bug: https://code.google.com/p/android/issues/detail?id=13050
Change-Id: I003266765751b5c340426af84daef271f39f771e
Irfan Sheriff [Mon, 11 Mar 2013 18:19:32 +0000 (18:19 +0000)]
Merge "Fix reconnect/reassociate handling" into jb-mr2-dev
Elliott Hughes [Mon, 11 Mar 2013 17:32:08 +0000 (10:32 -0700)]
am
5b543775: Merge "update preloaded-classes"
* commit '
5b5437752fb2318142a41b6320b00a000575503f':
update preloaded-classes
Lorenzo Colitti [Mon, 11 Mar 2013 17:22:25 +0000 (17:22 +0000)]
Merge "Always specify an interface for host routes." into jb-mr2-dev
Lorenzo Colitti [Mon, 11 Mar 2013 17:18:59 +0000 (17:18 +0000)]
Merge "RouteInfo changes." into jb-mr2-dev
Elliott Hughes [Mon, 11 Mar 2013 16:59:49 +0000 (16:59 +0000)]
Merge "update preloaded-classes"
Sungmin Choi [Sat, 9 Mar 2013 06:19:47 +0000 (15:19 +0900)]
update preloaded-classes
Remove some preloaded-classes and fix typo for deleting log messages
as the followings during booting.
W/Zygote ( 163): Class not found for preloading: android.bluetooth.
BluetoothAudioGateway
W/Zygote ( 163): Class not found for preloading: android.bluetooth.
HeadsetBase
W/Zygote ( 163): Class not found for preloading: undroid.content.Ab
stractThreadedSyncAdapter$SyncThread
Change-Id: Id02e0cccaeb150f48e12d67b2d691df828842e4c
Wink Saville [Mon, 11 Mar 2013 16:46:05 +0000 (16:46 +0000)]
Merge "Add additional message methods." into jb-mr2-dev
Wink Saville [Wed, 6 Mar 2013 21:41:23 +0000 (13:41 -0800)]
Add additional message methods.
Change-Id: Iac96815f7b72bcb3b9c658a24c24e0733e0ea1b0
Selim Gurun [Mon, 11 Mar 2013 16:25:38 +0000 (16:25 +0000)]
Merge "Add a delimiter between scheme and host" into jb-mr2-dev
Irfan Sheriff [Mon, 11 Mar 2013 15:46:06 +0000 (08:46 -0700)]
Fix reconnect/reassociate handling
We are dropping incorrectly when in disconnected state
Bug:
8357624
Change-Id: I8919dcd679da6b5fc6c7f671e243f08e42b91ff3
Michael Jurka [Mon, 11 Mar 2013 11:04:44 +0000 (11:04 +0000)]
Merge "Updating search asset for action bar" into jb-mr2-dev
Jason Sams [Sat, 9 Mar 2013 01:09:12 +0000 (01:09 +0000)]
Merge "Handle onPause in ImageProcessing." into jb-mr2-dev
Lorenzo Colitti [Fri, 8 Mar 2013 20:30:44 +0000 (12:30 -0800)]
Always specify an interface for host routes.
Change-Id: I05b4d87e7d7e8237c6f4a70f1fedae00f416f581
Lorenzo Colitti [Fri, 8 Mar 2013 19:30:39 +0000 (11:30 -0800)]
RouteInfo changes.
- Add the interface name.
- Fix a bug where a default route would match an address of
another protocol (e.g., 0.0.0.0/0 would match 2001::).
- Tweak the hashCode method.
- Write a unit test.
Change-Id: Ida8266de440a9b1d9eaa132f182b9f1ce8978c44
Jason Sams [Sat, 9 Mar 2013 00:35:29 +0000 (16:35 -0800)]
Handle onPause in ImageProcessing.
Change-Id: I538ce0ac7b9da2f4ec6cd7bd35aa84fd710e063f
Elliott Hughes [Sat, 9 Mar 2013 00:21:21 +0000 (16:21 -0800)]
am
2cb314eb: am
e0cd3c19: Merge "Improve DateFormat.format."
* commit '
2cb314ebc7bb6495a94f577dfb57f9e6c56033ef':
Improve DateFormat.format.
Elliott Hughes [Sat, 9 Mar 2013 00:18:42 +0000 (16:18 -0800)]
am
e0cd3c19: Merge "Improve DateFormat.format."
* commit '
e0cd3c19546a00db3db706c6a993fb0e3bd00b3a':
Improve DateFormat.format.
Jim Miller [Sat, 9 Mar 2013 00:09:18 +0000 (00:09 +0000)]
Merge "Fix long-standing bug with LockPatternView drawing artifacts" into jb-mr2-dev
Elliott Hughes [Fri, 8 Mar 2013 23:50:02 +0000 (23:50 +0000)]
Merge "Improve DateFormat.format."
Amith Yamasani [Fri, 8 Mar 2013 23:35:31 +0000 (23:35 +0000)]
Merge "Make account cloning API public" into jb-mr2-dev
Michael Jurka [Fri, 8 Mar 2013 23:33:19 +0000 (00:33 +0100)]
Updating search asset for action bar
Bug:
7599978
Amith Yamasani [Fri, 8 Mar 2013 23:29:55 +0000 (15:29 -0800)]
Make account cloning API public
Change-Id: If48d93dab49afcaaa301a5a3aa514f3d4dd3bab8
Christopher Tate [Fri, 8 Mar 2013 23:26:35 +0000 (23:26 +0000)]
Merge "DO NOT MERGE - Full backup/restore now handles OBBs sensibly" into jb-mr2-dev
Michael Jurka [Fri, 8 Mar 2013 23:16:18 +0000 (23:16 +0000)]
Merge "Do some minor cleanup of SearchView icons" into jb-mr2-dev
Jason Sams [Fri, 8 Mar 2013 23:15:34 +0000 (23:15 +0000)]
Merge "Fix typo" into jb-mr2-dev
Jason Sams [Fri, 8 Mar 2013 23:13:45 +0000 (23:13 +0000)]
Merge "Update IP_JB to Mr1" into jb-mr2-dev
Christopher Tate [Tue, 19 Feb 2013 22:08:59 +0000 (14:08 -0800)]
DO NOT MERGE - Full backup/restore now handles OBBs sensibly
OBB backup/ restore is no longer handled within the target app
process. This is done to avoid having to require that OBB-using
apps have full read/write permission for external storage.
The new OBB backup service is a new component running in the
same app as the already-existing shared storage backup agent.
The backup infrastructure delegates backup/restore of apps'
OBB contents to this component (because the system process
may not itself read/write external storage).
From the command line, OBB backup is enabled by using new
-obb / -noobb flags with adb backup. The default is noobb.
Finally, a couple of nit fixes:
- buffer-size mismatch between the writer and reader of chunked
file data has been corrected; now the reading side won't be
issuing an extra pipe read per chunk.
- bu now explicitly closes the transport socket fd after
adopting it. This was benign but triggered a logged
warning about leaked fds.
(Cherrypicked)
Change-Id: I471f6348abcccb7bf1e1710b7beda9f23de53e14
Elliott Hughes [Fri, 8 Mar 2013 23:06:14 +0000 (15:06 -0800)]
Improve DateFormat.format.
Add support for the 'c' format character, required in many non-English locales.
Reimplement 'c' and 'E', and 'L' and 'M', so they correctly interpret 5-count
pattern characters.
Replace the old incorrect class documentation with a pointer to the
well-maintained libcore equivalent and the Unicode UTS to which these two
implementations are supposed to conform.
Deprecate the useless constants for pattern characters. No one sane is going
to write MONTH + MONTH + MONTH + MONTH instead of "MMMM".
Correct the documentation for getLongDateFormat and getMediumDateFormat.
Also fix DateUtils.getStandaloneMonthString for LENGTH_SHORTEST.
Tests are in https://android-review.googlesource.com/53291.
Change-Id: I4dda8b18070f05ccdc11c1f0a9381a9d233db4e8
Elliott Hughes [Fri, 8 Mar 2013 22:44:40 +0000 (14:44 -0800)]
am
bf8a663c: am
3f7a4990: Merge "Improve the Resource.getQuantityString/getQuantityText documentation."
* commit '
bf8a663c53454f8b8cd7e07344316981022efa10':
Improve the Resource.getQuantityString/getQuantityText documentation.
Jason Sams [Fri, 8 Mar 2013 22:34:04 +0000 (22:34 +0000)]
Merge "Update IP and IP2" into jb-mr2-dev
Jason Sams [Fri, 8 Mar 2013 22:32:43 +0000 (14:32 -0800)]
Fix typo
Change-Id: I4e4d3aec62d1400f90a10802148ef875b5a268ef
Jason Sams [Fri, 8 Mar 2013 22:31:15 +0000 (14:31 -0800)]
Update IP_JB to Mr1
Change-Id: I007b5048a187c90bc19c38e7155d0d5adcc34144
Selim Gurun [Fri, 8 Mar 2013 22:23:00 +0000 (14:23 -0800)]
Add a delimiter between scheme and host
Bug:
6923539
Change-Id: I49aac145e8e80a5af7475cfe93ef4a353d2d3fe6
Fabrice Di Meglio [Fri, 8 Mar 2013 22:25:24 +0000 (22:25 +0000)]
Merge "Fix bug #
8058390 Space is required after the battery sign in the RTL locales" into jb-mr2-dev
Fabrice Di Meglio [Fri, 8 Mar 2013 22:05:28 +0000 (14:05 -0800)]
Fix bug #
8058390 Space is required after the battery sign in the RTL locales
- fix remaining left/right properties that needed to be start/end properties
Change-Id: Iaa5090c2ad256e378313f164e2388f42428e5700
Jason Sams [Fri, 8 Mar 2013 22:00:27 +0000 (14:00 -0800)]
Update IP and IP2
Change-Id: I5e81ae906a36fc1f6dc8de872398c6aa580238f1
Elliott Hughes [Fri, 8 Mar 2013 21:59:59 +0000 (13:59 -0800)]
am
3f7a4990: Merge "Improve the Resource.getQuantityString/getQuantityText documentation."
* commit '
3f7a49904cef7ea14808590b63b115a4381537a1':
Improve the Resource.getQuantityString/getQuantityText documentation.
Svetoslav [Fri, 8 Mar 2013 20:43:15 +0000 (12:43 -0800)]
[DO NOT MERGE] DatePickerDialog title initially incorrect if calendar view shown.
If the calendar view of the date picker dialog is shown we
do not use a formatted date as the dialog title since the
calendar view shows it, instead we show a static "Set date"
title. However, the initial state of the date picker dialog
on a tablet has a formatted date since the date picker widget
does not do a correct check whether the calendar view is shown
which returns a false negative resulting in a title with a
formatted date being added since the dialog thinks it has no
calendar view.
Change-Id: Ibf4c433b34ab1ee1bc1dc386689664a32283fb6a
Elliott Hughes [Fri, 8 Mar 2013 21:18:34 +0000 (21:18 +0000)]
Merge "Improve the Resource.getQuantityString/getQuantityText documentation."
Selim Gurun [Fri, 8 Mar 2013 19:50:43 +0000 (19:50 +0000)]
Merge "Revert "Add a delimiter between scheme and host"" into jb-mr2-dev
Elliott Hughes [Fri, 8 Mar 2013 19:49:24 +0000 (11:49 -0800)]
am
ac071e36: am
0c25ecfd: Merge "Use getRelativeDayString in getRelativeTimeSpanString."
* commit '
ac071e36aecd47a453641074e81c5ebcf888dd82':
Use getRelativeDayString in getRelativeTimeSpanString.
Selim Gurun [Fri, 8 Mar 2013 19:49:18 +0000 (19:49 +0000)]
Revert "Add a delimiter between scheme and host"
This reverts commit
e990e359f99a9e791106d4eefa046bdff8e22e6d
Change-Id: I2007f04295a5d3b24e281c5823b144ab2782adb7
Elliott Hughes [Fri, 8 Mar 2013 19:47:39 +0000 (11:47 -0800)]
am
0c25ecfd: Merge "Use getRelativeDayString in getRelativeTimeSpanString."
* commit '
0c25ecfd43235340c9b6bf5b640232138a217836':
Use getRelativeDayString in getRelativeTimeSpanString.
Romain Guy [Fri, 8 Mar 2013 19:30:00 +0000 (19:30 +0000)]
Merge "Move blur code from FontRenderer to utils/Blur.cpp" into jb-mr2-dev
Romain Guy [Fri, 8 Mar 2013 19:28:22 +0000 (11:28 -0800)]
Move blur code from FontRenderer to utils/Blur.cpp
Change-Id: I2cebbfbcb722ed4b37e54ffbf8b53bb92ad0c964
Elliott Hughes [Fri, 8 Mar 2013 19:26:57 +0000 (11:26 -0800)]
Improve the Resource.getQuantityString/getQuantityText documentation.
Natural languages differ so much and in such odd ways that you can't
use getQuantityString as an "if" statement. It's really just for grammaticality.
This is explained well in
http://developer.android.com/guide/topics/resources/string-resource.html#Plurals
but we need to make more of an effort to motivate people to read that, and to
at least get the most important point across if they don't read it.
Change-Id: I549b9f3563462c45f2dea34c558185e0714127cd
Selim Gurun [Wed, 6 Mar 2013 23:30:24 +0000 (15:30 -0800)]
Add a delimiter between scheme and host
Bug:
6923539
Change-Id: Id5bbf44c90f9d0d5a468f3be3aa3e009a2ad3687
Elliott Hughes [Fri, 8 Mar 2013 18:39:47 +0000 (18:39 +0000)]
Merge "Use getRelativeDayString in getRelativeTimeSpanString."
Andy McFadden [Fri, 8 Mar 2013 17:51:24 +0000 (17:51 +0000)]
Merge "Tweak comment." into jb-mr2-dev
Michael Jurka [Fri, 8 Mar 2013 13:59:08 +0000 (14:59 +0100)]
Do some minor cleanup of SearchView icons
Making one asset sharper, and deleting an unused
asset
Bug:
7599978
Jim Miller [Fri, 8 Mar 2013 02:44:32 +0000 (18:44 -0800)]
Fix long-standing bug with LockPatternView drawing artifacts
Moving very slowly in LockPatternView would often draw discontinuous
lines and have missing wedges in the pattern rings.
This fixes the problem by correctly accounting for the invalidate
region. The invalidate region is constrained to the last registered
pattern cell and the current point. When a new pattern cell is added,
the bounding region expands to refresh it once.
Fixes bug
8315830
Change-Id: I72342535ae292fcadb02d96b89665ba8431886b2
Christopher Tate [Fri, 8 Mar 2013 02:03:25 +0000 (02:03 +0000)]
Merge "Do not hang in pm clear on an invalid package name" into jb-mr2-dev
Andy McFadden [Fri, 8 Mar 2013 01:56:40 +0000 (17:56 -0800)]
Tweak comment.
Change-Id: Ic99fefde512fa3a5b1fca2bc65cd37c8170e7f2c
Christopher Tate [Fri, 8 Mar 2013 01:50:11 +0000 (17:50 -0800)]
Do not hang in pm clear on an invalid package name
The Activity Manager was not properly informing the observer that
the operation had concluded (unsuccessfully).
Bug
8222595
Change-Id: I8234e32d8edf4112c8c7a5e20e341d0b41e23014
Andy McFadden [Fri, 8 Mar 2013 01:50:00 +0000 (01:50 +0000)]
Merge "Publish new MediaCodec API" into jb-mr2-dev
Eric Laurent [Fri, 8 Mar 2013 01:29:27 +0000 (17:29 -0800)]
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
Adam Powell [Fri, 8 Mar 2013 01:05:51 +0000 (01:05 +0000)]
Merge "Make View#computeOpaqueFlags recognize OUTSIDE_OVERLAY scrollbars" into jb-mr2-dev
Romain Guy [Fri, 8 Mar 2013 01:04:03 +0000 (01:04 +0000)]
Merge "Don't apply scale to glyphs when a perspective is set. Bug #
8337925" into jb-mr2-dev
Romain Guy [Fri, 8 Mar 2013 01:01:05 +0000 (17:01 -0800)]
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
Elliott Hughes [Fri, 8 Mar 2013 00:46:55 +0000 (16:46 -0800)]
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
Scott Main [Fri, 8 Mar 2013 00:27:17 +0000 (16:27 -0800)]
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
Scott Main [Fri, 8 Mar 2013 00:25:49 +0000 (16:25 -0800)]
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
Scott Main [Fri, 8 Mar 2013 00:24:41 +0000 (16:24 -0800)]
am
b3d07573: am
49e3d6ba: am
d55091f6: change devbytes playlist order to reverse playlist order
* commit '
b3d07573617656e6008466d01dfb5aebbd7568ba':
change devbytes playlist order to reverse playlist order
Scott Main [Fri, 8 Mar 2013 00:23:26 +0000 (16:23 -0800)]
am
49e3d6ba: am
d55091f6: change devbytes playlist order to reverse playlist order
* commit '
49e3d6baf55098b8de07cd6a4585ea0984f86d16':
change devbytes playlist order to reverse playlist order
Scott Main [Fri, 8 Mar 2013 00:20:23 +0000 (16:20 -0800)]
am
d55091f6: change devbytes playlist order to reverse playlist order
* commit '
d55091f6fdec4bb42e2f922369dfa19f8993be8d':
change devbytes playlist order to reverse playlist order
Scott Main [Fri, 8 Mar 2013 00:17:06 +0000 (16:17 -0800)]
change devbytes playlist order to reverse playlist order
Change-Id: Ic6f91cf6adc3999ff4c6394f652a7ef4e2fc3c22
Elliott Hughes [Thu, 7 Mar 2013 23:41:14 +0000 (15:41 -0800)]
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.
Elliott Hughes [Thu, 7 Mar 2013 23:39:46 +0000 (15:39 -0800)]
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.
Elliott Hughes [Thu, 7 Mar 2013 23:24:40 +0000 (23:24 +0000)]
Merge "Explain why the frameworks/base DateUtilsTest isn't merged with CTS' DateUtilsTest."
Martijn Coenen [Thu, 7 Mar 2013 23:05:40 +0000 (23:05 +0000)]
Merge "Update NfcBarcode documentation for Kovio." into jb-mr2-dev
Martijn Coenen [Tue, 11 Dec 2012 01:16:58 +0000 (17:16 -0800)]
Update NfcBarcode documentation for Kovio.
Change-Id: I4b6a452805c3dd68247dbe5493db14a263729615
Fabrice Di Meglio [Thu, 7 Mar 2013 22:49:38 +0000 (22:49 +0000)]
Merge "Fix bug #
8217354 Suspicious behavior in RTL support for a RelativeLayout" into jb-mr2-dev
Elliott Hughes [Thu, 7 Mar 2013 22:30:17 +0000 (14:30 -0800)]
Explain why the frameworks/base DateUtilsTest isn't merged with CTS' DateUtilsTest.
Change-Id: Icbdb4e9133a9ae1c1b37f822367e1ac86e9e36cb
Andy McFadden [Wed, 6 Mar 2013 22:26:34 +0000 (14:26 -0800)]
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
Scott Kennedy [Thu, 7 Mar 2013 22:14:18 +0000 (22:14 +0000)]
Merge "Specify the size of the Map in the constructor" into jb-mr2-dev
Jeff Brown [Thu, 7 Mar 2013 21:21:13 +0000 (13:21 -0800)]
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
Daniel Sandler [Thu, 7 Mar 2013 20:46:09 +0000 (20:46 +0000)]
Merge "Properly support USER_ALL in notification listener API." into jb-mr2-dev
Adam Powell [Thu, 7 Mar 2013 01:45:45 +0000 (17:45 -0800)]
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
Scott Main [Thu, 7 Mar 2013 20:21:38 +0000 (12:21 -0800)]
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
Scott Main [Thu, 7 Mar 2013 20:21:35 +0000 (12:21 -0800)]
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
Trevor Johns [Thu, 7 Mar 2013 20:21:33 +0000 (12:21 -0800)]