62243 Commits

Author SHA1 Message Date
Xavier Ducrohet
44e63a218c Support rendering layout that use the new res-auto namespace.
Change-Id: I9b89c965dc8c9458e74c15ab8ff765e16e1b32c2
2012-02-24 19:29:31 -08:00
Dianne Hackborn
5786f5cf1b Merge "Fix build." into ics-mr1 2012-02-24 16:23:07 -08:00
Dianne Hackborn
b69b2c01b4 Fix build.
Change-Id: Id3262bff0df598ecc81a4346dee9febd3aaa60c9
2012-02-24 16:10:26 -08:00
Dianne Hackborn
133dc2d7ae Merge "Fix issue #6048808: sometimes auto-correct is inactive" into ics-mr1 2012-02-24 15:36:33 -08:00
Dianne Hackborn
7663d80f6b 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
2012-02-24 13:18:23 -08:00
Xavier Ducrohet
816b873df1 Move the automatic namespace outside of the res namespace. do not merge.
(cherry picked from commit d9fe8018ffbf94f18a840005e688ad1d712f0225)

Change-Id: I48ca78d5fccc75392b3f1cf9525890e5145293c4
2012-02-23 18:10:20 -08:00
inazaruk
eed8d0b3af 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
2012-02-23 18:09:31 -08:00
Joe Fernandez
566328a2a5 Merge "docs: NDK overview, remove x86 instruction set mention (b/6044027)" into ics-mr1 2012-02-23 14:22:41 -08:00
Michael Jurka
bf378fd7d7 Don't allow screen invalidations to go outside bounds of screen
Fixes invalidation issue in Launcher

Change-Id: Iab32149489aed6884e917f0ac5a548d4ae26896e
2012-02-23 00:19:58 -08:00
Scott Main
68d97aa2c1 Merge "docs: fix broken link" into ics-mr1 2012-02-22 16:20:49 -08:00
Joe Fernandez
224741afda docs: NDK overview, remove x86 instruction set mention (b/6044027)
Change-Id: I37ee68fb78f2ed5edc1c34ff7198340b1ab5c49b
2012-02-22 15:52:53 -08:00
Xavier Ducrohet
503247f213 Merge "Make sure resource references are resolved." into ics-mr1 2012-02-22 10:47:32 -08:00
Rich Hyndman
942b823ce4 Merge "docs: Added Lint into Android Training and removed Layoutopt." into ics-mr1 2012-02-22 03:41:05 -08:00
Xavier Ducrohet
c3f979f6fe 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
2012-02-21 14:33:37 -08:00
Dianne Hackborn
01011c3d7c 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
2012-02-21 13:54:21 -08:00
Rich Hyndman
0980e41e97 docs: Added Lint into Android Training and removed Layoutopt.
Change-Id: Ib818ba3ab12fff79dbede69ebf543a8e4be6f3df
2012-02-20 12:49:10 +01:00
Tsu Chiang Chuang
2d559b5311 Merge "fix NPE in race condition." into ics-mr1 2012-02-17 15:53:50 -08:00
Adam Powell
482ae5f238 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
2012-02-17 15:18:01 -08:00
Scott Main
ef0314b2c6 docs: fix broken link
Change-Id: I13e29ec18bb503ea33ee59d187f588c5be8fd109
2012-02-17 14:37:58 -08:00
Marc Blank
094bf51ec0 Use &#39; for apostrophe in HTML encoding DO NOT MERGE
* We were using &apos; which is not correct

Chery-pick of CL: https://android-git.corp.google.com/g/165367
2012-02-16 16:47:28 -08:00
Tsu Chiang Chuang
4fe25f693a fix NPE in race condition.
Change-Id: Ic1df67f8a5379ff1cd804fb55e143f078e369ccf
2012-02-16 14:46:02 -08:00
Dianne Hackborn
06a591cdd6 Fix last change -- don't call startInputInner() with lock held.
Change-Id: Ie7a145c5a07f08ae8a3f5954a1c389bfbd946b69
2012-02-16 10:37:06 -08:00
Justin Ho
e8e0527aa6 Merge "Update WiMAX notification icons Bug: 5724605" into ics-mr1 2012-02-16 09:27:05 -08:00
Justin Ho
c470b2dd49 Merge "Part of fixing issue #6006757: Keyboard dismissal lags" into ics-mr1 2012-02-16 09:23:01 -08:00
Dianne Hackborn
a82ba54b0b Part of fixing issue #6006757: Keyboard dismissal lags
This adjust various paths through InputMethodManager so that the flow
in switching focus from one application to another is cleaner, resulting
in less work being done, resulting in it being able to happen quicker.

Some of the changes here avoid doing stuff when not needed, such as when
we are told to unbind but are not currently the active input.  A big part
is also a change to the flow when a window receives input.  Previously
this would first do a checkFocus() which would tell the input method to
switch focus to whatever view has focus in the window, followed by the
windowGainedFocus() call telling it the window had gained focus.  This
would result in extra work because the input method service would first
handle the focus switch, seeing the IME is currently displayed, so the IME
would remain up and reset its focus to the new view.  The app would
immediately then tell it about the window, causing the service to find out
the IME should be hidden and telling the IME, but the IME couldn't hide
itself until it had first take care of switching its input.

There is the definite potential of this breaking IME showing/hiding in
cases depending on the order things may be relying on them to happen.  I
haven't seen any problems with a brief trip through the UI.

Change-Id: I8494cbd6e19e2ab6db03f2463d9906680dda058b
2012-02-15 18:19:55 -08:00
Scott Main
2a1d19174e Merge "docs: move USB installation info into the OEM USB Drivers document because the Google USB Driver is deprecated, so consolidating the USB info makes more sense for the common case of needing an OEM driver A few changes to the device setup doc also; such as removing the "unknown sources" step, because that doesn't apply to adb installs." into ics-mr1 2012-02-15 17:31:54 -08:00
Scott Main
811aca5513 docs: move USB installation info into the OEM USB Drivers document because
the Google USB Driver is deprecated, so consolidating the USB info makes more sense
for the common case of needing an OEM driver
A few changes to the device setup doc also; such as removing the "unknown sources"
step, because that doesn't apply to adb installs.

Change-Id: Ice78c997cbb147865ead78fb037d0b6b64db75bd
2012-02-15 16:46:10 -08:00
Justin Ho
aefa9219c1 Update WiMAX notification icons
Bug: 5724605

Change-Id: I03f9c2e7c9e94f1d3dc38d9eee3c90c45c0422a6
2012-02-15 14:59:53 -08:00
Scott Main
2670332678 docs: Google+ badge now sizes properly; remove reposition hack
Change-Id: If5e402b8acb249e0ea81436f3d5ecf468934b81f
2012-02-15 13:22:30 -08:00
Robert Greenwalt
c8711ca7eb Merge "Stop using shared DUN APN when tethering stops." into ics-mr1 2012-02-14 13:38:15 -08:00
Robert Greenwalt
fc19160a6a Merge "Add a config to set Dun capabilities." into ics-mr1 2012-02-14 13:37:44 -08:00
Justin Ho
c312ba322b Merge "Update 4G WiMAX assets for notification area as well Bug: 5724605" into ics-mr1 2012-02-14 13:29:08 -08:00
Justin Ho
9dd3a66286 Update 4G WiMAX assets for notification area as well
Bug: 5724605

Change-Id: Iade031923f1d3a07ca6dd366642c04071168d495
2012-02-14 12:10:54 -08:00
Joe Fernandez
835e07f8f4 Merge "docs: Android NDK r7b Release Notes" into ics-mr1 2012-02-14 12:05:25 -08:00
Joe Fernandez
0ae5cacf6c docs: Android NDK r7b Release Notes
Change-Id: Ib1a92b1bbdb190f3aae6dcc69a78cbf5ad3c4760
2012-02-14 11:49:27 -08:00
Robert Greenwalt
2384386f31 Stop using shared DUN APN when tethering stops.
Backported from master, including a bug fix and a cdma enhancement.

Even if other people are sharing the connection (ie, carrier wants
default and tethered traffic on the same APN) stop using a carrier-
described APN when the tethering stops.

bug:5972599
Change-Id: I25e4831855e6b62c0c3ab3a6f4d4846aaee6ac50
2012-02-14 11:44:09 -08:00
Mike Lockwood
ffc8989965 Merge "Don't pulse LED on new notification unless notification has LED flag set" into ics-mr1 2012-02-14 11:30:05 -08:00
Robert Greenwalt
8d27f20ac2 Add a config to set Dun capabilities.
Since CDMA doesn't use APN settings there was no place to say what a cdma
device's DUN connection would support, so by default normal device
originating traffic would be blocked on a tethering single-connection device.

With this change you can (via overlay) say that it supports everything
so mms and on-device browsing/email will still work even when on a dun connection.

The reason to allow both: some carriers will charge per byte for dun access
and so they don't want lots of non-tethering traffic used (costs the user alot)
but other carriers just use a dun connection to limit access to tethering, but
once there give unlimited data, so it makes sense to support everything there.

bug:5972599
Change-Id: I78fd7f3ac63c51a0560b659ed5ec219b10a93f8d
2012-02-14 11:29:36 -08:00
John Wang
63b596664c Merge "Only use CDMA rssi for config_alwaysUseCdmaRssi." into ics-mr1 2012-02-14 10:09:26 -08:00
Mike Lockwood
ece18efb35 Don't pulse LED on new notification unless notification has LED flag set
Bug: 6006131

Change-Id: I719c7d68e310bfaca227f6286159b3993784926b
Signed-off-by: Mike Lockwood <lockwood@google.com>
2012-02-13 20:42:19 -08:00
John Wang
d55cde1384 Only use CDMA rssi for config_alwaysUseCdmaRssi.
If config_alwaysUseCdmaRssi is true, the RSSI signal bar only
shows the CDMA value, no matter it connects to EVDO or WiMax .

bug:5941743
Change-Id: I4187571898a9fb47162e1ccf0cc4c59c3136ae0b
2012-02-13 17:48:24 -08:00
Tsu Chiang Chuang
08eb7dd630 Merge "extending timeout to stabilize tests" into ics-mr1 2012-02-13 13:41:37 -08:00
Wink Saville
197fe26940 Merge "Add OEM specific USB mode enumeration based on ro.bootmode property" into ics-mr1 2012-02-10 15:12:19 -08:00
Eric Fischer
650462bbfd Import revised translations. DO NOT MERGE
Change-Id: Ibfc588d17f79baa0359d3a20a0a5ff7a2f3f152b
2012-02-10 12:29:26 -08:00
Kazuhiro Ondo
afd8f1820e Add OEM specific USB mode enumeration based on ro.bootmode property
This patch is adding a capability so that OEM can override USB mode
in case the device is boot up with OEM specific mode. (i.e. modem
debug, factory test etc.)

Bug:5964042
Change-Id: Ic8e23d302563ce71eedb74ce94cca8c65838a4f7
2012-02-10 12:29:12 -08:00
Justin Ho
744c5b0bde Merge "Import translations. DO NOT MERGE" into ics-mr1 2012-02-10 10:07:07 -08:00
Scott Main
d9c8bbd56a docs: fix xss issue
bug 5125642

Change-Id: I326b619643e3b3de20aa9303e92c9218fdfe50f7
2012-02-09 15:57:09 -08:00
Joe Fernandez
1c66faab73 Merge "docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)" into ics-mr1 2012-02-09 13:45:01 -08:00
Scott Main
52bfc24368 docs: fix misc doc bugs from external issue tracker
Change-Id: If6ff3476670e42b321d56d4a1482ccff96d4d500
2012-02-09 12:45:16 -08:00
Joe Fernandez
a61f842040 docs: OpenGL Tutorials fixed two broken links (Issue 5990696, public android bug: 25132)
Change-Id: I9d504017c507b2e203b8e0448d720714bec32e8c
2012-02-09 11:16:20 -08:00