summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | Merge "Add application launch category." into ics-mr1Jeff Brown2011-11-291-0/+1
| |\ \ \ \ \ | | |_|/ / / | |/| | | |
| | * | | | Add application launch category.Jeff Brown2011-11-281-0/+1
| | |/ / / | | | | | | | | | | | | | | | | | | | | Bug: 5674723 Change-Id: I81f88853c5a6756927d528305c73e98c2ac26db2
* | | | | Merge "Import revised translations."Eric Fischer2011-11-2947-148/+148
|\ \ \ \ \
| * | | | | Import revised translations.Eric Fischer2011-11-2947-148/+148
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ie689583ac628cacdc259b84c1d5cd5e1927b454f
* | | | | | am 7431a694: Merge "Fix NPE at startup" into ics-mr1Bart Sears2011-11-281-1/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | * commit '7431a694054d56b5d56410f708f97bc2a81ae5e3': Fix NPE at startup
| * | | | Merge "Fix NPE at startup" into ics-mr1Bart Sears2011-11-281-1/+1
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | Fix NPE at startupMichael Kolb2011-11-281-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5676863 Change-Id: I673699e577f0ed2cfa85260f905ccccc0d852399
* | | | | Merge "Remove an init. workaround for Cookiemanager."Selim Gurun2011-11-231-2/+0
|\ \ \ \ \
| * | | | | Remove an init. workaround for Cookiemanager.Selim Gurun2011-11-211-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:5253777 This workaround is now not necessary as we not do not block while accessing cookie manager settings. Change-Id: I7b1df4b60124123b6493a0320d2d96dfdd8d2c29
* | | | | | Merge "Crash recover no longer uses icicle."George Mount2011-11-235-98/+162
|\ \ \ \ \ \
| * | | | | | Crash recover no longer uses icicle.George Mount2011-11-235-98/+162
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5508252 Changed load state to use the crash recovery state every time instead of using icicle. When the state is saved, the value is written synchronously. Moved settings from CrashRecoveryHandler to BrowserSettings Change-Id: I1a241d4c488fe3246c7d7f1ee0ce26c42ba29429
* | | | | | Edited string to use standard confirmation text.Claudia de Veaux2011-11-231-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Use "Do you want..." instead of "Would you like..." Bug: 5163232 Change-Id: I6facedf6b3109c21827c9b127f0960cd4ef83402
* | | | | | am 6cfe9772: Start downloads as a new taskJohn Reck2011-11-231-0/+1
|\ \ \ \ \ \ | | |/ / / / | |/| | | | | | | | | | | | | | | | * commit '6cfe97725ede972940bf3090a4474b1e2c017a9f': Start downloads as a new task
| * | | | | Start downloads as a new taskJohn Reck2011-11-231-0/+1
| | |/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | Bug: 5661310 Change-Id: Ib6d4d08474116d6a222eedd0cf40830c9286a2dd
* | | | | am 63faec47: Merge "Add more options to Quick Controls on phone" into ics-mr1Michael Kolb2011-11-232-2/+14
|\ \ \ \ \ | |/ / / / | | | | | | | | | | | | | | | * commit '63faec479010e77762d5ffa517fdc65f3474383c': Add more options to Quick Controls on phone
| * | | | Merge "Add more options to Quick Controls on phone" into ics-mr1Michael Kolb2011-11-232-2/+14
| |\ \ \ \
| | * | | | Add more options to Quick Controls on phoneMichael Kolb2011-11-222-2/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5660535 added new tab and bookmarks increased radius of controls Change-Id: I7034e072eae8d59b06c71347b91d9fa042fde3b6
* | | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-220-0/+0
|\ \ \ \ \ \ | | |_|_|/ / | |/| | | | | | | | | | Change-Id: I3fcf3a059399f58ef0152abe1dd23f17707c2afc
| * | | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-220-0/+0
| |\ \ \ \ \
* | \ \ \ \ \ am 78ea2875: Merge "Support super-full-screen mode for html5 video" into ics-mr1Teng-Hui Zhu2011-11-221-1/+6
|\ \ \ \ \ \ \ | | |_|/ / / / | |/| | | | | | | | | | | | | | | | | | | * commit '78ea2875af7145f7a9c167e09b294b7a38acefb5': Support super-full-screen mode for html5 video
| * | | | | | Merge "Support super-full-screen mode for html5 video" into ics-mr1Teng-Hui Zhu2011-11-221-1/+6
| |\ \ \ \ \ \
| | * | | | | | Support super-full-screen mode for html5 videoTeng-Hui Zhu2011-11-211-1/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:5569146 Framework change is c/151486/ Change-Id: I9b622c7de87810ebfab5e01ea77e25c2401deef3
* | | | | | | | am 1107eca1: (-s ours) Merge "Import revised translations. DO NOT MERGE" ↵Eric Fischer2011-11-210-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '1107eca13808e8d18ec3612cb94a0b3387a364c3': Import revised translations. DO NOT MERGE
| * | | | | | | Merge "Import revised translations. DO NOT MERGE" into ics-mr1Eric Fischer2011-11-2111-46/+46
| |\ \ \ \ \ \ \ | | |_|_|_|/ / / | |/| | | | | |
| | * | | | | | Import revised translations. DO NOT MERGEEric Fischer2011-11-2111-46/+46
| | | |/ / / / | | |/| | | | | | | | | | | | | | | | | | Change-Id: I9d0846073cf32e41702e805aed03061b07027fc4
* | | | | | | am a48621be: Merge "Monkey season" into ics-mr1Michael Kolb2011-11-211-1/+4
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit 'a48621be8a537284f37b843388b30017b0cfce51': Monkey season
| * | | | | | Merge "Monkey season" into ics-mr1Michael Kolb2011-11-211-1/+4
| |\ \ \ \ \ \
| | * | | | | | Monkey seasonMichael Kolb2011-11-211-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5650555 Change-Id: Ia5ea323b3abaf411c24af18193d5d9ac7f63e212
* | | | | | | | am b1fb70ce: Fix stop/refresh menu stateMichael Kolb2011-11-212-20/+20
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b1fb70cee9e24f3f9e648dff1816403c427976d1': Fix stop/refresh menu state
| * | | | | | | Fix stop/refresh menu stateMichael Kolb2011-11-212-20/+20
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5469075 5640775 Reconcile page load status updates to only use tab state; update menus accordingly Change-Id: Id32f1e0486e8439d6729f3657eda1132c25dfc7e
* | | | | | | am 2edc80c2: URL bar select allJohn Reck2011-11-211-0/+1
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | / / | |_|_|_|/ / |/| | | | | * commit '2edc80c2ccca9030f8013328cc2e37bc374d3d92': URL bar select all
| * | | | | URL bar select allJohn Reck2011-11-211-0/+1
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5650655 Change-Id: I0b1e2522b158bccdc04d1bdaf4cb01ac53541b70
* | | | | Reconcile with ics-mr1-releaseThe Android Open Source Project2011-11-180-0/+0
|\ \ \ \ \ | | |_|/ / | |/| | | | | | | | Change-Id: Ib05412a0777079563891bfdc8a5590a472e63364
| * | | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-170-0/+0
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-160-0/+0
| | |\ \ \
| | | * \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-150-0/+0
| | | |\ \ \
| | | | * \ \ merge in ics-mr1-release history after reset to ics-mr1The Android Automerger2011-11-130-0/+0
| | | | |\ \ \
* | | | | \ \ \ am 3e5e5fad: Merge "Remove the psychic labs feature." into ics-mr1Narayan Kamath2011-11-1819-2524/+36
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | * commit '3e5e5fada69d74bb50b14ef3588e7beadaedfd69': Remove the psychic labs feature.
| * | | | | | | Merge "Remove the psychic labs feature." into ics-mr1Narayan Kamath2011-11-1819-2524/+36
| |\ \ \ \ \ \ \
| | * | | | | | | Remove the psychic labs feature.Narayan Kamath2011-11-1819-2524/+36
| | | |_|_|/ / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Reverts the UrlInputView to a standard autocomplete that causes less trouble for IMEs. bug:5598837 Change-Id: If469d76f4feda88e4a122264a39d317737404578
* | | | | | | | am a9a5967e: Add content description to screenshots in tab managerMichael Kolb2011-11-181-13/+3
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'a9a5967ea18d4b442ae5433cd3759b3921e480ad': Add content description to screenshots in tab manager
| * | | | | | | Add content description to screenshots in tab managerMichael Kolb2011-11-171-13/+3
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5619945 Change-Id: I26dc592334dbbd6878887408153249d68046001b
* | | | | | | Show download complete message for data URI downloads.George Mount2011-11-171-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug 5566849 Change-Id: Ifdb9a952a2b0b28d0f34ba11d112ef9b465bf564
* | | | | | | am 4eb312fa: Merge "Fix NPE in NavigationBarBase.onAction" into ics-mr1John Reck2011-11-171-1/+5
|\ \ \ \ \ \ \ | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | * commit '4eb312faf9d7850dee4a1f10a41b343a4c923c03': Fix NPE in NavigationBarBase.onAction
| * | | | | | Merge "Fix NPE in NavigationBarBase.onAction" into ics-mr1John Reck2011-11-161-1/+5
| |\ \ \ \ \ \
| | * | | | | | Fix NPE in NavigationBarBase.onActionJohn Reck2011-11-151-1/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5476078 Change-Id: Ic21f45656b473a09709e53274f1f90312bcba920
* | | | | | | | am b217888b: Merge "Prevent NPE in NavTabScroller" into ics-mr1Michael Kolb2011-11-171-0/+1
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | * commit 'b217888b48e01cdd92db7efa67d0ba8347c8538d': Prevent NPE in NavTabScroller
| * | | | | | | Merge "Prevent NPE in NavTabScroller" into ics-mr1Michael Kolb2011-11-161-0/+1
| |\ \ \ \ \ \ \
| | * | | | | | | Prevent NPE in NavTabScrollerMichael Kolb2011-11-161-0/+1
| | | |_|/ / / / | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5619924 Monkey see, but Monkey don't do. Change-Id: I807693425eea93c6cb8cf616f2ff7f8f0827026e
* | | | | | | | am 945aace8: (-s ours) Merge "Import revised translations. DO NOT MERGE" ↵Eric Fischer2011-11-170-0/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into ics-mr1 * commit '945aace87fb83d0a3f44bd9369932b1796c8dcc7': Import revised translations. DO NOT MERGE
generated by cgit v1.1 at 2025-01-11 14:06:33 +0000