Commit Graph

17114 Commits

Author SHA1 Message Date
Huahui Wu
2e029c67a8 Revert "Gets the URL that has a cert error and carrys it in SslError."
This reverts commit 3015516a46.
2011-06-28 10:10:07 -07:00
Huahui Wu
3015516a46 Gets the URL that has a cert error and carrys it in SslError.
b/2689122 SSL error shows the wrong page when triggered by an image/javascript in the page.
This change receives the URL which has a cert error from webkit and carrys it in SslError.
so the Browser app can show the URL in the dialog boxes. Related CLs are:
   webkit: https://android-git.corp.google.com/g/#change,117817
   browser: https://android-git.corp.google.com/g/#change,117835

Change-Id: I65c3f038a48b6386fa93cb25a9ef70dbfb982c18
2011-06-27 18:14:54 -07:00
Dianne Hackborn
58b8684177 Merge "Fix issue #4770360: older app compatibility mode is really tiny on ICS phones" 2011-06-23 12:13:06 -07:00
Dianne Hackborn
2b31d53161 Fix issue #4770360: older app compatibility mode is really tiny on ICS phones
We were applying the density compat mode scaling multiple times to
display metrics, causing bad values.

Change-Id: Iafafd9a5e94b9d774cd2715bf968e91602a1bd82
2011-06-23 12:00:54 -07:00
Philip Milne
a1f7b10f72 Handle baseline aligned rows in which some components define baseline and some don't.
Also:

. Make all of the methods in Alignment package private.
. Inlucde Tor's test case

Change-Id: If78a6a3b653723d9e12d6b162fd0c86b11a82dff
2011-06-23 11:41:57 -07:00
Irfan Sheriff
756f25fc61 am 1cc0fa41: am db45e0bd: am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2
* commit '1cc0fa416f195732cc7c04cebfaabe7f3fe994c7':
  Release wakelock after use
2011-06-23 08:17:01 -07:00
Grace Kloba
cf559377b7 Add onSurfaceTextureUpdated to the TextureView listener.
The app needs a way to throttle the producer side. Expose this to enable it.

Change-Id: I04b6a3fc444117a9fc2449fb87c3c834247c8ef1
2011-06-22 23:05:40 -07:00
Jeff Sharkey
ea5f51909b Merge "Enable bandwidth module from stats service." 2011-06-22 22:21:31 -07:00
Jeff Sharkey
0a9ee1272b Enable bandwidth module from stats service.
During systemReady(), tell netd to enable bandwidth tracking module,
which is used to provide detailed stats and controls.

Change-Id: Iecfd8b17a3b90f5a817d731fbe1c71777681ed6e
2011-06-22 21:44:12 -07:00
Adam Powell
fbca76965b Fix bug 4887033 - android.app.cts.AlertDialog_BuilderTest#testDisableCancelable
Change-Id: I659201124c4c6730046be55a918c64ca57a9f4db
2011-06-22 21:29:19 -07:00
Romain Guy
8b4512ef20 Merge "Prevent possible NPE in TextureView" 2011-06-22 21:02:31 -07:00
Romain Guy
1ec3a58bcd Prevent possible NPE in TextureView
Change-Id: I539813d614c7eb1f68dad6b605cbad5b5144c5e9
2011-06-22 21:01:58 -07:00
Romain Guy
c2e0a1f1cd Merge "Add the ability to specify the opacity of a TextureView" 2011-06-22 20:59:46 -07:00
Romain Guy
a9489274d6 Add the ability to specify the opacity of a TextureView
TextureView assumes its content is opaque by default.

Change-Id: Iba873423566a5b67c388081838bd910dceba32ba
2011-06-22 20:58:11 -07:00
Nick Pelly
b8a8c7a279 resolved conflicts for merge of 6ce70394 to master
Change-Id: I7a4a08409c0133a1738b03b476f2b388c7aec5bf
2011-06-22 20:32:36 -07:00
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
Irfan Sheriff
1cc0fa416f am db45e0bd: am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2
* commit 'db45e0bdd02c2b9416b89999422561929feb5cc0':
  Release wakelock after use
2011-06-22 11:21:12 -07:00
Irfan Sheriff
a08c552083 am 38053dad: am 41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling""
* commit '38053dad9f8b988a162fba89545f4f7b8a09d34c':
  Revert "DO NOT MERGE Revert "Fix lease duration handling""
2011-06-22 11:21:05 -07:00
Irfan Sheriff
5389c80d1f am cf99765b: resolved conflicts for merge of 914ed90f to honeycomb-LTE
* commit 'cf99765b6255d73aa4fbc61d5bd78ec65fbd0370':
  Revert "DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine""
2011-06-22 11:19:09 -07:00
Irfan Sheriff
db45e0bdd0 am ecce539f: Merge "Release wakelock after use" into honeycomb-mr2
* commit 'ecce539f3d739fbf4b395639a485fddf51f688d6':
  Release wakelock after use
2011-06-22 11:10:26 -07:00
Irfan Sheriff
38053dad9f am 41b35884: Revert "DO NOT MERGE Revert "Fix lease duration handling""
* commit '41b35884ff68a62f5fc8f65dcc26342d0889113d':
  Revert "DO NOT MERGE Revert "Fix lease duration handling""
2011-06-22 11:10:16 -07:00
Irfan Sheriff
cf99765b62 resolved conflicts for merge of 914ed90f to honeycomb-LTE
Change-Id: I616b7ba5c27d0cc4247f5cce4303effe14658e1e
2011-06-22 11:01:16 -07:00
Philip Milne
0edc52970f Merge "Minor tweaks to GridLayout for KeyGuardScreenUnlock." 2011-06-22 10:18:32 -07:00
Irfan Sheriff
20b6ded6e3 am 5d5b73be: Merge "resolved conflicts for merge of 267a6181 to honeycomb-LTE" into honeycomb-LTE
* commit '5d5b73be515d839d72e1cf7aeffdfdfb56d66045':
  DO NOT MERGE Revert "DO NOT MERGE Add DhcpStateMachine"
2011-06-22 07:47:16 -07:00
Irfan Sheriff
c74eacde30 resolved conflicts for merge of 267a6181 to honeycomb-LTE
Change-Id: I95d459c937f788ed15f178e85692e1c393bdaa04
2011-06-22 07:11:42 -07:00
satok
8969d9924c Revert "Create TextServiceManager and SpellCheckerService"
This reverts commit eaddb89486.
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