summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fix title bar bugJohn Reck2011-06-241-1/+1
| | | | | | Prevent hiding the title bar while loading Change-Id: I969060b4bcb9132f76f758831ddd931b2a22b194
* Reconcile with gingerbread-releaseThe Android Open Source Project2011-06-240-0/+0
|\ | | | | | | Change-Id: I59ba28efeeac72712c237f8897007e22281f8087
| * DO NOT MERGE Security fixJohn Reck2011-06-211-26/+23
| | | | | | | | | | | | Bug: 4742007 Change-Id: I187ce151078795ad9b566e9dfbfe69c38d15b478
* | Titlebar Autoshow tweaksJohn Reck2011-06-235-44/+11
| | | | | | | | | | | | Also consolidate some common code between phone and tablet Change-Id: I2e1be9be84b07726596d4b4fe7345c0074236be1
* | Merge "Switch omnibox to dark theme"John Reck2011-06-2316-4/+42
|\ \
| * | Switch omnibox to dark themeJohn Reck2011-06-2216-4/+42
| | | | | | | | | | | | Change-Id: I0fcc90b0141b97dac31478387b0c9ac2e3a6ee8a
* | | am 463d599b: (-s ours) am 27535d19: DO NOT MERGE Prevent loading javascript: ↵John Reck2011-06-230-0/+0
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | uris in existing tabs * commit '463d599b6bfd79b6addeee53dec1de52f1b54eb8': DO NOT MERGE Prevent loading javascript: uris in existing tabs
| * \ \ am 27535d19: DO NOT MERGE Prevent loading javascript: uris in existing tabsJohn Reck2011-06-222-2/+9
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '27535d194a894ee0f828aef63bbf0e99ccab84ac': DO NOT MERGE Prevent loading javascript: uris in existing tabs
| | * | | DO NOT MERGE Prevent loading javascript: uris in existing tabsJohn Reck2011-06-212-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4770356 Change-Id: I8227cefeba4298ad1415016895ebf7bc02e09501
* | | | | am a0237aad: (-s ours) am 2b6699b9: (-s ours) am 096bae24: DO NOT MERGE ↵John Reck2011-06-230-0/+0
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Prevent loading javascript: uris in existing tabs * commit 'a0237aadf68ee81ddb63918bf5279e2774cbb2cd': DO NOT MERGE Prevent loading javascript: uris in existing tabs
| * | | | am 2b6699b9: (-s ours) am 096bae24: DO NOT MERGE Prevent loading javascript: ↵John Reck2011-06-210-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | uris in existing tabs * commit '2b6699b96c7c8c87e586602acbda36e63a587c58': DO NOT MERGE Prevent loading javascript: uris in existing tabs
| | * \ \ \ am 096bae24: DO NOT MERGE Prevent loading javascript: uris in existing tabsJohn Reck2011-06-211-2/+9
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '096bae248453abe83cbb2e5a2c744bd62cdb620b': DO NOT MERGE Prevent loading javascript: uris in existing tabs
| | | * | | | DO NOT MERGE Prevent loading javascript: uris in existing tabsJohn Reck2011-06-211-2/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4770356 Change-Id: I436d97f0c41fedec16891c92bf283654354b0a29
* | | | | | | am 23918ce9: (-s ours) am 09b16912: DO NOT MERGE Prevent webview re-useJohn Reck2011-06-230-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '23918ce9f437d65888f63383ca77e4130204329c': DO NOT MERGE Prevent webview re-use
| * | | | | | am 09b16912: DO NOT MERGE Prevent webview re-useJohn Reck2011-06-211-4/+1
| |\ \ \ \ \ \ | | | |_|/ / / | | |/| | | | | | | | | | | | | | | | | | * commit '09b1691232df718c0aef14ade16e59c8bf39786a': DO NOT MERGE Prevent webview re-use
| | * | | | | DO NOT MERGE Prevent webview re-useJohn Reck2011-06-211-4/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4742007 Prevent re-using an existing webview when handling a new intent. This can have unwanted side effects. Change-Id: Ifc142afe5b49c35b1e1de0d0da63244a5e6250ce
* | | | | | | am 4e8ff477: (-s ours) am a667e0fb: (-s ours) am d0750cb5: Merge "DO NOT ↵Maarten Hooft2011-06-230-0/+0
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | | | | | | | | | | | | | MERGE Security fix" into gingerbread * commit '4e8ff4775bf8735c1d207c9c77bdd7e6fdf825be': DO NOT MERGE Security fix
| * | | | | am a667e0fb: (-s ours) am d0750cb5: Merge "DO NOT MERGE Security fix" into ↵Maarten Hooft2011-06-210-0/+0
| |\ \ \ \ \ | | | |/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit 'a667e0fbabeac140ff36e3ff415b4a546b692ba4': DO NOT MERGE Security fix
| | * | | | am d0750cb5: Merge "DO NOT MERGE Security fix" into gingerbreadMaarten Hooft2011-06-211-26/+23
| | |\ \ \ \ | | | | |/ / | | | |/| | | | | | | | | | | | | | * commit 'd0750cb55f57bf68a65652e9b47178f408198a80': DO NOT MERGE Security fix
| | | * | | Merge "DO NOT MERGE Security fix" into gingerbreadMaarten Hooft2011-06-211-26/+23
| | | |\ \ \
| | | | * | | DO NOT MERGE Security fixJohn Reck2011-06-201-26/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4742007 Change-Id: I187ce151078795ad9b566e9dfbfe69c38d15b478
* | | | | | | 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
* | | | | | | Merge "Prevent webview reuse"John Reck2011-06-214-47/+46
|\ \ \ \ \ \ \
| * | | | | | | 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
* | | | | | | | adjust tabs in nav screenMichael Kolb2011-06-214-19/+29
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | Change-Id: Iaf34ae0d1e143508cb109c96612ba539ad7dd31b
* | | | | | | 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
* | | | | | | Merge "Import revised translations."Eric Fischer2011-06-2086-1216/+1694
|\ \ \ \ \ \ \
| * | | | | | | Import revised translations.Eric Fischer2011-06-2086-1216/+1694
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I01431ead7b722bc2df9261c9f1f7be950dfdda15
* | | | | | | | Re-enable list view modeJohn Reck2011-06-205-111/+73
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4645489 Change-Id: Id6eab53a6cb73083781c96a41bfeffec6eae0498
* | | | | | | Fix dual-bar action bar in bookmarksJohn Reck2011-06-174-8/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I212264144a5938ea2eb9e04c0c8471b911c38765
* | | | | | | Merge "Omnibox improvements"John Reck2011-06-178-23/+19
|\ \ \ \ \ \ \
| * | | | | | | Omnibox improvementsJohn Reck2011-06-178-23/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-176-13/+31
|\ \ \ \ \ \ \ \
| * | | | | | | | Clarify restore dialog, prevent spamJohn Reck2011-06-176-13/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-1716-3515/+1548
|\ \ \ \ \ \ \ \ \ | |_|/ / / / / / / |/| | | | | | | |
| * | | | | | | | nav modsMichael Kolb2011-06-1716-3515/+1548
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I80afd61d8d85b39fdeefacb1303294a33f696b75
* | | | | | | | Merge "Delete bookmarks when sync account is removed"John Reck2011-06-173-0/+102
|\ \ \ \ \ \ \ \
| * | | | | | | | Delete bookmarks when sync account is removedJohn Reck2011-06-173-0/+102
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4686176 Change-Id: I1d05cc72e1cf65d04eb7def4a72a2f83420bd345
* | | | | | | | Merge "Launch into browser when a URL is received over NFC."Jeff Hamilton2011-06-172-1/+11
|\ \ \ \ \ \ \ \
| * | | | | | | | Launch into browser when a URL is received over NFC.Jeff Hamilton2011-06-172-1/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-174-257/+503
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | |
| * | | | | | | | Fix up AutoFill profile editor UI in portrait modeBen Murdoch2011-06-174-257/+503
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-178-86/+152
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Min font size now shows pt value Text size replaced with text zoom Change-Id: Ic5906be094425bc5099a17571868c7a994a6cb86
* | | | | | | | Merge "Clean up accessibility settings"John Reck2011-06-168-216/+161
|\ \ \ \ \ \ \ \
| * | | | | | | | Clean up accessibility settingsJohn Reck2011-06-168-216/+161
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4487879 Change-Id: I22b4e8442d20d635b9e41c214dcb20748c12f251
* | | | | | | | Merge "Zero-click sharing for Browser using NFC."Martijn Coenen2011-06-163-0/+87
|\ \ \ \ \ \ \ \
| * | | | | | | | Zero-click sharing for Browser using NFC.Martijn Coenen2011-06-163-0/+87
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds zero-click sharing for the Browser app; the URL of the tab currently displayed will be transferred to any NFC-capable Android phone upon touch. Change-Id: I7aabc1b2b3f7700c05223349e5c317534fcfe8f0