75793 Commits

Author SHA1 Message Date
Eric Fischer
46bba66318 Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-02 14:43:45 -07:00
Jeff Sharkey
6f28f9ef31 Merge "Push existing rules when netd reconnects." into jb-dev 2012-05-02 13:48:30 -07:00
Eric Fischer
ef3e44f69a Import translations. DO NOT MERGE
Change-Id: I5ae8fc8c95a47a3b981a10bf2218c774de71627f
2012-05-02 12:58:28 -07:00
Adam Powell
0cd4f6718b Merge "Fix documentation of Activity#navigateUpTo() to describe its actual behavior." into jb-dev 2012-05-02 11:59:55 -07:00
Gilles Debunne
54562cfbcd Merge "Better horizontal internal scroll handling in Text." into jb-dev 2012-05-02 11:59:54 -07:00
Chet Haase
fe5984f43a Merge "Corrects invalidation logic for layered views" into jb-dev 2012-05-02 11:56:56 -07:00
Irfan Sheriff
d07223f829 Merge "Fix getConfiguredNetworks when wifi is disabled" into jb-dev 2012-05-02 11:42:09 -07:00
Irfan Sheriff
a3cbe75c93 Fix getConfiguredNetworks when wifi is disabled
Bug: 6380917
Change-Id: I4c6f1a379ef2401cde739aedfc82578c03e7dcf3
2012-05-02 11:39:54 -07:00
Adam Powell
35c064b2e8 Fix documentation of Activity#navigateUpTo() to describe its actual
behavior.

Change-Id: I804fcef5df6f5885b47b7a1c7703ed301bea09b0
2012-05-02 11:38:57 -07:00
Irfan Sheriff
7a6a4bf1b5 Merge "P2p fixes" into jb-dev 2012-05-02 11:14:21 -07:00
Jeff Sharkey
b24a78589b Push existing rules when netd reconnects.
When netd drops its socket connection to framework, assume that it
has restarted, and push any existing rules to keep netd and iptables
consistent.

Bug: 6376246
Change-Id: Id93138938321bcf885eb0e4fecaff8b150cfdfcf
2012-05-02 10:55:08 -07:00
Chet Haase
810a8676df Corrects invalidation logic for layered views
A bug in the invalidation logic meant that changes to a view
would not cause parents in the view hiearchy that were set to have
a layer (e.g., View.LAYER_TYPE_HARDWARE) to get invalidated properly.
So even though the child view was all set to recreate its display list
according to the property change, the layer in the tree above it would stay
as-is, meaning that the change would not show up on the screen.

Issue #5887530 DropTarget text does not change color with the icon

Change-Id: Ie6eac4f406d172cb437822d9fe76340ab2afaf1c
2012-05-02 10:44:33 -07:00
Adam Cohen
dfed49a285 Merge "Changing app widget "extras" to "options" and another small API Review issue" into jb-dev 2012-05-02 10:38:01 -07:00
Gilles Debunne
fd5bc01f70 Better horizontal internal scroll handling in Text.
Bug 6378843

Corrects CL 183460, which would clip text with a width greater than
twice the TextView's width.

Internal horizontal translation is now handled in a similar way to
vertical scrolling.

Internal scrolling is indeed handled by the TextView, which translates
the canvas and sets the clipping bounds accordingly.

When drawing the internal DL, we tighten the horizontal bounds like we
did for the vertical bounds using top and bottom. As in Touch.java, we
use the getHorizontallyScrolling() method to know if we indeed have to
measure the actual text width.  If there is no horizontal scrolling we
use the TextView's width as a safe upper estimate in order to avoid an
actual computation. Note that horizontal scrolling is typically only
used for long single-lined text, so that the measurement loop is quick.

As a result, the internal DLs represent the entire text, and there is no
need to invalidate them when an internal scrolling takes place. This
behavior replaces the draw-only-what-is-needed we had before, but is
more consistent with what we do for long texts inside of a ScrollView
with no noticeable performance change, even on very long text.

Change-Id: I47c24c0ae988547d4f1e9f87d136225c93a3056d
2012-05-02 10:30:03 -07:00
Matthew Xie
e318c9a5f1 Merge "Check null of address in onDeviceCreated" into jb-dev 2012-05-02 10:15:00 -07:00
Irfan Sheriff
de1e9fa9fb P2p fixes
- Fix group idle settings
- Fix provision discovery event handling. We only care about device address.
- Fix WPS setup at start

Bug: 6427634
Change-Id: I0b1a7d73199e373350001114f4607bc39f2a53ba
Signed-off-by: isheriff@google.com
Signed-off-by: Yoshihiko Ikenaga <yoshihiko.ikenaga@jp.sony.com>
2012-05-02 10:02:56 -07:00
Adam Cohen
d2097ebacf Changing app widget "extras" to "options" and another small API Review issue
-> (issue 6427146), (issue 6427861)

Change-Id: Ib69a9b3717a5b62317ec227936bc3b2fd5954043
2012-05-02 09:32:42 -07:00
satok
e849230f44 Merge "DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition" into jb-dev 2012-05-02 01:41:23 -07:00
satok
1bc0a49e3c DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition
Bug: 5137498
Change-Id: Ieb8fd700d193eddaa31b0c5ebd8c7f7885586372
2012-05-02 17:30:45 +09:00
Adam Powell
39f412d8de Merge "API modifications for TaskStackBuilder" into jb-dev 2012-05-01 19:10:32 -07:00
Jeff Brown
69387f432d Merge "Use EVIOCSCLOCKID correctly." into jb-dev 2012-05-01 19:09:44 -07:00
Adam Powell
f78a8444a9 API modifications for TaskStackBuilder
Change-Id: Ic9e11caa4541962d32b2c197f4f7b19ee67a0eda
2012-05-01 18:51:40 -07:00
Jeff Brown
a75fe05b6e Use EVIOCSCLOCKID correctly.
Bug: 6382031
Change-Id: I87b0887ce867a79758bcd24e2202280270faaf8c
2012-05-01 18:41:26 -07:00
Jeff Brown
0632b35b68 Merge "Improve handling of built-in keyboard." into jb-dev 2012-05-01 18:39:00 -07:00
Svetoslav Ganov
5a00661bd6 Accessibility focus should not affect the currently active window.
1. The event of setting an accessibility focus on a view should not
   make the host window the currently active one.

bug:6400648

Change-Id: Ib45c255f441c38489ee9d4ab5f284550ac5f6b01
2012-05-01 18:16:20 -07:00
Matthew Xie
02c4b353f7 Check null of address in onDeviceCreated
address can be null that returned from getAddressFromObjectPath.
If it is null case, donot continue  call getRemoteDeviceProperties.
Otherwise it causes null pointer exception and crash the system.
Bug 6338780

Change-Id: Ib190342032ab2ad11c49f44fa6d4b2509a861514
2012-05-01 17:15:10 -07:00
Jeff Brown
daa3753a04 Improve handling of built-in keyboard.
The window manager policy made some incorrect assumptions about the
meaning of the Configuration.keyboard field.  We need to be more
careful about distinguishing between built-in and external keyboards.

Most of this change is to move the determination of the parts of
the Configuration related to input devices into the WindowManagerService
leveraging new features of the InputManagerService to good effect.

Then we plumb through the flag that indicates whether a device
is internal or external so that we can be more particular about
how the lid switch effects changes to the Configuration.

Bug: 6424373
Change-Id: I36a1c22ade35e578955465a25940a33f227b9763
2012-05-01 16:34:20 -07:00
Jeff Sharkey
19eaf0a74d Merge "Catch CCE when migrating to ClipData." into jb-dev 2012-05-01 16:32:38 -07:00
Eric Laurent
f3afe15754 Merge "AudioManager: deprecate vibrate settings" into jb-dev 2012-05-01 16:29:39 -07:00
Eric Laurent
cd1cd73bae AudioManager: deprecate vibrate settings
Deprecate methods, intent and constants related to vibrate
settings management: getVibrateSetting(), setVibrateSetting(),
shouldVibrate() ...

According to new vibrate/notification policy, applications should
maintain their own vibrate settings.

Issue 6036529.

Change-Id: I99bcef2c5f602131f1d9b0222f7fb39f3bbef823
2012-05-01 16:26:04 -07:00
Philip Milne
3e35030459 Merge "Fix for layout parameter validation bug in GridLayout." into jb-dev 2012-05-01 16:21:15 -07:00
Gilles Debunne
61552bc81f Merge "API fix in CheckedTextView" into jb-dev 2012-05-01 16:19:40 -07:00
Chris Craik
ad759f958a Merge "fix monkey scrolling crash" into jb-dev 2012-05-01 16:01:58 -07:00
Stephen Hines
d28030ae51 Merge "Start passing element/dim information along with FieldPacker." into jb-dev 2012-05-01 15:54:37 -07:00
Stephen Hines
a7228c882c Merge "Unhide FONT." into jb-dev 2012-05-01 15:54:16 -07:00
Stephen Hines
10e3e9a41a Merge "Move mesh to end of test list until we fix LLVM." into jb-dev 2012-05-01 15:54:10 -07:00
Chris Craik
5f3c08a411 fix monkey scrolling crash
bug:6336994

Depends on external/webkit change: https://android-git.corp.google.com/g/#/c/186186/

Change-Id: Ib019ca68f6e57f98e30b022949c624bab4695294
2012-05-01 15:53:06 -07:00
Guang Zhu
7fdde0cee2 Merge "remove extra semi colon" into jb-dev 2012-05-01 15:47:28 -07:00
Adam Cohen
c9ca7f38bc Merge "Preventing onClickPendingIntents from being set on collection widget items (issue 5961701)" into jb-dev 2012-05-01 15:36:21 -07:00
Philip Milne
8a36e05443 Fix for layout parameter validation bug in GridLayout.
Bug 6404882.

When a cell has an unspecified row and a column that is specified as greater
than the specified number of columns, GridLayout fails to report or correct
the error and loops indefinitely searching for a valid row to place the cell.

There is a cyclic dependency between the validation of layout parameters
(and allocation of undefined cell indexes) and the maximum column/row counts.
A performance optimization in layout paramter allocation caused this dependency
to be handled in correctly. The problem is fixed in this CL for this bug and
the symmetric problem for rows.

Change-Id: I0392343bc8a721a0ca7163f58f233ba8046c22e2
2012-05-01 15:24:50 -07:00
Amith Yamasani
d72ad2ac88 Merge "Fix a bug in appwidget migration to multiuser directory." into jb-dev 2012-05-01 13:57:53 -07:00
Amith Yamasani
e0eb39b548 Fix a bug in appwidget migration to multiuser directory.
Bug: 6393606

Migrate the old appwidgets.xml if the file doesn't exist,
not if the directory doesn't exist. It worked earlier because
this was the first service that I migrated to multi-user :(

Change-Id: I59bcbc31ff9d101e44dff5e5f44b3cab8f08dc06
2012-05-01 13:48:48 -07:00
Eric Fischer
dd8412d4fb Merge "Import translations. DO NOT MERGE" into jb-dev 2012-05-01 13:42:13 -07:00
James Dong
cb6662ac53 Merge "Add video scaling mode support with a new public method in MediaPlayer.java class" into jb-dev 2012-05-01 13:34:28 -07:00
Andreas Huber
f72d392f5d Merge "Make java constants consistent with native counterparts." into jb-dev 2012-05-01 13:32:18 -07:00
Chris Craik
37a8370b62 Merge "Revert "Add header for forward compatibility"" into jb-dev 2012-05-01 13:22:08 -07:00
Jeff Sharkey
dd471e6a6f Catch CCE when migrating to ClipData.
Bug: 6231948
Change-Id: I51bc272d29a17881b3d4908fda549da20aa7e6b3
2012-05-01 13:08:27 -07:00
Adam Cohen
ffc46a5c7c Preventing onClickPendingIntents from being set on collection widget items (issue 5961701)
Change-Id: If60f98c5e1be66ca840cbd4953841ef2c57a012b
2012-05-01 12:58:12 -07:00
Daniel Sandler
73b61d6710 Merge "Move legacy menu key to bottom right on sw600dp." into jb-dev 2012-05-01 12:58:09 -07:00
Brian Colonna
f4197bf935 Merge "Fix 6395288: Added lock to avoid unbind race condition" into jb-dev 2012-05-01 12:54:02 -07:00