Commits · ef6f60fe9b8a1f3426835b35f579ce5980d4ca33 · halo / packages_apps_Browser

15 Nov, 2011 3 commits
- Merge commit 'e9d96b1a ' into nov15-conflicts · ef6f60fe
  Eric Fischer authored 13 years ago
  
  ef6f60fe
- Merge "Remove old != new onScrollChanged check" into ics-mr1 · bb0b1660
  John Reck authored 13 years ago
  
  bb0b1660
- Remove old != new onScrollChanged check · 576c37f1
  John Reck authored 13 years ago
```
 Bug: 5533389
 That is now meaningful in that it signifies a layer was scrolled

Change-Id: I24734eb2739c0d020b32d16394c6133f9de990c5
```
  576c37f1
14 Nov, 2011 3 commits
- Import revised translations. DO NOT MERGE · e9d96b1a
  Eric Fischer authored 13 years ago
```
Change-Id: Ib8aa1275cc5d1ec08f3bf046e0e6dad658ec8c83
```
  e9d96b1a
- Merge "Restrict Favicon size for tablet" into ics-mr1 · 38eb5eea
  Michael Kolb authored 13 years ago
  
  38eb5eea
- Restrict Favicon size for tablet · f8fe4b56
  Michael Kolb authored 13 years ago
```
    Bug: 5613430

Change-Id: I1373cb642f118856b0cbbdd1e55bc47483b07fde
```
  f8fe4b56
11 Nov, 2011 3 commits
- Merge "Set home button enabled" into ics-mr1 · ccd78601
  John Reck authored 13 years ago
  
  ccd78601
- Set home button enabled · c0b64c80
  John Reck authored 13 years ago
```
 Bug: 5553034

Change-Id: Ifc47c233af3ac3010045498739ee5e1602656ce2
```
  c0b64c80
- Merge "Fix assets and layout for popup window" into ics-mr1 · d14c0ea2
  Michael Kolb authored 13 years ago
  
  d14c0ea2
10 Nov, 2011 5 commits
- Merge "Handle error condition when inserting snapshots" into ics-mr1 · 897b8838
  John Reck authored 13 years ago
  
  897b8838
- Merge "Special case the root folder in add bookmarks" into ics-mr1 · 4409358a
  John Reck authored 13 years ago
  
  4409358a
- Fix assets and layout for popup window · 4e29b3db
  Michael Kolb authored 13 years ago
```
    Bug: 5541275

Change-Id: If502eb17dc41d2c67806fbe66ee59c2b57a88008
```
  4e29b3db
- Handle error condition when inserting snapshots · 93384ff9
  John Reck authored 13 years ago
```
 Bug: 5599226

Change-Id: I4429ed965325d908cdc5094c37d856f4d9d68933
```
  93384ff9
- Special case the root folder in add bookmarks · 903a0724
  John Reck authored 13 years ago
```
 Bug: 5505282
 The special "Other Bookmarks" folder isn't a child of the special
 "Bookmarks" folder. The merging of those two is only handled if
 the URI is CONTENT_URI_DEFAULT_FOLDER, not if a specific folder
 id is given. Thus we need to special case that in the AddBookmarkPage
 loader.

Change-Id: Ic92fba5ea8c758fc153a9cfd0c567bcfdcbc524d
```
  903a0724
09 Nov, 2011 2 commits
- am 6c0dd881: (-s ours) Import revised translations. DO NOT MERGE · 90cb7324
  Eric Fischer authored 13 years ago
```
* commit '6c0dd881':
  Import revised translations.  DO NOT MERGE
```
  90cb7324
- Import revised translations. DO NOT MERGE · 6c0dd881
  Eric Fischer authored 13 years ago
```
Change-Id: I71e194f854f04d4dc07cd38f2c1839be3f808d36
```
  6c0dd881
08 Nov, 2011 2 commits
- Merge "Add Monkey protection" into ics-mr1 · 50c04abe
  Michael Kolb authored 13 years ago
  
  50c04abe
- Add Monkey protection · a30e4fb6
  Michael Kolb authored 13 years ago
```
    Bug: 5577443

Change-Id: I61f59ec5e65de0b59890804f2fb0eb7ab182326d
```
  a30e4fb6
07 Nov, 2011 3 commits
- Merge "Add support to minimize the WebView's memory consumption by default" into ics-mr1 · e7c44c28
  Teng-Hui Zhu authored 13 years ago
  
  e7c44c28
- Add support to minimize the WebView's memory consumption by default · 164f74e3
  Teng-Hui Zhu authored 13 years ago
```
webkit change is c/148241

bug:5522175

Change-Id: I8562c39c55913ab89848afe8a36e8a2784c12727
```
  164f74e3
- Import revised translations. DO NOT MERGE · 5f25258f
  Eric Fischer authored 13 years ago
```
Change-Id: I564e3e59296894a3853ec007d07b4507a1a5bc2b
```
  5f25258f
04 Nov, 2011 1 commit
- Reconcile with ics-mr0-release · 6ca215c4
  The Android Open Source Project authored 13 years ago
```
Change-Id: I8ec1540b94c648ec188ca4eab41ff3d631e0876b
```
  6ca215c4
03 Nov, 2011 2 commits
- merge in ics-mr0-release history after reset to ics-mr0 · ce269662
  The Android Automerger authored 13 years ago
  
  ce269662
- am b8ce8635: (-s ours) Import revised translations. DO NOT MERGE · 72a65eec
  Eric Fischer authored 13 years ago
```
* commit 'b8ce8635':
  Import revised translations.  DO NOT MERGE
```
  72a65eec
02 Nov, 2011 1 commit
- Import revised translations. DO NOT MERGE · b8ce8635
  Eric Fischer authored 13 years ago
```
Change-Id: Idec39f99d7c0f816e4b6b024d2c1795d70e459b0
```
  b8ce8635
01 Nov, 2011 6 commits
- Merge "Import revised translations. DO NOT MERGE" into ics-mr1 · a2123e00
  Eric Fischer authored 13 years ago
  
  a2123e00
- Import revised translations. DO NOT MERGE · f6d2e0d6
  Eric Fischer authored 13 years ago
```
Change-Id: I40e90d5320fa59c7bdc84a5910826344241f1bb0
```
  f6d2e0d6
- Merge "Switch Tab to DataController" into ics-mr1 · 91c61a5b
  John Reck authored 13 years ago
  
  91c61a5b
- Switch Tab to DataController · 4eadc34f
  John Reck authored 13 years ago
```
 Bug: 5544674

Change-Id: I24486c65c1cc1fbcf7abe95b74731b10918db82c
```
  4eadc34f
- Merge "Monkey proofing" into ics-mr1 · 36b2aac5
  John Reck authored 13 years ago
  
  36b2aac5
- Merge "Fix corner case with url pulldown" into ics-mr1 · fd02f6d4
  John Reck authored 13 years ago
  
  fd02f6d4
31 Oct, 2011 3 commits

Reconcile with ics-mr0-release · 388ce5d3
The Android Open Source Project authored 13 years ago
```
Change-Id: Icfb81d16af9ed24eb0ede20cca7132a3793033c4
```
388ce5d3

John Reck authored 13 years ago

 Bug: 5531453

Change-Id: I0a8158212d8b2de638bae3c66bb2b9aa3bf85c1d

a98c83b2

Fix corner case with url pulldown · 868efdf4

John Reck authored 13 years ago

 Bug: 5534329
 The issue is that with 1px visible of the title bar the url
 pulldown code wouldn't trigger to prevent a janky animation.
 Detect whether or not the page is scrolling, and if it isn't
 then show the url bar even if it is partially visible

Change-Id: I2e7771f0e08a7dc9a6d3968e2d5e1402b1a454fa

868efdf4

30 Oct, 2011 1 commit
- merge in ics-mr0-release history after reset to ics-mr0 · fac202c7
  The Android Automerger authored 13 years ago
  
  fac202c7
29 Oct, 2011 2 commits
- am 93e37c66: (-s ours) Import revised translations. DO NOT MERGE · d7383a28
  Eric Fischer authored 13 years ago
```
* commit '93e37c66':
  Import revised translations.  DO NOT MERGE
```
  d7383a28
- Import revised translations. DO NOT MERGE · 93e37c66
  Eric Fischer authored 13 years ago
```
Change-Id: I4df5011a7e18b4c76a16da045bb0c1c8ba0844f1
```
  93e37c66
28 Oct, 2011 3 commits
- Merge "Import revised translations. DO NOT MERGE" into ics-mr1 · 8c578e15
  Eric Fischer authored 13 years ago
  
  8c578e15
- Import revised translations. DO NOT MERGE · f518de36
  Eric Fischer authored 13 years ago
```
Change-Id: I1eed72ddbdced686f5dce606c8f776a303089f23
```
  f518de36
- Reconcile with ics-mr0-release · bf9e5c91
  The Android Open Source Project authored 13 years ago
```
Change-Id: Icbaedae6eb7d861d2b240a636a8f1f173e891cd4
```
  bf9e5c91