76093 Commits

Author SHA1 Message Date
Irfan Sheriff
7a6a4bf1b5 Merge "P2p fixes" into jb-dev 2012-05-02 11:14:21 -07:00
Adam Cohen
9edbb23577 am dfed49a2: Merge "Changing app widget "extras" to "options" and another small API Review issue" into jb-dev
* commit 'dfed49a2852e9336e212f6934dcddec7dd743c26':
  Changing app widget "extras" to "options" and another small API Review issue
2012-05-02 11:08:17 -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
478b2194e3 am e318c9a5: Merge "Check null of address in onDeviceCreated" into jb-dev
* commit 'e318c9a5f1819e953a2c78b32bced3c7fc427dbf':
  Check null of address in onDeviceCreated
2012-05-02 10:17:32 -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
c6b939789a am e849230f: Merge "DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition" into jb-dev
* commit 'e849230f444653e692024b4321044cb9f6188919':
  DO NOT MERGE : Backport I5723f627ce323b0d12b Reduce window resizing during IME transition
2012-05-02 01:43:17 -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
Svetoslav Ganov
42c5cb3028 Adding title for the date picker dialog if the calendar is not shown.
1. The date picker dialog shows spinners and a mini calendar on
   tablet but on on phone the calendar is not show and the user
   does not know the day of the week otherwise show on the mini
   calendar.

bug:5264972

Change-Id: I06aeb7ba1ad34d4e99628d9586ff2777e981c963
2012-05-02 01:02:43 -07:00
Craig Mautner
83339b465c Fix Home key causes wrong animation
Wallpaper logic assumed that if mWallpaperTarget was non-null then
any wallpaper animation should be exiting. However, if the existing
wallpaper target was already animating away then mWallpaperTarget
remains non-null until it is completely gone. Pressing Home during
this time was causing the next animation to exit rather than reverse
and enter.

This fix looks to see if the wallpaper target is animating and if it
is to treat it as null for the purpose of determining which direction
the animation should go.

Fixes bug 6407941.

Change-Id: I731267328db0f9972a5aed6f214962f96737dd07
2012-05-01 22:13:23 -07:00
Adam Powell
a60ce98593 am 39f412d8: Merge "API modifications for TaskStackBuilder" into jb-dev
* commit '39f412d8deed2ba46153c8a819bc8635979cec6b':
  API modifications for TaskStackBuilder
2012-05-01 19:14:35 -07:00
Jeff Brown
8802ef02cb am 69387f43: Merge "Use EVIOCSCLOCKID correctly." into jb-dev
* commit '69387f432d54f117ea7effa691925a3b918246e4':
  Use EVIOCSCLOCKID correctly.
2012-05-01 19:11:48 -07: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
c3cca66404 am 0632b35b: Merge "Improve handling of built-in keyboard." into jb-dev
* commit '0632b35b6828cd4324b3d218c2e38f895e819aad':
  Improve handling of built-in keyboard.
2012-05-01 18:41:00 -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
48661a65a9 am 5a00661b: Accessibility focus should not affect the currently active window.
* commit '5a00661bd6a1bfe82656c51d23a3ac6be99602a2':
  Accessibility focus should not affect the currently active window.
2012-05-01 18:32:05 -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
John Reck
33b019b183 Rewrite PictureSet
Removes no longer supported splitPicture
Removes unnused code

Bulk of the change is in webkit CL: https://android-git.corp.google.com/g/#/c/185850/

Change-Id: I4eca363ba3cb4a6d6fccc82bf5ea8588df780a4b
2012-05-01 17:24:38 -07:00
John Reck
273b8c2e7f Add missing null check
Change-Id: I05e288762c00d80f4c0842584daa88c205196b6f
2012-05-01 17:22:25 -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 Sharkey
7534e4b0ba am 19eaf0a7: Merge "Catch CCE when migrating to ClipData." into jb-dev
* commit '19eaf0a74dc4521db4c248504ea1815d052c0b27':
  Catch CCE when migrating to ClipData.
2012-05-01 16:34:54 -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
5518ab0649 am f3afe157: Merge "AudioManager: deprecate vibrate settings" into jb-dev
* commit 'f3afe15754a3ffbc41955476081c3a29adaf32f3':
  AudioManager: deprecate vibrate settings
2012-05-01 16:32:20 -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
6b36d0d044 am 3e350304: Merge "Fix for layout parameter validation bug in GridLayout." into jb-dev
* commit '3e350304599eeb627065de75f3bfe3a45f58389e':
  Fix for layout parameter validation bug in GridLayout.
2012-05-01 16:24:46 -07:00
Gilles Debunne
6b578dc30c am 61552bc8: Merge "API fix in CheckedTextView" into jb-dev
* commit '61552bc81f9f0c1aacbeec694ff97978050c6182':
  API fix in CheckedTextView
2012-05-01 16:22:23 -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
272a51d1be am ad759f95: Merge "fix monkey scrolling crash" into jb-dev
* commit 'ad759f958a8bd87982b3f34d8424d1ac69c20342':
  fix monkey scrolling crash
2012-05-01 16:05:01 -07:00
Chris Craik
ad759f958a Merge "fix monkey scrolling crash" into jb-dev 2012-05-01 16:01:58 -07:00
Stephen Hines
6c9cd4eb7b am d28030ae: Merge "Start passing element/dim information along with FieldPacker." into jb-dev
* commit 'd28030ae51322b4419e4c7ee2501bd8a5a20434f':
  Start passing element/dim information along with FieldPacker.
2012-05-01 15:56:38 -07:00
Stephen Hines
790accafa8 am a7228c88: Merge "Unhide FONT." into jb-dev
* commit 'a7228c882c468aabaed41e4499805aa5474f0dec':
  Unhide FONT.
2012-05-01 15:56:37 -07:00
Stephen Hines
2f99df4500 am 10e3e9a4: Merge "Move mesh to end of test list until we fix LLVM." into jb-dev
* commit '10e3e9a41a2f2a401f2a7c17d5b87582b4d1b7fe':
  Move mesh to end of test list until we fix LLVM.
2012-05-01 15:56:35 -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
80fbdcbdea am 7fdde0ce: Merge "remove extra semi colon" into jb-dev
* commit '7fdde0cee2ac90da6603585f4789644fbf00925d':
  remove extra semi colon
2012-05-01 15:49:48 -07:00
Guang Zhu
7fdde0cee2 Merge "remove extra semi colon" into jb-dev 2012-05-01 15:47:28 -07:00
Jean-Baptiste Queru
8e2f7ade24 am 78821e8e: (-s ours) am 1b34c1bc: Merge "stagefright: Remove useless declarations"
* commit '78821e8e22930214c4cd79192f988ca2266fa8cc':
  stagefright: Remove useless declarations
2012-05-01 15:44:37 -07:00