summaryrefslogtreecommitdiffstats
path: root/src/com/android
Commit message (Collapse)AuthorAgeFilesLines
* am 91ca6ba6: am 93265e4b: am ea5e14db: Merge "Unused variables in ↵Jean-Baptiste Queru2010-12-061-5/+0
|\ | | | | | | | | | | | | AddNewBookmark" * commit '91ca6ba651a8fd6275db09a66faf8610a8ea15d8': Unused variables in AddNewBookmark
| * am 93265e4b: am ea5e14db: Merge "Unused variables in AddNewBookmark"Jean-Baptiste Queru2010-12-061-5/+0
| |\ | | | | | | | | | | | | * commit '93265e4ba4521ed8e6f685fec38ee0f2fd9f3697': Unused variables in AddNewBookmark
| | * am ea5e14db: Merge "Unused variables in AddNewBookmark"Jean-Baptiste Queru2010-12-061-5/+0
| | |\ | | | | | | | | | | | | | | | | * commit 'ea5e14dbf2f36fa0451af8bad64912c2ff44290a': Unused variables in AddNewBookmark
| | | * Unused variables in AddNewBookmarkHenrik Baard2010-12-061-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | The fields mTextView and mImageView are not used, and should be removed. Change-Id: Iaa5211b1f36e19b68d42bc925f8ace8641535a2c
| * | | am a4909cba: Hide the custom view when we get onPause() DO NOT MERGEBen Murdoch2010-12-011-1/+4
| |\ \ \ | | |/ / | |/| | | | | | | | | | * commit 'a4909cba214f3680063367e52044e9d74824c272': Hide the custom view when we get onPause() DO NOT MERGE
| | * | Hide the custom view when we get onPause() DO NOT MERGEBen Murdoch2010-11-301-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When we run onPause, be sure to hide any custom views (such as the HTML5 video view) so that when the activity restores we don't have anything overlaying the page. Bug: 3240426 Change-Id: Ic93286eab40cda814682bc023f3648b502545256
| * | | am 8187c15d: Merge "Cursor leak in share_link_context_menu."Jean-Baptiste Queru2010-11-011-29/+34
| |\ \ \ | | | |/ | | |/| | | | | | | | | * commit '8187c15d1c7f714c30573b9480ffb4bee18b96d7': Cursor leak in share_link_context_menu.
| | * | Cursor leak in share_link_context_menu.Henrik Baard2010-11-011-29/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Closing was not closed after handling share_link_context_menu_id. Added try / final to close cursor. Change-Id: I8825d3a264aa63f7a49c48165b98dd2e9e14ce3e
* | | | fix NPE in onDestroyMichael Kolb2010-12-061-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 3255996 In case of a search we might exit the browser without ever creating a controller; added check to lifecycle methods. Change-Id: I5fc358c31263ff63297a18944dce230f48886628
* | | | fix ComboPage dialog/popup/IME bugMichael Kolb2010-12-061-2/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 3166409 Put the tab in background while ComboPage is up this prevents dialogs from getting displayed Bug 3215897 make sure the IME is closed before ComboPage is displayed Change-Id: If832e040e2fa9acb12f45a3e9f681d1fd333f3b0
* | | | cleaned up resetTitleAndIconMichael Kolb2010-12-061-4/+3
| | | | | | | | | | | | | | | | | | | | | | | | eliminate unnecessary tab lookup Change-Id: I4d7f04fb13e5c5a5c5405b58c0853de8c0da44c8
* | | | Moved clear history to AsyncTaskJohn Reck2010-12-061-2/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 2739696 Clear history could cause an ANR. Moved it to an async task Change-Id: I27cb4e0235f4c15d46fe06a0f705389952fd3e92
* | | | Fixes race condition in HistoryAdapterJohn Reck2010-12-061-3/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3245076 There was a race condition between the two loaders. If most visited finished loading first, history would crash. Change-Id: I561edffe0cadef452b5fa2d621466bf23a9c57cf
* | | | Fixes crash when clearing historyJohn Reck2010-12-061-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3253556 The dialog to clear the history was trying to reference the fragment creating it, however that fragment was being destroyed. Fixed this by hanging on to the ContentResolver instead of trying to call getActivity() Change-Id: Ie46fd4cc34e7034ce9a21a6b8856041f8d350f17
* | | | Merge "Fixed strict mode violation in history"John Reck2010-12-061-1/+1
|\ \ \ \
| * | | | Fixed strict mode violation in historyJohn Reck2010-12-061-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3257747 Fixes a strict mode violation in BrowserHistoryPage. onPrepareOptionsMenu is doing a query on the UI thread to determine if it should show clear history or not. Fixed by having it ask the adapter, which is loaded async Change-Id: I12338987098d093e63f1944f2a1458ad962d0c78
* | | | | Merge "Fix a layout hierarchy bug"John Reck2010-12-061-1/+2
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Fix a layout hierarchy bugJohn Reck2010-12-031-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3254316 Fixes a problem where the BrowserBookmarkPage was adding new children but never removing them, creating a more and more complex view hierarchy. Change-Id: I23ba3030b1f995eb6dde482868eaafe020624f2a
* | | | | Merge "Sets umask to prevent world readable files"John Reck2010-12-061-0/+5
|\ \ \ \ \
| * | | | | Sets umask to prevent world readable filesJohn Reck2010-12-031-0/+5
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3244281 Set the umask on startup so that databases created in native code are not world readable. Change-Id: If0f54b209741645e173f0dd338804fabdafaa31e
* | | | | Show a highlighted star for bookmarked pages.Leon Scroggins2010-12-066-3/+93
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:3222677 Change-Id: Ifeb6e7a922c0defb1e4a88ded0c188b97e0a4a56
* | | | | flushCookieStore() shouldn't be in the public API after all.Iain Merrick2010-12-061-1/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | See change Ic4433400, where I reorganised the framework so that cookies are synced automatically by CookieSyncManager. Change-Id: Ide0afbe60c6ca0601e7337051c6aa98522a8b0bb
* | | | | Change homepage setting handlingJohn Reck2010-12-037-127/+38
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3247095 Tweaks the setting of the homepage setting. Replaces the "set to..." dialog with 2 buttons, and user can now enter a blank url to get a blank page with title "New Tab". Change-Id: I95bcfcd241db4b9efbde645100d2fd44c980e061
* | | | Bookmarks page UI updatesJohn Reck2010-12-035-101/+157
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3248628 Updates the bookmark page UI based off of the newest UI design document. Change-Id: I26447b7e1c38798b3c229c9d8c10af2565458a7b
* | | | Merge "Debug settings changes"John Reck2010-12-034-11/+74
|\ \ \ \
| * | | | Debug settings changesJohn Reck2010-12-034-11/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3250498 Makes OpenGL rendering and user agent normally visible in settings->debug Changing the OpenGL setting now automatically restarts the browser Change-Id: I04036b580f2463f77376edb4bee2dfefe3d123ed
* | | | | Merge "No longer use this private API."Dianne Hackborn2010-12-031-2/+2
|\ \ \ \ \
| * | | | | No longer use this private API.Dianne Hackborn2010-12-031-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I6da57d89b526975422afc0dab7051d28a17fa64e
* | | | | | Merge "Update homescreen icon generator to look better on xlarge devices."Ben Murdoch2010-12-031-14/+15
|\ \ \ \ \ \ | |/ / / / / |/| | | | |
| * | | | | Update homescreen icon generator to look better on xlarge devices.Ben Murdoch2010-11-301-14/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copy mipmap-hdpi resources into mipmap-xlarge to provide larger assets for xlarge devices (previously we were picking them up from mipmap-mdpi). With the larger icons, we also need to increase the size of the rectangle we draw the favicon onto (otherwise we see the points of the star coming out of the favicon). Bug: 3224340 Change-Id: If0a297836c288104a32e5dbcd5d886d5849f9698
* | | | | | Fix context menu for bookmarksJohn Reck2010-12-021-2/+2
| |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3249288 Fixed a bug where the code to lookup the count of the items in a folder was being executed for bookmarks as well as folders, causing the URL line to be replaced with "Empty Folder" in the context menu. Change-Id: I35ac071952da4093bac8bc104636dd8fcb8b84b1
* | | | | Merge "Url bar selection handling updated"Michael Kolb2010-12-025-41/+97
|\ \ \ \ \
| * | | | | Url bar selection handling updatedMichael Kolb2010-12-025-41/+97
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3222647 framework has been updated to change the way tap/double tap and long press are handled url bar uses a custom action bar to add the share option Change-Id: Ie75fc07fe71c9e16fc7f83deda8ecddea39b0397
* | | | | | Fixes test errorsJohn Reck2010-12-021-6/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3248213 Fixes errors in the tests that were caused by missing files, proguard, and the refactor. Change-Id: I503dfc7ee42d0173e3a5ad032f58a6f4f310588c
* | | | | Flush cookies when the browser is paused.Iain Merrick2010-12-011-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cookies are currently flushed on a 30-second timer, but this isn't sufficient because Android has a different application lifecycle from a desktop OS -- it can kill the app when it's in the background to save memory. Here we flush cookies during onPause(), so the most recent user activity should always be safely flushed to persistent memory. Depends on CookieManager change in frameworks/base (I04e96aff). Bug: 3231371 Change-Id: Iaa4541d4d18ab4c7bb6da372a4452f265b81d201
* | | | | Fix IllegalStateException in HistoryPageJohn Reck2010-11-301-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3228114 Fixes an IllegalStateException caused by the HistoryAdapter and the most visited cursor. Change-Id: I85208448f7af82c382be8be9450730420ce51b7a
* | | | | Fix video view is not dismissedMichael Kolb2010-11-301-0/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3240426 dismiss video view when browser goes into background Change-Id: I2276fcc5d510c656f665ba048ad9c67d3002c989
* | | | | Fix NPE in pauseWebViewTimersMichael Kolb2010-11-302-36/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/issue?id=3225410 added Tab parameter to pauseWebViewTimers removed unnecessary activityPaused parameter ensure tab is not null when called removed pauseCurrentTab method in TabControl changed resumeWebViewTimers to be consistent removed resumeCurrentTab from TabControl Change-Id: I1cdf6042aa4df4c832d91c5a19d7235d6dce2b5d
* | | | | Move Tab layout code to UIMichael Kolb2010-11-305-12/+34
| | | | | | | | | | | | | | | | | | | | Change-Id: Ic2d81345883bba22329b4f805c44a68b14e174e3
* | | | | Merge "Fix strict violation"John Reck2010-11-302-23/+74
|\ \ \ \ \
| * | | | | Fix strict violationJohn Reck2010-11-302-23/+74
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3239414 Fixes strict mode violations Change-Id: I07787b05d4f870c98ba0d05ebda928608d9bf029
* | | | | | Merge "Fixed URL logging in Incognito tab"John Reck2010-11-301-2/+4
|\ \ \ \ \ \
| * | | | | | Fixed URL logging in Incognito tabJohn Reck2010-11-291-2/+4
| | |/ / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3194842 Fixed an instance of URL logging when in an incognito tab. Change-Id: I8aae48314cc59e08f94db48546cd5a74eef9e69c
* | | | | | Merge "Fixes crash on empty url"John Reck2010-11-301-1/+2
|\ \ \ \ \ \ | |_|/ / / / |/| | | | |
| * | | | | Fixes crash on empty urlJohn Reck2010-11-291-1/+2
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3229882 This fixes a browser crash when the user would hit enter with an empty URL bar. Change-Id: I6af056e6b086b9b6c19d3b354d950d2fb2411b1f
* | | | | Changed WebsiteSettingsActivity to fragmentJohn Reck2010-11-303-73/+89
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3231307 Moved WebsiteSettingsActivity to a fragment Change-Id: If1fa56ab48167c004fb65c756f325e108f14fe8f
* | | | | Fix crash when changing Chrome bookmark sync account.Ben Murdoch2010-11-301-8/+16
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | Need to move a UI access from the AsyncTasks doInBackground to onPostExecute. Bug:3238088 Change-Id: I7ca63834f3992087025ae8e99e594690f163e937
* | | | Move access to the WebIconDatabase from the UI thread.Ben Murdoch2010-11-291-15/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the retainIconsOnStartup function was accessing the WebIconDatabase on the UI thread which is a strict mode violation. Move that database access into an AsyncTask. Change-Id: I4f03680d00b7678a89e41f94201ca5309891a8d9
* | | | Merge "Fix StrictMode violation in WebsiteSettingsActivity"Ben Murdoch2010-11-261-55/+83
|\ \ \ \
| * | | | Fix StrictMode violation in WebsiteSettingsActivityBen Murdoch2010-11-261-55/+83
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | WebsiteSettings was querying the bookmarks database on the UI thread. This is a strict mode violation so move that database read into an AsyncTask. Change-Id: I4f27dc2ec3cb842fe09591a0ee406f8af61d3022