summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Adds support for PARAM_ACCOUNT* to Combined URIJohn Reck2010-12-101-50/+95
| | | | | | | | Bug: 3203588 This change adds support for the PARAM_ACCOUNT* query parameters when querying the Combined.CONTENT_URI Change-Id: I9a8f312a73f63189bdf85ca0eb9eea74e994dba5
* Merge "Import revised translations."Eric Fischer2010-12-1041-767/+571
|\
| * Import revised translations.Eric Fischer2010-12-0941-767/+571
| | | | | | | | Change-Id: Ideb79f52b89493a5954e54e0397db9ad63b896b2
* | Merge "New tab rendering"Michael Kolb2010-12-1017-29/+183
|\ \
| * | New tab renderingMichael Kolb2010-12-1017-29/+183
| | | | | | | | | | | | | | | | | | Rendering tabs from a fixed background asset Change-Id: Ic02ed0c059486c2bb8157f19012f98099bf7e75a
* | | Adds selection support to Bookarks DEFAULT_FOLDERJohn Reck2010-12-101-24/+30
|/ / | | | | | | | | | | | | | | Bug: 3268145 Adds support for selection and selectionArgs when using Bookmarks.CONTENT_URI_DEFAULT_FOLDER Change-Id: I2b6c6c47c2f7b42d64acff13d991869a7dc2d9b3
* | Fixes history update race conditionJohn Reck2010-12-102-58/+122
| | | | | | | | | | | | | | | | | | Bug: 3270709 Since ContentResolver does not have transaction support, I moved history updates to a controller that can serialize updates to the history table. This prevents the race condition. Change-Id: Ic33bedb9d6faef2393379306f8f88778d16caf24
* | Adds client id URL filtering to the providerJohn Reck2010-12-101-1/+34
| | | | | | | | | | | | | | | | | | Bug: 3270662 Moves the client id URL filtering into the provider so that it is applied to all history queries, updates, and inserts. We do this because we do not want the client id in the history. Change-Id: Ifb77debcb1c2102bd72701910bfbf07ed23c45ef
* | Merge "Fixes adding 2 entries to history on search"John Reck2010-12-101-14/+0
|\ \
| * | Fixes adding 2 entries to history on searchJohn Reck2010-12-091-14/+0
| |/ | | | | | | | | | | | | | | Bug: 3175520 Fixes a problem where search terms were being added as history entries. Change-Id: I86e462c53c0992de5cc5eff99b1bfd0a41e5a012
* | am 7c75f58b: (-s ours) am 9fc2111c: Import revised translations. DO NOT MERGEEric Fischer2010-12-100-0/+0
|\ \ | | | | | | | | | | | | * commit '7c75f58b793cfe3b611671afac0e77d2a38043cf': Import revised translations. DO NOT MERGE
| * \ am 9fc2111c: Import revised translations. DO NOT MERGEEric Fischer2010-12-102-3/+3
| |\ \ | | | | | | | | | | | | | | | | * commit '9fc2111c2b02d87d4a0d724d93ff9aeea2051a1c': Import revised translations. DO NOT MERGE
| | * | Import revised translations. DO NOT MERGEEric Fischer2010-12-093-4/+4
| | | | | | | | | | | | | | | | | | | | | | | | Bug 3272618 Change-Id: I83e87497cfc06c0e3287e34dbe6536c63fdf4ca7
* | | | Warn user when max number of tabs is reachedMichael Kolb2010-12-104-7/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/issue?id=3123994 A toast is shown when the max number of tabs is reached Change-Id: I5008e227c91139147920fd214f184061f816a353
* | | | Revert "Adds selection support to Bookarks DEFAULT_FOLDER"Leon Scroggins2010-12-101-29/+24
| | | | | | | | | | | | | | | | This reverts commit 8bb2e844c542df30a109c081700ea829dc427e6d.
* | | | Merge "Adds selection support to Bookarks DEFAULT_FOLDER"Leon Scroggins2010-12-101-24/+29
|\ \ \ \
| * | | | Adds selection support to Bookarks DEFAULT_FOLDERJohn Reck2010-12-091-24/+29
| | |_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3268145 Adds support for selection and selectionArgs when using Bookmarks.CONTENT_URI_DEFAULT_FOLDER Change-Id: I7732d12875266c205325f5052b931bc214a2067b
* | | | Hooked up shortcut callback listenerJohn Reck2010-12-091-0/+1
|/ / / | | | | | | | | | | | | | | | | | | | | | Bug: 3272241 When the cancel button was added the call to register a callback listener was accidentally removed. Adding it back. Change-Id: I45fc205873a4c1d3b9f4faa470cecf7cfed661c7
* | | add source type to search queriesMichael Kolb2010-12-092-9/+20
| | | | | | | | | | | | | | | | | | | | | Bug: http://b/issue?id=3237688 add the source extra to search queries based on the source Change-Id: Id39083a5904c7ff98431e7e625871f920f634bcf
* | | fix ComboPage and tab interactionMichael Kolb2010-12-091-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | Bug: http://b/issue?id=3259963 Make sure the combo page is hidden correctly when the user interacts with the tab bar Change-Id: I776b30690dbc10a399ca31f9e1c8b9c4f677a1d2
* | | Not using a async task for removing session cookiesKristian Monsen2010-12-091-12/+2
| | | | | | | | | | | | | | | | | | The cookie manager method are now taking care of making this async and blocking on the webcore thread Change-Id: I52d69b4e277aef84a59ff777302c7b223831b724
* | | Merge "Adds a cancel button to ShortcutActivity dialog"John Reck2010-12-085-9/+91
|\ \ \
| * | | Adds a cancel button to ShortcutActivity dialogJohn Reck2010-12-075-9/+91
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 3167402 Adds a cancel button to the ShortcutActivity when it is being shown as a dialog (when large) Change-Id: I6e47db8770cd18f69d534c361ff8fc90128e8dad
* | | | Do not show allow placing a folder inside itself.Leon Scroggins2010-12-081-1/+7
| | | | | | | | | | | | | | | | | | | | Bug:3263141 Change-Id: I0e070fbab798fe8c439b8ef0e6785b4a06e29466
* | | | Fix StrictMode violation in shouldOverrideUrlLoadingBen Murdoch2010-12-081-16/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Move the RLZ string database lookup into a background thread to clear up a fairly regular Strict Mode violation. Change-Id: I2a7bcc6649b6e3ae433226d838673ea8aef02db7
* | | | Merge "Tidy up autofill UI."Ben Murdoch2010-12-082-58/+46
|\ \ \ \
| * | | | Tidy up autofill UI.Ben Murdoch2010-12-072-58/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removes some unnecessary attributes and squashes a little bit so that we don't need to scroll the editor to see the buttons in landscape. Also update some strings. Change-Id: I3d310d48947fed128ae2a24476e33daa3786b8a9
* | | | | Update each Tab when the bookmarks database changes.Leon Scroggins2010-12-073-34/+70
| |/ / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:3222677 When the bookmarks database changes, we may have added or removed a bookmark. For each Tab, make sure that it knows whether or not it is a bookmark, and update the UI accordingly. Change-Id: Ie91008973c2841dc7367e38ad5db40bf25b1dddf
* | | | Fix search button bugMichael Kolb2010-12-071-1/+1
|/ / / | | | | | | | | | | | | | | | | | | Bug 3253916 Fixed the search button to select url input mode Change-Id: Ic6c0b8dc2fbb6941fcea8543d366570c112c4dc9
* | | Clear session cookies in a bg threadKristian Monsen2010-12-071-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | This buys us very little, as we wait on function returning just below. At least we are not doing disk access on the UI thread. Change-Id: I899a795ffbdd2ed63bf6ece70de52cfd48f65a1c
* | | Fixing Browser app objectKristian Monsen2010-12-071-2/+3
| | | | | | | | | | | | | | | | | | | | | | | | Session cookies are removed in Controller.java, if you override Application.onCreate() you should always call super.onCreate() Change-Id: I76e8eb1afd75212fa405b9c3b91f325877112d21
* | | 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
| | | * \ Merge "Unused variables in AddNewBookmark"Jean-Baptiste Queru2010-12-061-5/+0
| | | |\ \
| | | | * | Unused variables in AddNewBookmarkHenrik Baard2010-12-061-5/+0
| | | |/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The fields mTextView and mImageView are not used, and should be removed. Change-Id: Iaa5211b1f36e19b68d42bc925f8ace8641535a2c
* | | | | 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 "popular url test should load website list from external file"Guang Zhu2010-12-061-15/+17
|\ \ \ \ \ \
| * | | | | | popular url test should load website list from external fileGuang Zhu2010-12-031-15/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | There are two reasons to use hardcoded external path as website list: 1) the InstrumentationTestRunner did not provide a mechanism for passing extra parameters down to test class, so it's hard to provide test class with a location of test list file in a parameter 2) if we include the test list file as part of the asset and loaded via context during test, then it become hard for test harness to inject a list at test execution time because test list file is essentially compiled in when the apk is generated. So I'm reverting the test list loading part back to previous approach. Change-Id: I5532de8d153172771dba160d6ad89092f81ec6e4
* | | | | | | 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