18446 Commits

Author SHA1 Message Date
Shimeng (Simon) Wang
6ecf3e90f2 Merge "Use local variable instead of webview method." 2011-06-22 17:58:57 -07:00
Shimeng (Simon) Wang
b30381d783 Use local variable instead of webview method.
This removes the thread warning.

Change-Id: Id2eec46fda8413cfaed49d2a97de40491b7496a2
2011-06-22 17:44:27 -07:00
Chet Haase
ef716baaa0 Merge "Fix flashing artifacts caused by invalidation bugs" 2011-06-22 17:17:02 -07:00
Jaikumar Ganesh
78ff1a658b Get the profile proxies after the BT Service is up.
Trying to get the profile proxies before service is up will
cause a NPE.

Change-Id: I604041d6823775abbc2fe10794afaac83d6827ce
2011-06-22 16:55:32 -07:00
Chet Haase
ad4f70306b Fix flashing artifacts caused by invalidation bugs
Therea re 2 fixes here:
- We sometimes cleared a flag in ViewAncestor too soon that controlled
how invalidated areas were redrawn (related to whether the invalidates
happened on opaque views or not).
- TransitionDrawable was always setting/restoring alpha values on its
drawables every time it was drawn. setAlpha on BitmapDrawable causes
an invalidation, so essentially this was an infinite invalidation/redrawing
loop. The fix was to notice when the animation was done and to simply
draw the appropriate drawable[s].

Change-Id: I1849a5a909b0039a0e9bce0aa3cfc33c50f8f854
2011-06-22 15:53:53 -07:00
Romain Guy
4d65fdc810 Merge "Collapse UI events in TextureView." 2011-06-22 15:01:59 -07:00
Romain Guy
c989d867f2 Collapse UI events in TextureView.
Change-Id: Ia6c0cef0f694edc4b685c1ade1a9ba509a51e541
2011-06-22 15:01:07 -07:00
Robert Greenwalt
7af34ab836 Merge "resolved conflicts for merge of 7a652bc8 to master" 2011-06-22 14:41:09 -07:00
Brian Carlstrom
86b569020b Merge "JniUtil depends on webcore native library and should not depend on others to load it" 2011-06-22 13:42:07 -07:00
Robert Greenwalt
5ff886e531 resolved conflicts for merge of 7a652bc8 to master
Change-Id: Id0a41cae36f5a3b30f2fe8a202c934153b9cd03f
2011-06-22 13:20:14 -07:00
Adam Powell
bacbe7fd72 Merge "Fix bug 4807086 - Options menu panel too narrow in landscape" 2011-06-22 12:58:03 -07:00
Mike Lockwood
181735a8d5 Merge changes I9851299e,I4160e73a
* changes:
  Combine UsbManager.setPrimaryFunction and setDefaultFunction
  Fix window leak in UsbPreferenceActivity
2011-06-22 12:24:26 -07:00
Mike Lockwood
f59717ddb5 Combine UsbManager.setPrimaryFunction and setDefaultFunction
Due to the property trigger on persist.sys.usb.config,
setting the default function also sets the current function.
Now we combine both of these methods into setCurrentFunction, which has
a "makeDefault" option to make the new function the default.

This change should eliminate some problems with setting properties due to
multiple property triggers happening at the same time.

Change-Id: I9851299e9c2ee20475eada1a8104c0d50bf5a9e1
Signed-off-by: Mike Lockwood <lockwood@android.com>
2011-06-22 15:19:33 -04:00
Brian Carlstrom
452ffe7d1e JniUtil depends on webcore native library and should not depend on others to load it
Bug: 4584468

Change-Id: Ib553cda843669d40cc52ff0bc84bea2c626c5045
2011-06-22 11:29:56 -07:00
Adam Powell
a3e3c533ee Fix bug 4807086 - Options menu panel too narrow in landscape
Now that landscape on phones uses the config_prefDialogWidth setting
to restrict the default size of dialog windows, the options menu panel
was affected.

Restrict the ratcheting preferred width feature based on the width
LayoutParam only, and respect the LayoutParams width provided by panel
windows.

Change-Id: Idc62f41910f6f22dc50cab978c5642bb0a8dbdaf
2011-06-22 11:21:54 -07:00
Philip Milne
0edc52970f Merge "Minor tweaks to GridLayout for KeyGuardScreenUnlock." 2011-06-22 10:18:32 -07:00
satok
8969d9924c Revert "Create TextServiceManager and SpellCheckerService"
This reverts commit eaddb894865a804279659b4aad6364a34ab50beb.
2011-06-22 16:41:58 +09:00
satok
f86ee14f6a Merge "Create TextServiceManager and SpellCheckerService" 2011-06-22 00:02:55 -07:00
satok
c6080b3cc5 Merge "Add an ongoing notification to switch IME" 2011-06-21 23:09:00 -07:00
satok
7cfc0ed21a Add an ongoing notification to switch IME
Bug: 4671417
Change-Id: I2b9e955003c1f6703978824c947d5f322a039714
2011-06-22 15:08:08 +09:00
Jeff Brown
87b7f805b9 Send hover to all children under pointer.
Previously we only sent hover to the topmost child, but this doesn't
handle cases where multiple children are overlapped to achieve
certain special effects.  Now we send hover to all children until
one of them handles it.

Also moved the call to send the accessibility event into the
main dispatch function so that we can send the accessibility event
for all innermost hovered views even when setHovered() might
not be called.

Change-Id: I6fb8b974db44b594c441deafc012b8415afdfac7
2011-06-21 21:15:07 -07:00
Jeff Brown
194f4a7afd Merge "Only handle onHoverEvent in actionable views." 2011-06-21 21:12:24 -07:00
Jeff Brown
32b6328b0c Merge "Fix taint and nesting bugs." 2011-06-21 21:12:19 -07:00
Adam Powell
9c4e23c2b7 Merge "Fix bug 4818050 - Need a way to get notified when a PopupMenu gets dismissed/canceled" 2011-06-21 20:58:28 -07:00
Adam Powell
42b91bbcda Fix bug 4818050 - Need a way to get notified when a PopupMenu gets
dismissed/canceled

Add an OnDismissListener to PopupMenu.

Change-Id: I7abe1b9c9bea5e758a9c32631185e50cd7eb1ed0
2011-06-21 20:56:55 -07:00
Fabrice Di Meglio
aa4d46bb12 Merge "Fix bug #4796027 left/right padding regression after recent View change (part 2)" 2011-06-21 19:49:41 -07:00
Fabrice Di Meglio
f9e36506f1 Fix bug #4796027 left/right padding regression after recent View change (part 2)
- revert previous fix (transforming >=0 to >0)
- initialize mUserPaddingStart and mUserPaddingEnd to -1 in the specific View(Context context) constructor
- cache mUserPaddingStart and mUserPaddingEnd a bit earlier in View(Context context, AttributeSet attrs, int defStyle) constructor
- cache also mUserPaddingStart and mUserPaddingEnd in setPaddingRelative()

Change-Id: Ibe398da7af35f77655d7006444fa49c9c5387f62
2011-06-21 19:43:03 -07:00
Jeff Brown
10b6290c5f Only handle onHoverEvent in actionable views.
Modified onHoverEvent so that a view only has its state changed to
hovered when the view is clickable.  The intent is to prevent labels
from taking hover focus away from their containing view group despite
not being actionable in any way.  The child will still receive
a hover event but, if it does not handle the event (returns false),
the hover event will bubble up to its parent and ancestors allowing
them a chance to handle the event instead.

The new onHoverEvent semantics are better because now they closely
mirror those of onTouchEvent.  This makes it straightforward to
implement views that respond to hover by changing their visual
appearance (such as by making buttons glow when hovered).

Added onInterceptHoverEvent to enable ViewGroups to explicitly
intercept hover events within their bounds.

Exposed the new hover event API for real.

Change-Id: I63195c8f5c74b859f6047487f9a0f703e8f40ffe
2011-06-21 18:58:20 -07:00
Jeff Brown
738e7e431c Fix taint and nesting bugs.
Tainted events should still be processed, even if we don't bother
the developer with the details.

The check for nested calls to the event verifier must incorporate
the event type because different event types might be overridden
in different subclasses so the nesting depths may vary.

Change-Id: If2fb213e07db783a0bd1da97bb12aad93126d712
2011-06-21 18:58:20 -07:00
Svetoslav Ganov
3de7130d1d Merge "Searching for AccessibilityNodeInfo by text not case insensitive." 2011-06-21 18:12:15 -07:00
Svetoslav Ganov
ec39c234bd Searching for AccessibilityNodeInfo by text not case insensitive.
1. The query string was not converted to lower case during search
   for infos with text.

bug:4818098

Change-Id: Ie4ba8ac2632072bdd71070ec8fd24ca255560ac0
2011-06-21 18:02:35 -07:00
Fabrice Di Meglio
374d757e9c Merge "Fix bug #4796027 left/right padding regression after recent View change" 2011-06-21 17:55:50 -07:00
Svetoslav Ganov
40f6edf27b Merge "Touch exploration hover events don't map coordinates correctly on scrollable WebViews." 2011-06-21 17:54:17 -07:00
Fabrice Di Meglio
f8ed444fad Fix bug #4796027 left/right padding regression after recent View change
- mUserPaddingStart and mUserPaddingEnd had be be greater than 0 for overriding

Change-Id: I588a9971bf73aa9461716cfd5a006373a14408f8
2011-06-21 17:53:03 -07:00
Svetoslav Ganov
fbb1560d6e Touch exploration hover events don't map coordinates correctly on scrollable WebViews.
1. While mapping Android hover to WebKit mouse events I was not
   taking into account the horizontal and vertical scroll.

bug:4807087

Change-Id: Ie24a8a30ce6a20d27b627ae7c7fbff1b74d140c8
2011-06-21 17:51:40 -07:00
Svetoslav Ganov
9e29a4f90a Merge "AccessiblityNodeInfo#findAccessibilityNodesByText returns null if non found." 2011-06-21 17:41:19 -07:00
Svetoslav Ganov
86398bda3d AccessiblityNodeInfo#findAccessibilityNodesByText returns null if non found.
1. Updated the code to return empty list instead.

2. Updated the doc to explain that the search is done in the
   sub-tree rooted at the info whose method is called.

Change-Id: I560d2563ed4772305bf2d7919560ef19baa30a1d
2011-06-21 17:38:48 -07:00
Andy McFadden
f0c3b99113 Merge "Port EventRecurrence.parse() from native" 2011-06-21 16:09:50 -07:00
Andy McFadden
ae633b2d36 Port EventRecurrence.parse() from native
This adds a Java-language implementation of EventRecurrence.parse(),
to make it easier to relocate it for the benefit of unbundled
Calendar.

Differences from the native version:

 - enforces that FREQ appears first
 - allows (but ignores) X-* parts
 - improved validation on various values
 - error messages are more specific
 - enforces that only one of UNTIL and COUNT may be present [disabled]
 - allows lower-case property and enumeration values [disabled]

As part of the transition process, both versions of the parser are
called on every request, and the results are compared.  If the results
are different a warning message is logged.

An unnecessary constructor was removed.

This also this moves some EventRecurrence tests out of CalendarProvider,
into coretests, and adds a simple parse test with the examples from
the RFC.

Bug 4575374

Change-Id: If737ed1272fda65c93363d87b2da12b85e644f5b
2011-06-21 16:04:48 -07:00
Adam Powell
45d061656a Merge "Fix bug 4725323 - 'More' shows the icons which are already available in settings" 2011-06-21 15:17:41 -07:00
Adam Powell
51195b56ff Fix bug 4725323 - 'More' shows the icons which are already available
in settings

Change-Id: I161787710fbadaa19b93de3e69f3c60db2be73a6
2011-06-21 15:16:32 -07:00
Philip Milne
1fd1637881 Minor tweaks to GridLayout for KeyGuardScreenUnlock.
Also:

. Swapped order of args in internal getMargins() methods.
. Stopped implying row/col weight = 1 when size = MATCH_PARENT.

Change-Id: I657fb3e54867eb9735f9509878968941bf6a6a49
2011-06-21 14:57:47 -07:00
Adam Powell
ea1ca952c6 Fix bug 4108953 - Old-style menus do not show menu items marked as
showAsAction="always"

Change-Id: I63299143ea780abeed6dcdece6934f0e704b46a2
2011-06-21 14:07:59 -07:00
Jaikumar Ganesh
1349030755 Merge "Fix crash during unpair." 2011-06-21 11:44:32 -07:00
Jaikumar Ganesh
f7bc4bd13d Fix crash during unpair.
Change-Id: I8901abbbb6593b78fb5df93ab5d0085b32b6ba94
2011-06-21 11:41:00 -07:00
Jaikumar Ganesh
337b27985a Merge "Fix failure of Opp." 2011-06-21 11:37:47 -07:00
Jaikumar Ganesh
421f010108 Fix failure of Opp.
Needed due to upgrade of the Bluez stack, we can now
depend on just called createDevice.

Change-Id: I9c547d2ca3ee275365a22447641199eeaf807eac
2011-06-21 11:36:19 -07:00
Gilles Debunne
31e92e4f19 Merge "Support for arbitrary ListAdapter in PreferenceActivity." 2011-06-21 11:16:35 -07:00
Philip Milne
e9bb84a920 Merge "Accomodate margins in child measurements." 2011-06-21 10:13:15 -07:00
Narayan Kamath
4d03462b37 New API for TTS settings.
Engines must declare a <meta-data> attribute in their
manifest with name "android.speech.tts". This must reference
an XML resource as per
com.android.internal.R.styleable.TextToSpeechEngine.

Change-Id: I56a6b9f1a360174f98c9f39da901ade83d0f38a7
2011-06-21 10:28:30 +01:00