15759 Commits

Author SHA1 Message Date
Brian Muramatsu
46a8851360 Fix NPE in SQLiteDatabase#updateWithOnConflict
Bug 3188586

...to restore old behavior of throwing IllegalArgumentException
when values is null.

Change-Id: Ic2df542b2cdbdb7571080eb7f0fc6a4fe1678446
2010-11-12 14:00:36 -08:00
Alon Albert
6e079a32bc Reset backoff on successful sync
Change-Id: I5661485e580dae127c756cd13e814987242e26dd
2010-11-12 13:42:56 -08:00
Brad Fitzpatrick
9feaa0fb44 Merge "Disable SamplingProfilerIntegration until it's fixed." 2010-11-12 13:24:09 -08:00
Brad Fitzpatrick
0b91729b8d Disable SamplingProfilerIntegration until it's fixed.
Change-Id: I685e0600414836d0caae8e37ee7e97cabeb555ce
2010-11-12 13:22:24 -08:00
Shimeng (Simon) Wang
ce1d004ca1 Merge "Fix mobile sites' viewport in fixed viewport mode." 2010-11-12 13:16:24 -08:00
Gilles Debunne
c7e7287aec Fix in public.xml for broken build
Change-Id: I17fdd8a01eb06b4e63ea020bbdfe5dd281743a19
2010-11-12 13:01:18 -08:00
Gilles Debunne
e7b73d2974 Merge "Added a flag for TextView that allows for text selection in read-only TextViews." 2010-11-12 12:23:00 -08:00
Derek Sollenberger
515f6d8db3 Only show double-tap tip if the feature is enabled.
bug: 3170472
Change-Id: I41a278ff44a7fba807c3a4a22f0e0ea20d137d0a
2010-11-12 15:12:58 -05:00
Leon Scroggins
56a102c02e nativeFocusCandidateTextSize now returns a float.
Bug:3085564

Requires a change in external/webkit.

Change-Id: Id2960226766e87b4d0ff364c2e5b3bee6b6757ad
2010-11-12 15:03:30 -05:00
Shimeng (Simon) Wang
f902e4b2b5 Fix mobile sites' viewport in fixed viewport mode.
issue:3003933
Change-Id: I4d9665c578443fcc12bab2f929ffa8b5995c28f7
2010-11-12 11:58:46 -08:00
Adam Cohen
176116aa60 Merge "-Prevent StackView from advancing while interacting with it -Fixed null pointer exception Change-Id: I294a0d055de51573d79219ef469c8df6ab04a297" 2010-11-12 11:38:35 -08:00
Gilles Debunne
86b9c78e3e Added a flag for TextView that allows for text selection in read-only TextViews.
Bug 3101642

Change-Id: I5538e507043c89b02c07f3e1c1abc74a93467427
2010-11-12 11:33:01 -08:00
Leon Scroggins
393352608e Merge "Provide variable for debugging the text in WebTextView." 2010-11-12 11:20:13 -08:00
Adam Cohen
0ac116b688 -Prevent StackView from advancing while interacting with it
-Fixed null pointer exception
Change-Id: I294a0d055de51573d79219ef469c8df6ab04a297
2010-11-12 11:04:32 -08:00
Adam Powell
9a0d1d2a25 Merge "Fix bug 3146938 - Menus spawned by ActionBar should hide when action bar is hidden" 2010-11-12 10:37:50 -08:00
Leon Scroggins
c26dc9f38f Provide variable for debugging the text in WebTextView.
Change-Id: I40630e3ab754c9e9805dc674c8c0c6c8688973c3
2010-11-12 13:08:14 -05:00
Alon Albert
95b831be6b Merge "Improve logging" 2010-11-12 09:57:49 -08:00
Jaikumar Ganesh
fb7f721896 Merge "Don't call cancel discovery when its already canceelled." 2010-11-12 09:45:11 -08:00
Jaikumar Ganesh
58d0dcb75b Don't call cancel discovery when its already canceelled.
Reported by: Leijun Tao

Change-Id: I5f04ecde16d147776a30810210cd3c973aee4d87
2010-11-12 09:41:12 -08:00
Ben Murdoch
685c05eb54 Stop loading if the user cancels the SSL certificate warning dialog
If the user cancels the bad SSL certificate dialog, stop loading
and return them to the page they were on previously.

Bug: 3189482
Change-Id: Ie5796a8fdc5ba38e1ab42de5beecf7fa4ecec3ed
2010-11-12 15:43:40 +00:00
Leon Scroggins
c35f4ac309 Work on lining up the TextView and web page text.
Bug:3085564

Do not round the text size when applying it to the WebTextView,
so that it will better line up with the text shown on the web
page.

Modify the WebTextView paint to better match the paint used by
webkit.

Update the padding when the zoom level changes.

Change-Id: I284a6febcba2be21dc1ab3f74c6ab5751e1b19b6
2010-11-12 10:41:14 -05:00
Jonas Schwertfeger
8402903723 Added buildQuery and buildUnionSubQuery methods without misleading selectionArgs parameter.
The signatures of the existing buildQuery and buildUnionSubQuery methods include a selectionArgs
parameter that is not actually being used in the method implementations.  This parameter leads
to the misconception that SQL paramter substitution is carried out by these methods.  I added
new variants of these methods without that parameter and deprecated the old variants.

Change-Id: I1bf770d5c777649e9aac36d93aa93bd65bbcc2a3
2010-11-12 12:18:37 +01:00
Adam Powell
0458796f14 Fix bug 3146938 - Menus spawned by ActionBar should hide when action
bar is hidden

Any popup spawned by the private class MenuPopupHelper will be hidden
if its anchor becomes hidden. ("hidden" == !View#isShown())

Fix a bug where ActionBar subtitle views were not going away when
subtitle text was set to null.

Fix a bug when switching out of ActionBar tabbed nav mode with no
active tabs.

Change-Id: I1f30c067156221f96905ac69ab876418ad2e94f8
2010-11-11 22:55:36 -08:00
Dianne Hackborn
bdd19bc338 Add Theme.Holo.DialogWhenLarge
This theme gives you a dialog look when running on a large
or xlarge screen, otherwise a regular full-screen activity.

Also some new Fragment convenience APIs.

Change-Id: I3d97928ffaa4f3bdfd0cc5daf8823f9235c4ba68
2010-11-11 22:33:20 -08:00
Jim Miller
a4e28d1819 Add password expiration support to DevicePolicyManager.
Change-Id: Ib2629ec547c123ac489d7f4cbd4e0a1d4aa07620
2010-11-11 19:43:24 -08:00
Jeff Brown
1aab83501c Merge "Add new keycodes initially used for GoogleTV devices." 2010-11-11 18:47:57 -08:00
Adam Powell
2a88ffe118 Merge "Bug 3183184 - add fade-out for selectable item backgrounds" 2010-11-11 18:41:33 -08:00
Adam Powell
ad16608bac Bug 3183184 - add fade-out for selectable item backgrounds
Change-Id: Id2a1ff4eb7177509f08c20e39bbf1dbf5c25dd5f
2010-11-11 18:39:47 -08:00
Jason Bayer
3adf490a5a Add new keycodes initially used for GoogleTV devices.
Change-Id: I1b901037d6d401931dd3ec6f7d5e1e6ad165d1c9
2010-11-11 18:36:11 -08:00
Vasu Nori
7c5c9e4717 Merge "add column to downloads table to store error msg when a download fails" 2010-11-11 16:35:43 -08:00
Adam Powell
61a6315e66 Merge "First pass at styling progress bars for Holo." 2010-11-11 16:04:09 -08:00
Eric Fischer
9acf04ab6a am 3082e5fe: Merge "Import revised translations. DO NOT MERGE" into gingerbread
* commit '3082e5fed04c42301c89de8df36e9d62f0937dec':
  Import revised translations.  DO NOT MERGE
2010-11-11 15:49:03 -08:00
Eric Fischer
3082e5fed0 Merge "Import revised translations. DO NOT MERGE" into gingerbread 2010-11-11 15:44:04 -08:00
Romain Guy
add94f204c Merge "Free resources only from the GL context thread. Bug #3179882" 2010-11-11 15:42:35 -08:00
Jaikumar Ganesh
3ca2ee0f03 Merge "Fix crash in dump function." 2010-11-11 15:38:21 -08:00
Romain Guy
fe48f65922 Free resources only from the GL context thread.
Bug #3179882

Resources were freed following garbage collections on a worker thread.
This worker thread had no EGL context, which would cause the renderer
to incorrectly assume that the memory was liberated.

Change-Id: Ifdb51f94ddf42641e8654522787bfac532976c7c
2010-11-11 15:36:56 -08:00
Vasu Nori
4015de2a08 add column to downloads table to store error msg when a download fails
useful for debugging for bugs like bug:3187299
without this error message, one doesn't know WHY downloads
fail.
there is a STOPSHIP comment around storage of this error
message in database.

Change-Id: I1fa49ee9eb97be16aced1611ab30a286b0b6c8d2
2010-11-11 15:22:13 -08:00
Jaikumar Ganesh
bb0773fac8 Fix crash in dump function.
Change-Id: I5a4cd7cf3fd325ced5d05f036c191f759dee16e0
2010-11-11 15:18:19 -08:00
Adam Powell
021aad952b First pass at styling progress bars for Holo.
Added attribute to let scale drawables size based on the intrinsic
width and height as a minimum. This helps prevent artifacts when
some 9-patches are used in situations like progress bars.

Change-Id: I168a232d3225afe9b5578a05a9b8634a1084404c
2010-11-11 14:53:29 -08:00
Chet Haase
449bb119c9 Merge "Add invalidation to Drawable when its properties change" 2010-11-11 14:04:10 -08:00
Gilles Debunne
a61cc93199 Merge "Lock screen should not display password." 2010-11-11 13:46:17 -08:00
Chet Haase
9891e1fce5 Add invalidation to Drawable when its properties change
invalidateSelf() already exists on Drawable. This triggers a call to
callback listeners so that they know the drawable has been invalidated.
For example, the background drawable on View will cause the View itself
to be invalidated.

Change-Id: I45b231a7600dcf3bc139e4059b7c9940ff49f60c
2010-11-11 13:20:08 -08:00
Gilles Debunne
d7483bfffc Lock screen should not display password.
Bug 3179062

Problem was introduced in CL 78854: changing the keyListener should not
change the transformation method.

mInputType changes are brittle. It is often reset to TYPE_CLASS_TEXT or to
mInput.getInputType(). The TYPE_TEXT_FLAG_MULTI_LINE and TYPE_TEXT_VARIATION_PASSWORD
variation are then added back based on the previous state. But this is not consistent,
and sometimes, only one of those is set.

This should be refactored if a bug is found in what seems to work correclty at the moment.

Change-Id: Ie251ec7db0ce0af4a07564b0dbb53465e6f361c6
2010-11-11 12:20:16 -08:00
Leon Scroggins
8b83d25222 Merge "Ensure that text passed in is non-null." 2010-11-11 11:41:07 -08:00
Brad Fitzpatrick
54019ee8c5 Merge "StrictMode.Span support" 2010-11-11 11:33:18 -08:00
Alon Albert
3fa51e3430 Improve logging
Change-Id: Ia855b1a45a3abbc1a87233462f19b330b72d30b9
2010-11-11 11:30:26 -08:00
Jaikumar Ganesh
53f0f36352 Merge "Make AUDIO_STATE_CONNECTING in BluetoothHeadset public." 2010-11-11 11:20:14 -08:00
Leon Scroggins
ef7af28975 Ensure that text passed in is non-null.
Bug:3183112
Change-Id: Icf00e2793cb9b62dd0ebb4f60b8ddcafea3e581f
2010-11-11 14:20:06 -05:00
Gilles Debunne
f170a345b3 Added drag and drop functionality in TextViews
Basic implementation. The finger is currently hiding the insertion position.
An offset has to be added in DragThumbnailBuilder to prevent this.

Change-Id: I4207c337a2a31162063fba191a5eb5d5856b24cf
2010-11-11 11:09:02 -08:00
Jaikumar Ganesh
b0a1d01b4c Make AUDIO_STATE_CONNECTING in BluetoothHeadset public.
As the SCO connection is done on a separate thread, this
state is needed to prevent silent failures in case of APIs like
voicerecognition.

Change-Id: Id08725323a2c847df4d3bd9f60e42fde46100707
2010-11-11 10:59:48 -08:00