summaryrefslogtreecommitdiffstats
path: root/src/com/android/browser
Commit message (Collapse)AuthorAgeFilesLines
* Always automatically restoreJohn Reck2011-06-291-4/+11
| | | | | | Bug: 4904409 Change-Id: I07406481e3870c09546b0264ed10e5a7bd6cae68
* Merge "Fix IntentHandler behavior"John Reck2011-06-295-56/+57
|\
| * Fix IntentHandler behaviorJohn Reck2011-06-295-56/+57
| | | | | | | | | | | | | | Bug: 4473779 Plus, TESTS! Huzzah! Change-Id: I043e100d99d4653b7fb7885217d7fb305930a137
* | Merge "Fix wrong thread issue"John Reck2011-06-291-3/+6
|\ \
| * | Fix wrong thread issueJohn Reck2011-06-291-3/+6
| |/ | | | | | | | | | | Bug: 4971133 Change-Id: I40ecdf4ff6c27d3eb9f4f55360552030b215913f
* | Fix (workaround?) for NPE when showing a preloaded tab.Mathew Inwood2011-06-291-2/+2
| | | | | | | | Change-Id: I4a12d40da7ad12d4f9f3c27e75fc4e07d0c1af62
* | 2nd try: Shows the right URL that has a cert error.Huahui Wu2011-06-282-10/+18
| | | | | | | | | | | | | | Identical to https://android-git.corp.google.com/g/#change,117835 which was reverted since its collaborative CL broke the build. Change-Id: Ic0344bd30895700692fbf7cec84666567133e103
* | Merge "Revert "Shows the right URL that has a cert error.""Huahui Wu2011-06-282-18/+10
|\ \
| * | Revert "Shows the right URL that has a cert error."Huahui Wu2011-06-282-18/+10
| | | | | | | | | | | | This reverts commit db6ff8999159f386ea8a99d980ce533b717fca78.
* | | Merge "Shows the right URL that has a cert error."Huahui Wu2011-06-282-10/+18
|\ \ \ | |/ / | | / | |/ |/|
| * Shows the right URL that has a cert error.Huahui Wu2011-06-272-10/+18
| | | | | | | | | | | | | | | | | | | | b/2689122 SSL error shows the wrong page when triggered by an image/javascript in the page This CL receives the URL which has a invalid cert from framework and shows it in related dialogues. Related CLs are: webkit: https://android-git.corp.google.com/g/#change,117817 framework: https://android-git.corp.google.com/g/#change,117828 Change-Id: I9b243b73b9cce19d94cc71608207219bfa687db2
* | Merge "Prevent duplicates in omnibox"John Reck2011-06-272-2/+8
|\ \
| * | Prevent duplicates in omniboxJohn Reck2011-06-272-2/+8
| | | | | | | | | | | | Change-Id: Idf91591a981543fb84a73d08e3c5bbc2c7d23d6f
* | | Merge "Fix tests"John Reck2011-06-271-0/+1
|\ \ \
| * | | Fix testsJohn Reck2011-06-271-0/+1
| |/ / | | | | | | | | | | | | | | | | | | Bug: 4771193 Fix bug where data URL was stripped instead of just text2 Change-Id: I93ebcdd3a7ef4106dbdeda0ea16773ac919b3cb2
* | | Merge "Move most visited to set homepage"John Reck2011-06-275-150/+147
|\ \ \
| * | | Move most visited to set homepageJohn Reck2011-06-275-150/+147
| |/ / | | | | | | | | | | | | | | | Bug: 4770245 Change-Id: If47b2f308ab3cd4b58dbcbf3a28cdb341481a885
* | | Merge "Moving ssl_certificate layout, resources, and helper code to ↵Brian Carlstrom2011-06-271-84/+10
|\ \ \ | |/ / |/| | | | | SslCertificate"
| * | Moving ssl_certificate layout, resources, and helper code to SslCertificateBrian Carlstrom2011-06-271-84/+10
| | | | | | | | | | | | Change-Id: I5b81cde261fb0234616bc08566af9ad4ef94325b
* | | Merge "Attempt to automatically restore after crash"John Reck2011-06-271-4/+43
|\ \ \
| * | | Attempt to automatically restore after crashJohn Reck2011-06-241-4/+43
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Use a timestamp based approach to determine if we should automatically restore or prompt the user Change-Id: I4b8d1d76e0dfc02879f3708241cb78ff1673a57c
* | | | Merge "Tweak title bar animation"John Reck2011-06-271-4/+17
|\ \ \ \
| * | | | Tweak title bar animationJohn Reck2011-06-241-4/+17
| |/ / / | | | | | | | | | | | | | | | | | | | | Values from UX Change-Id: I5f975c4b68e890d51a8668cfad0c4f458ac7e918
* | | | Merge "Fix title bar bug"John Reck2011-06-271-1/+1
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix title bar bugJohn Reck2011-06-241-1/+1
| |/ / | | | | | | | | | | | | | | | Prevent hiding the title bar while loading Change-Id: I969060b4bcb9132f76f758831ddd931b2a22b194
* | | Replace KeyChainActivity placeholder UI with more polished dialog (2 of 5)Brian Carlstrom2011-06-261-1/+17
|/ / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | frameworks/base Extended KeyChain.chooserPrivateKeyAlias to allow caller to supply preferred choice to be selected in chooser. This allows Email settings to highlight the current choice when allowing user to change settings. keystore/java/android/security/KeyChain.java api/current.txt Implemented KeyChain functionality to pass host and port information to KeyChainActivity for display. keystore/java/android/security/KeyChain.java KeyChain now sends a PendingIntent as part of the Intent it sends to the KeyChainActivity which can be used to identify the caller in reliable way. keystore/java/android/security/KeyChain.java Moved .pfx/.p12/.cer/.crt constants to Credentials for reuse. Added Credentials.install variant with no value for use from KeyChainActivity keystore/java/android/security/Credentials.java packages/apps/CertInstaller Source of extension constants now in Credentials src/com/android/certinstaller/CertFile.java packages/apps/Browser Have browser supply host and port information to KeyChain.choosePrivateKeyAlias Tracking KeyChain.choosePrivateKeyAlias API change src/com/android/browser/Tab.java packages/apps/Email Tracking KeyChain.choosePrivateKeyAlias API change src/com/android/email/view/CertificateSelector.java packages/apps/KeyChain KeyChain now depends on bouncycastle X509Name for formatting X500Principals, since the 4 X500Principal formatting options could not format emailAddress attributes in a human readable way and its the most important attribute to display for client certificates in most cases. Android.mk Changing the UI to a dialog, make the activity style transparent. AndroidManifest.xml res/values/styles.xml Layout for chooser dialog res/layout/cert_chooser.xml Layout for list items in chooser res/layout/cert_item.xml New resources for dialog including comments for translators. res/values/strings.xml New dialog based KeyChainActivity. Now also shows requesting app and requesting server. Now can preselect a specified alias. New link directly to CertInstaller. src/com/android/keychain/KeyChainActivity.java Fix KeyChainTestActivity to work with TestKeyStore changes that were causing network activity on the UI to look up the name of localhost. Also track KeyChain.choosePrivateKeyAlias API change. tests/src/com/android/keychain/tests/KeyChainTestActivity.java Change-Id: I3a5c45bfec05b16d4d9b7e0d6bb4220be5159fe7
* | Titlebar Autoshow tweaksJohn Reck2011-06-235-44/+11
|/ | | | | | Also consolidate some common code between phone and tablet Change-Id: I2e1be9be84b07726596d4b4fe7345c0074236be1
* Handle restore dialog cancelJohn Reck2011-06-221-0/+7
| | | | | | Bug: 4860016 Change-Id: I77a61e4bdbdb54a8840b2f5f1e8e20a1b05cb3e2
* Implement scroll up trigger titlebarJohn Reck2011-06-225-30/+79
| | | | | | On phones, when scroll up show the title bar Change-Id: I432bdddf693a351be9c6223e26804452b09d783f
* Prevent webview reuseJohn Reck2011-06-214-47/+46
| | | | | | | | | | | Bug: 4742007 Bug: 4770356 Also pipe all loadUrl's through Tab so that it can immediately update its internal state. This is necessary as javascript: uris do not cause onPageStarted/finished callbacks to happen, thus the url and title of the Tab do not update. Change-Id: I6d17e8627db505eaa9158339fdfc7afd2c6672a2
* Only close the AutoFill editor when we're actually done with itBen Murdoch2011-06-211-1/+1
| | | | | | | | | We need the activity to still be alive when the PROFILE_SAVED callback occurs so that we can get the context to display the toast. So don't close the editor until we've shown the toast. Bug: 4615099 Change-Id: I61fee12258193815efb999c576309fef9ac33d23
* Re-enable list view modeJohn Reck2011-06-203-95/+65
| | | | | | Bug: 4645489 Change-Id: Id6eab53a6cb73083781c96a41bfeffec6eae0498
* Fix dual-bar action bar in bookmarksJohn Reck2011-06-171-4/+0
| | | | Change-Id: I212264144a5938ea2eb9e04c0c8471b911c38765
* Merge "Omnibox improvements"John Reck2011-06-171-16/+9
|\
| * Omnibox improvementsJohn Reck2011-06-171-16/+9
| | | | | | | | | | | | | | | | | | Bug: 4603029 Reduce padding on phone Full width on phone Fix focus-stealing bug on phone Change-Id: I4498f239a03fa7c2d55da4d72058b79c27992ae3
* | Merge "Clarify restore dialog, prevent spam"John Reck2011-06-174-11/+29
|\ \
| * | Clarify restore dialog, prevent spamJohn Reck2011-06-174-11/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4599646 State that it is the browser's windows/tabs to be restored and show the browser's app icon in the dialog. Also cut down on the frequency this prompt will appear by ignoring tabs that haven't loaded anything except the home page. Change-Id: I2c2cc03aa92da3199c47b455256145d392548930
* | | Merge "nav mods"Michael Kolb2011-06-177-3448/+1481
|\ \ \ | |_|/ |/| |
| * | nav modsMichael Kolb2011-06-177-3448/+1481
| |/ | | | | | | Change-Id: I80afd61d8d85b39fdeefacb1303294a33f696b75
* | Merge "Delete bookmarks when sync account is removed"John Reck2011-06-172-0/+96
|\ \
| * | Delete bookmarks when sync account is removedJohn Reck2011-06-172-0/+96
| |/ | | | | | | | | | | Bug: 4686176 Change-Id: I1d05cc72e1cf65d04eb7def4a72a2f83420bd345
* | Merge "Launch into browser when a URL is received over NFC."Jeff Hamilton2011-06-171-1/+4
|\ \
| * | Launch into browser when a URL is received over NFC.Jeff Hamilton2011-06-171-1/+4
| | | | | | | | | | | | Change-Id: I32c6dcc4e257a32a341b9c2f165cd3764da08b64
* | | Merge "Fix adding bookmarks"John Reck2011-06-171-11/+33
|\ \ \
| * | | Fix adding bookmarksJohn Reck2011-06-171-11/+33
| | |/ | |/| | | | | | | | | | | | | | | | | | | Bug: 4691351 Allows adding with a parent without specifying the account name and type Change-Id: I6ab2e726ccdbce24d5a6bed250d613b7bf53e53b
* | | Merge "Fix up AutoFill profile editor UI in portrait mode"Ben Murdoch2011-06-171-31/+34
|\ \ \ | |/ / |/| |
| * | Fix up AutoFill profile editor UI in portrait modeBen Murdoch2011-06-171-31/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Create layout-port version of the autofill profile editor that extends vertically rather than horizontally. In both portrait and landscape, make the "Save profile" button always visible, remove the "cancel" button as there are already several ways to leave the activity without saving changes and move the "Delete profile" button to the options menu. Change-Id: I3b03c998bc8cb005f066733a3b6979a03396f31f
* | | Accessibility tweaksJohn Reck2011-06-175-45/+133
|/ / | | | | | | | | | | | | Min font size now shows pt value Text size replaced with text zoom Change-Id: Ic5906be094425bc5099a17571868c7a994a6cb86
* | Merge "Clean up accessibility settings"John Reck2011-06-165-186/+76
|\ \
| * | Clean up accessibility settingsJohn Reck2011-06-165-186/+76
| |/ | | | | | | | | | | Bug: 4487879 Change-Id: I22b4e8442d20d635b9e41c214dcb20748c12f251