OSDN Git Service
Scott Main [Mon, 5 Mar 2012 18:06:04 +0000 (10:06 -0800)]
am
93dc642e: docs: fix misc bugs from external tracker
* commit '
93dc642eaf48e3db58c4929df26283fbc5fd663f':
docs: fix misc bugs from external tracker
Scott Main [Fri, 24 Feb 2012 20:04:06 +0000 (12:04 -0800)]
docs: fix misc bugs from external tracker
Change-Id: I2be617be23d0ac50baabac561d510633fa9f162a
The Android Open Source Project [Sat, 3 Mar 2012 00:43:42 +0000 (16:43 -0800)]
Reconcile with ics-mr1-release
Change-Id: I8794fd70cb0e38d3c7893b782afdde0acfcffceb
Scott Main [Sat, 3 Mar 2012 00:40:21 +0000 (16:40 -0800)]
am
4143781c: docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
* commit '
4143781cdea0741ce6e87967c4ab903288c3e4c3':
docs: add docs for market OBB includes splitting the Licensing dev guide into multiple pages; Turned original licensing doc into a redirect to the new files that are under guide/market/licensing/; Fix all links pointing to app licensing
Scott Main [Thu, 7 Jul 2011 21:51:56 +0000 (14:51 -0700)]
docs: add docs for market OBB
includes splitting the Licensing dev guide into multiple pages;
Turned original licensing doc into a redirect to the new
files that are under guide/market/licensing/;
Fix all links pointing to app licensing
Change-Id: Ic49493f0e560db225dd7a382ffabc904a2fa1228
The Android Automerger [Fri, 2 Mar 2012 19:51:23 +0000 (11:51 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Robert Ly [Fri, 2 Mar 2012 17:06:44 +0000 (09:06 -0800)]
am
e5e11fd6: Merge "docs: fixing bug
5942573" into ics-mr1
* commit '
e5e11fd666d242b099466017c6d9bd23e6d2896d':
docs: fixing bug
5942573
Robert Ly [Fri, 2 Mar 2012 17:04:16 +0000 (09:04 -0800)]
Merge "docs: fixing bug
5942573" into ics-mr1
Dianne Hackborn [Fri, 2 Mar 2012 16:33:21 +0000 (08:33 -0800)]
am
0dd9ec14: Merge "Make ResolverActivity update dynamically." into ics-mr1
* commit '
0dd9ec144b0da8df9d8900d78c8177e761de458d':
Make ResolverActivity update dynamically.
Dianne Hackborn [Fri, 2 Mar 2012 16:30:36 +0000 (08:30 -0800)]
Merge "Make ResolverActivity update dynamically." into ics-mr1
Dianne Hackborn [Fri, 2 Mar 2012 01:30:53 +0000 (17:30 -0800)]
Make ResolverActivity update dynamically.
Watches for package changes so it can dynamically adjust
to reflect the actual list of available activities.
Change-Id: I3a2fef3dac4d13d1b2a7ed6fc117a7b814679669
Tsu Chiang Chuang [Fri, 2 Mar 2012 01:07:43 +0000 (17:07 -0800)]
am
3e701270: Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
* commit '
3e70127021f5d5940edfdefd7e33fd65d4ec0449':
extend timeout to allow for more time for the device to connect.
Tsu Chiang Chuang [Fri, 2 Mar 2012 01:05:43 +0000 (17:05 -0800)]
Merge "extend timeout to allow for more time for the device to connect." into ics-mr1
Robert Ly [Thu, 1 Mar 2012 22:11:05 +0000 (14:11 -0800)]
Robert Ly [Thu, 1 Mar 2012 22:08:40 +0000 (14:08 -0800)]
Merge "fix bug
5942522" into ics-mr1
Robert Ly [Thu, 1 Mar 2012 20:44:35 +0000 (12:44 -0800)]
am
dcc910ea: Merge "docs: fix bug
5878445" into ics-mr1
* commit '
dcc910ea6eb724fe7e0a415afcdf1a5aefc42f06':
docs: fix bug
5878445
Robert Ly [Thu, 1 Mar 2012 20:42:24 +0000 (12:42 -0800)]
Merge "docs: fix bug
5878445" into ics-mr1
Tsu Chiang Chuang [Wed, 29 Feb 2012 17:55:38 +0000 (09:55 -0800)]
extend timeout to allow for more time for the device to connect.
Change-Id: If3929ca69a5025c7048d57276813c270229a76db
The Android Open Source Project [Thu, 1 Mar 2012 18:40:12 +0000 (10:40 -0800)]
Reconcile with ics-mr1-release
Change-Id: If1919ebd98b63a6380de01d761107ee78e2bda9a
Yu Shan Emily Lau [Thu, 1 Mar 2012 03:00:00 +0000 (19:00 -0800)]
am
eb4f3256: Set the video encoding bit rate for the media recorder stress test.
* commit '
eb4f3256b77fe7fd783297a550a64ea441c41169':
Set the video encoding bit rate for the media recorder stress test.
Yu Shan Emily Lau [Wed, 29 Feb 2012 23:57:21 +0000 (15:57 -0800)]
Set the video encoding bit rate for the media
recorder stress test.
Change-Id: I1fa5965d2ba0e17be97ff3b9bd8df3df4e438087
Eric Fischer [Wed, 29 Feb 2012 21:26:08 +0000 (13:26 -0800)]
am
fb393f8b: Mark configuration strings as not translatable.
* commit '
fb393f8bd79602c933dc829bd36070dd78be2872':
Mark configuration strings as not translatable.
Eric Fischer [Wed, 29 Feb 2012 21:19:58 +0000 (13:19 -0800)]
Mark configuration strings as not translatable.
Change-Id: I041a6a951dfe70881a095d7ef085b0246a9d4c3b
Roman Nurik [Wed, 29 Feb 2012 20:43:29 +0000 (12:43 -0800)]
am
a53b3bfa: docs: Android Design downloads section, linkable H2s.
* commit '
a53b3bfaadd14aa325c6d6dc2542d7cbea66fc85':
docs: Android Design downloads section, linkable H2s.
Roman Nurik [Wed, 29 Feb 2012 19:59:32 +0000 (11:59 -0800)]
docs: Android Design downloads section, linkable H2s.
Change-Id: I4ed3006117efd740ff5f3bc93df2ac75c2dfd2f9
Robert Ly [Tue, 28 Feb 2012 23:39:55 +0000 (15:39 -0800)]
Robert Ly [Tue, 28 Feb 2012 23:37:21 +0000 (15:37 -0800)]
Merge "fix bug
5911175" into ics-mr1
The Android Automerger [Tue, 28 Feb 2012 23:14:55 +0000 (15:14 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Dianne Hackborn [Tue, 28 Feb 2012 23:03:28 +0000 (15:03 -0800)]
am
27e20ccd: Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
* commit '
27e20ccd9ac4dd1f9bf902ed2b359cc8beff7c9b':
Fix issue #
6073913: onActivityResult() not getting called...
Dianne Hackborn [Tue, 28 Feb 2012 23:01:04 +0000 (15:01 -0800)]
Merge "Fix issue #
6073913: onActivityResult() not getting called..." into ics-mr1
Dianne Hackborn [Tue, 28 Feb 2012 22:44:19 +0000 (14:44 -0800)]
Fix issue #
6073913: onActivityResult() not getting called...
...if the process is killed and restarted
Try to ensure that in all cases we deliver an activity result if one
was requested.
Change-Id: Id43e830d2ee782f98ed1e3b68e5e16f3258d4ad8
felipeal [Tue, 28 Feb 2012 22:05:23 +0000 (14:05 -0800)]
am
e4ef9b1a: DO NOT MERGE (from master: Fixed minor typo on Javadoc)
* commit '
e4ef9b1ac2c4d7a1deb25f575e341255369c5c3b':
DO NOT MERGE (from master: Fixed minor typo on Javadoc)
felipeal [Mon, 27 Feb 2012 20:09:13 +0000 (12:09 -0800)]
DO NOT MERGE
(from master: Fixed minor typo on Javadoc)
Change-Id: I7d62e37011a7fd4d792fdfe5bd62022a850303a6
Jason Noguchi [Tue, 28 Feb 2012 19:49:30 +0000 (11:49 -0800)]
am
ee329930: Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
* commit '
ee329930956c88d3c2cbcbb6da01abde4b40b2e8':
Adding time lapse test to mediaframework stress suite.
Jason Noguchi [Tue, 28 Feb 2012 19:47:46 +0000 (11:47 -0800)]
Merge "Adding time lapse test to mediaframework stress suite." into ics-mr1
Svetoslav Ganov [Tue, 28 Feb 2012 18:35:18 +0000 (10:35 -0800)]
am
a2b41b43: NumberPicker showing IME when its input field gains focus.
* commit '
a2b41b438d45570867e4682c0caaf93ace5e712e':
NumberPicker showing IME when its input field gains focus.
Svetoslav Ganov [Mon, 27 Feb 2012 23:53:32 +0000 (15:53 -0800)]
NumberPicker showing IME when its input field gains focus.
1. The NumberPicker was showing the IME if the input field
gets focus and hiding it when the the arrows are pressed.
The leads to a nasty behavior when the input is the first
focusable and the uses presser an arrow button. In such
a case the IME shows and hides on every arrow press pushing
the window content up and down - this looks pretty ugly.
Now the IME is show on double tap of the input field.
2. The NumberPicker input now by default has an IME action
done, hence after editing it the IME goes away.
3. The NumberPicker input now clears focus when it gets
IME action done, so the last picker in a sequence
does not show selection which is focus driven.
4. NumberPicker was incorrectly detecting double tap to
begin edit and it was possble to start edit on singe tap
if the user has double tapped before to start an edit.
Now double tap detection is using the double tap timeout
correctly.
bug:
6071977
Change-Id: I0ff5a491064e51663b3abec675d839d0a65b986a
The Android Automerger [Tue, 28 Feb 2012 00:10:06 +0000 (16:10 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Automerger [Mon, 27 Feb 2012 22:42:58 +0000 (14:42 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Robert Ly [Mon, 27 Feb 2012 16:42:19 +0000 (08:42 -0800)]
am
85cb9dec: Merge "docs: fix bug
5990526" into ics-mr1
* commit '
85cb9dece27c7ebc29b48bd8e5dd3457fa3b6a87':
docs: fix bug
5990526
Robert Ly [Mon, 27 Feb 2012 16:40:54 +0000 (08:40 -0800)]
Merge "docs: fix bug
5990526" into ics-mr1
Xavier Ducrohet [Sat, 25 Feb 2012 03:32:32 +0000 (19:32 -0800)]
am
44e63a21: Support rendering layout that use the new res-auto namespace.
* commit '
44e63a218cf8fcab9b4418246a512bd0b0c9157b':
Support rendering layout that use the new res-auto namespace.
Xavier Ducrohet [Sat, 25 Feb 2012 03:02:18 +0000 (19:02 -0800)]
Support rendering layout that use the new res-auto namespace.
Change-Id: I9b89c965dc8c9458e74c15ab8ff765e16e1b32c2
Dianne Hackborn [Sat, 25 Feb 2012 00:25:30 +0000 (16:25 -0800)]
am
5786f5cf: Merge "Fix build." into ics-mr1
* commit '
5786f5cf1b248b79f938b3fa3c5d534159261f09':
Fix build.
Dianne Hackborn [Sat, 25 Feb 2012 00:23:07 +0000 (16:23 -0800)]
Merge "Fix build." into ics-mr1
Dianne Hackborn [Sat, 25 Feb 2012 00:10:26 +0000 (16:10 -0800)]
Fix build.
Change-Id: Id3262bff0df598ecc81a4346dee9febd3aaa60c9
Dianne Hackborn [Fri, 24 Feb 2012 23:38:03 +0000 (15:38 -0800)]
am
133dc2d7: Merge "Fix issue #
6048808: sometimes auto-correct is inactive" into ics-mr1
* commit '
133dc2d7aecc68990c363c861716b134910a4ced':
Fix issue #
6048808: sometimes auto-correct is inactive
Dianne Hackborn [Fri, 24 Feb 2012 23:36:33 +0000 (15:36 -0800)]
Merge "Fix issue #
6048808: sometimes auto-correct is inactive" into ics-mr1
The Android Open Source Project [Fri, 24 Feb 2012 22:05:51 +0000 (14:05 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ib2f215bb3db0195c35ca5bc645df38d46061dc7e
Dianne Hackborn [Fri, 24 Feb 2012 21:08:49 +0000 (13:08 -0800)]
Fix issue #
6048808: sometimes auto-correct is inactive
My previous change to speed up the time the IME is dismissed was
fundamentally flawed. That change basically switched the order
the application called the input method manager service from doing
startInput() and then windowGainedFocus(), to first windowGainedFocus()
and then startInput().
The problem is that the service relies on startInput() being done
first, since this is the mechanism to set up the new input focus,
and windowGainedFocus() is just updating the IME visibility state
after that is done. However, by doing the startInput() first, that
means in the case where we are going to hide the IME we must first
wait for the IME to re-initialize editing on whatever input has
focus in the new window.
To address this, the change here tries to find a half-way point
between the two. We now do startInput() after windowGainedFocus()
only when this will result in the window being hidden.
It is not as easy as that, though, because these are calls on to
the system service from the application. So being able to do that
meant a fair amount of re-arranging of this part of the protocol
with the service. Now windowGainedFocus() is called with all of
the information also needed for startInput(), and takes care of
performing both operations. The client-side code is correspondingly
rearranged so that the guts of it where startInput() is called can
instead call the windowGainedFocus() entry if appropriate.
So... in theory this is safer than the previous change, since it
should not be impacting the behavior as much. In practice, however,
we are touching and re-arranging a lot more code, and "should" is
not a promise.
Change-Id: Icb58bef75ef4bf9979f3e2ba88cea20db2e2c3fb
Xavier Ducrohet [Fri, 24 Feb 2012 02:41:48 +0000 (18:41 -0800)]
am
816b873d: Move the automatic namespace outside of the res namespace. do not merge.
* commit '
816b873df1ab98d0e79913cf589b7b1fbaf14e85':
Move the automatic namespace outside of the res namespace. do not merge.
inazaruk [Fri, 24 Feb 2012 02:41:43 +0000 (18:41 -0800)]
am
eed8d0b3: Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
* commit '
eed8d0b3af8e76d6146ce4ed3fbe6ef7e172c8cd':
Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
Xavier Ducrohet [Fri, 24 Feb 2012 00:59:27 +0000 (16:59 -0800)]
Move the automatic namespace outside of the res namespace. do not merge.
(cherry picked from commit
d9fe8018ffbf94f18a840005e688ad1d712f0225)
Change-Id: I48ca78d5fccc75392b3f1cf9525890e5145293c4
inazaruk [Sun, 22 May 2011 22:09:06 +0000 (15:09 -0700)]
Fix for issue 9656 - custom xml attributes in Android Libraries. do not merge.
Added support for predefined namespace http://schemas.android.com/apk/res/auto
that aapt tool recognizes and treats as namespace with package name
taken from current application's AndroidManifest.xml, //manifest/package attribute.
Signed-off-by: inazaruk <ievgenii.nazaruk@gmail.com>
(cherry picked from commit
e348909c1966c3d192841cc131a32be6ed90da18)
Change-Id: I4bff836c42a309bac36e5d1ce1899131b3c4c194
Andrew Flynn [Fri, 24 Feb 2012 00:09:36 +0000 (16:09 -0800)]
Merge "DO NOT MERGE Return 1.5 * density as default for large screens." into ics-scoop
Andrew Flynn [Thu, 23 Feb 2012 23:45:06 +0000 (15:45 -0800)]
DO NOT MERGE Return 1.5 * density as default for large screens.
Change-Id: Ib2d390803f08812636364ceb3849eddf80044072
Joe Fernandez [Thu, 23 Feb 2012 22:24:53 +0000 (14:24 -0800)]
am
566328a2: Merge "docs: NDK overview, remove x86 instruction set mention (b/
6044027)" into ics-mr1
* commit '
566328a2a5fcd8c40fc67d8974d6df0df48b0056':
docs: NDK overview, remove x86 instruction set mention (b/
6044027)
Joe Fernandez [Thu, 23 Feb 2012 22:22:41 +0000 (14:22 -0800)]
Merge "docs: NDK overview, remove x86 instruction set mention (b/
6044027)" into ics-mr1
The Android Automerger [Thu, 23 Feb 2012 18:45:15 +0000 (10:45 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Michael Jurka [Thu, 23 Feb 2012 16:07:51 +0000 (08:07 -0800)]
am
bf378fd7: Don\'t allow screen invalidations to go outside bounds of screen
* commit '
bf378fd7d7a91085685fe9e5528b84c485041c77':
Don't allow screen invalidations to go outside bounds of screen
Michael Jurka [Thu, 23 Feb 2012 08:02:49 +0000 (00:02 -0800)]
Don't allow screen invalidations to go outside bounds of screen
Fixes invalidation issue in Launcher
Change-Id: Iab32149489aed6884e917f0ac5a548d4ae26896e
Robert Ly [Wed, 22 Feb 2012 19:15:53 +0000 (11:15 -0800)]
docs: fix bug
5878445
Change-Id: I603a3b8d92d855baa8f3557bddecb662af2cc1d7
Jason Noguchi [Fri, 17 Feb 2012 23:23:00 +0000 (15:23 -0800)]
Adding time lapse test to mediaframework stress suite.
Change-Id: Ia244352cd16f77c090c4f1dad6f9b09a8b3e8f47
Robert Ly [Wed, 22 Feb 2012 18:59:12 +0000 (10:59 -0800)]
docs: fixing bug
5942573
Change-Id: I2479dc8916f98a8bf7dbec95dc29cbd871c51be5
Robert Ly [Wed, 22 Feb 2012 17:29:15 +0000 (09:29 -0800)]
fix bug
5942522
Change-Id: Ice16e63b42d5e8c89994d0844f62adaefc8a92a1
Scott Main [Thu, 23 Feb 2012 00:23:03 +0000 (16:23 -0800)]
am
68d97aa2: Merge "docs: fix broken link" into ics-mr1
* commit '
68d97aa2c1ff16f327491fed5afb8b318f034a01':
docs: fix broken link
Scott Main [Thu, 23 Feb 2012 00:20:49 +0000 (16:20 -0800)]
Merge "docs: fix broken link" into ics-mr1
Joe Fernandez [Tue, 21 Feb 2012 23:30:14 +0000 (15:30 -0800)]
docs: NDK overview, remove x86 instruction set mention (b/
6044027)
Change-Id: I37ee68fb78f2ed5edc1c34ff7198340b1ab5c49b
Robert Ly [Wed, 22 Feb 2012 19:05:55 +0000 (11:05 -0800)]
fix bug
5911175
Change-Id: I528e7c30e81c85ec31a5abbd74e85cc364a8362f
Xavier Ducrohet [Wed, 22 Feb 2012 18:49:35 +0000 (10:49 -0800)]
am
503247f2: Merge "Make sure resource references are resolved." into ics-mr1
* commit '
503247f213ef2894324a22e7608101e90a7fe8fb':
Make sure resource references are resolved.
Xavier Ducrohet [Wed, 22 Feb 2012 18:47:32 +0000 (10:47 -0800)]
Merge "Make sure resource references are resolved." into ics-mr1
Robert Ly [Wed, 22 Feb 2012 17:20:43 +0000 (09:20 -0800)]
docs: fix bug
5990526
Change-Id: Ife7e9a66c5fc23a9caa2c26046741880833f4b9a
Rich Hyndman [Wed, 22 Feb 2012 11:43:35 +0000 (03:43 -0800)]
am
942b823c: Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1
* commit '
942b823ce4b2e0e11d395dffb2d340de01811612':
docs: Added Lint into Android Training and removed Layoutopt.
Rich Hyndman [Wed, 22 Feb 2012 11:41:05 +0000 (03:41 -0800)]
Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1
The Android Open Source Project [Tue, 21 Feb 2012 23:36:33 +0000 (15:36 -0800)]
Reconcile with ics-mr1-release
Change-Id: Id8505107b41a8b89c123c16d33f609480a555632
The Android Automerger [Tue, 21 Feb 2012 23:27:33 +0000 (15:27 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
The Android Open Source Project [Tue, 21 Feb 2012 23:13:30 +0000 (15:13 -0800)]
Reconcile with ics-mr1-release
Change-Id: Ic0dc3fd4a476aecd8854c8a919ba1e096cc938f0
Dianne Hackborn [Tue, 21 Feb 2012 22:57:55 +0000 (14:57 -0800)]
am
01011c3d: Fix issue #
6037252: Screen shifts after all apps are upgraded
* commit '
01011c3d7ce4f76c1a76b33a04fc63da784ddbea':
Fix issue #
6037252: Screen shifts after all apps are upgraded
Xavier Ducrohet [Tue, 21 Feb 2012 22:26:32 +0000 (14:26 -0800)]
Make sure resource references are resolved.
XmlPullAttribute can query for attributes and return them in a given
format. We need to make sure they are first resolved before
trying to convert them to int/float/boolean/...
Change-Id: I2aaced022a0382e501978c396e49d6191d53bdc8
Dianne Hackborn [Tue, 21 Feb 2012 21:54:21 +0000 (13:54 -0800)]
Fix issue #
6037252: Screen shifts after all apps are upgraded
Two things: (1) make sure the boot message is always positioned within
the entire unrestricted display, and (2) allow the dim background to go
on top of the nav bar when being used for the boot message (this latter
is really a hack that should be more generally fixed in the future).
Change-Id: I7261b044eb802a39cadff931b50a679ff18781d6
Rich Hyndman [Wed, 15 Feb 2012 15:46:51 +0000 (16:46 +0100)]
docs: Added Lint into Android Training and removed Layoutopt.
Change-Id: Ib818ba3ab12fff79dbede69ebf543a8e4be6f3df
The Android Automerger [Sat, 18 Feb 2012 00:38:41 +0000 (16:38 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Tsu Chiang Chuang [Fri, 17 Feb 2012 23:55:44 +0000 (15:55 -0800)]
am
2d559b53: Merge "fix NPE in race condition." into ics-mr1
* commit '
2d559b5311be1cd909e5a445afe75a840688b822':
fix NPE in race condition.
Tsu Chiang Chuang [Fri, 17 Feb 2012 23:53:50 +0000 (15:53 -0800)]
Merge "fix NPE in race condition." into ics-mr1
Adam Powell [Fri, 17 Feb 2012 23:25:18 +0000 (15:25 -0800)]
am
482ae5f2: Bug
6021294 - Contextual action bar animation tweaks
* commit '
482ae5f2388a07d60d7f3b54432120172af25eee':
Bug
6021294 - Contextual action bar animation tweaks
Adam Powell [Fri, 17 Feb 2012 23:18:01 +0000 (15:18 -0800)]
Bug
6021294 - Contextual action bar animation tweaks
Remove the right-to-left cascade effect from action mode menu
items. Animation time is now fixed at 300ms for scaling in menu items.
Change-Id: I8eef2ed9f93c2af804663dd5e6b3f4915ed45cb1
Scott Main [Fri, 17 Feb 2012 22:37:58 +0000 (14:37 -0800)]
docs: fix broken link
Change-Id: I13e29ec18bb503ea33ee59d187f588c5be8fd109
The Android Open Source Project [Fri, 17 Feb 2012 17:02:50 +0000 (09:02 -0800)]
Reconcile with ics-mr1-release
Change-Id: I04e83e00da70672ba81716c43919c489e77b14c6
Marc Blank [Fri, 17 Feb 2012 00:54:23 +0000 (16:54 -0800)]
am
094bf51e: Use ' for apostrophe in HTML encoding DO NOT MERGE
* commit '
094bf51ec0911057263a27db4d79db4eface2d63':
Use ' for apostrophe in HTML encoding DO NOT MERGE
Marc Blank [Mon, 13 Feb 2012 18:11:50 +0000 (10:11 -0800)]
Use ' for apostrophe in HTML encoding DO NOT MERGE
* We were using ' which is not correct
Chery-pick of CL: https://android-git.corp.google.com/g/165367
The Android Automerger [Fri, 17 Feb 2012 00:26:06 +0000 (16:26 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Tsu Chiang Chuang [Thu, 16 Feb 2012 01:40:05 +0000 (17:40 -0800)]
fix NPE in race condition.
Change-Id: Ic1df67f8a5379ff1cd804fb55e143f078e369ccf
Dianne Hackborn [Thu, 16 Feb 2012 22:43:43 +0000 (14:43 -0800)]
am
06a591cd: Fix last change -- don\'t call startInputInner() with lock held.
* commit '
06a591cdd6d90600db006906d5d1524d156d6529':
Fix last change -- don't call startInputInner() with lock held.
Dianne Hackborn [Thu, 16 Feb 2012 18:25:26 +0000 (10:25 -0800)]
Fix last change -- don't call startInputInner() with lock held.
Change-Id: Ie7a145c5a07f08ae8a3f5954a1c389bfbd946b69
The Android Open Source Project [Thu, 16 Feb 2012 18:10:13 +0000 (10:10 -0800)]
Reconcile with ics-mr1-release
Change-Id: I7c4496218c25c8d2b0271782ad08b4b63055ed92
The Android Automerger [Thu, 16 Feb 2012 17:40:11 +0000 (09:40 -0800)]
merge in ics-mr1-release history after reset to ics-mr1
Justin Ho [Thu, 16 Feb 2012 17:28:12 +0000 (09:28 -0800)]
am
e8e0527a: Merge "Update WiMAX notification icons Bug:
5724605" into ics-mr1
* commit '
e8e0527aa699c7db999b659b044d16cea6c67901':
Update WiMAX notification icons Bug:
5724605
Justin Ho [Thu, 16 Feb 2012 17:27:05 +0000 (09:27 -0800)]
Merge "Update WiMAX notification icons Bug:
5724605" into ics-mr1
Justin Ho [Thu, 16 Feb 2012 17:25:03 +0000 (09:25 -0800)]
am
c470b2dd: Merge "Part of fixing issue #
6006757: Keyboard dismissal lags" into ics-mr1
* commit '
c470b2dd49ae2c4894de22f7bdd9f91af1a085f8':
Part of fixing issue #
6006757: Keyboard dismissal lags
Justin Ho [Thu, 16 Feb 2012 17:23:01 +0000 (09:23 -0800)]
Merge "Part of fixing issue #
6006757: Keyboard dismissal lags" into ics-mr1