summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "General edits to strings to bring UI text to standards. Bugs: ↵Claudia de Veaux2011-09-301-107/+107
|\ | | | | | | 5165745, 5163232, 5162668, 5162667, 5162328"
| * General edits to strings to bring UI text to standards.Claudia de Veaux2011-09-301-107/+107
| | | | | | | | | | | | | | | | Bugs: 5165745, 5163232, 5162668, 5162667, 5162328 Change-Id: I1b7b816f78371e6bab6a4b98f83e436d2d7ce566 Edits to previous changes per review by jreck.
* | Merge "Import revised translations."Eric Fischer2011-09-3029-119/+119
|\ \
| * | Import revised translations.Eric Fischer2011-09-3029-119/+119
| | | | | | | | | | | | Change-Id: I655d48977aca30635fa81bc935fd4bbf764b1440
* | | Merge "Switch browser back to use Gpu upload path"Teng-Hui Zhu2011-09-302-3/+3
|\ \ \ | |/ / |/| |
| * | Switch browser back to use Gpu upload pathTeng-Hui Zhu2011-09-302-3/+3
| | | | | | | | | | | | | | | | | | Change-Id: I8dbc25b6c5bdf6b8edf4ba2273b886cc000bfaff bug:5395019
* | | Title bars on tab thumbs lightened up to increase contrastPeter Ng2011-09-293-0/+0
|/ / | | | | | | | | Bug: 5375498 Change-Id: I3745b741c5fedd9ee7628331077052c427b6d83e
* | am 9d0b506a: (-s ours) Merge "Import revised translations. DO NOT MERGE." ↵Eric Fischer2011-09-280-0/+0
|\ \ | | | | | | | | | | | | | | | | | | into ics-factoryrom * commit '9d0b506af57cc931ce8d0a62be19c2dc8c0cb011': Import revised translations. DO NOT MERGE.
| * \ Merge "Import revised translations. DO NOT MERGE." into ics-factoryromEric Fischer2011-09-284-4/+4
| |\ \
| | * | Import revised translations. DO NOT MERGE.Eric Fischer2011-09-284-4/+4
| | | | | | | | | | | | | | | | Change-Id: Icf2d3d329674b181af3ce12cbaca2df6be51826b
* | | | Merge "View images without throwing an intent"Michael Kolb2011-09-281-2/+8
|\ \ \ \
| * | | | View images without throwing an intentMichael Kolb2011-09-281-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5375434 load images directly into a new tab and set parent on the new tab Change-Id: I5b038d30127b6cf3144de4ae38e6f4ab6d9117a5
* | | | | Merge "Update folder asset usage"John Reck2011-09-283-3/+73
|\ \ \ \ \
| * | | | | Update folder asset usageJohn Reck2011-09-283-3/+73
| | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | Bug: 5066431 Change-Id: Icc4ea38e64881d0f67d3cbbd0b6bda7138f4a0b4
* | | | | am fb3e4352: Merge "Updated Browser overflow menu Bug: 5388009" into ↵Justin Ho2011-09-283-0/+0
|\ \ \ \ \ | |/ / / / |/| | / / | | |/ / | |/| | | | | | | | | | ics-factoryrom * commit 'fb3e4352ccefef04ba7498c36bc1d62635e6b50a': Updated Browser overflow menu Bug: 5388009
| * | | Merge "Updated Browser overflow menu Bug: 5388009" into ics-factoryromJustin Ho2011-09-283-0/+0
| |\ \ \ | | |_|/ | |/| |
| | * | Updated Browser overflow menuJustin Ho2011-09-283-0/+0
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5388009 Change-Id: I240ea1667fb1005b07db3db826521f00de2b910b
* | | | am 7766a6c4: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-09-270-0/+0
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * commit '7766a6c4a5ea435da8558b5b76f8ad0120dc8092': Import revised translations. DO NOT MERGE
| * | Import revised translations. DO NOT MERGEEric Fischer2011-09-271-2/+2
| |/ | | | | | | Change-Id: Ibacc46689e7b4f3d71010cd690fc4500825f1eec
* | Update add bookmark dialogJohn Reck2011-09-265-128/+137
| | | | | | | | | | | | | | | | | | Bug: 5362468 Don't put listviews inside scrollviews Update the buttons to fancy style Cleanup padding and sizes Change-Id: I6b255a194a150b9efb01157475815e654df8231c
* | Merge "Fix tab switcher in animation"Michael Kolb2011-09-233-2/+4
|\ \
| * | Fix tab switcher in animationMichael Kolb2011-09-233-2/+4
| | | | | | | | | | | | | | | | | | Bug: 5367069 Change-Id: I029b7b1c31dfb8071d9816c1bb319f61e8362974
* | | Merge "UI for switching texture upload mode"Teng-Hui Zhu2011-09-235-0/+19
|\ \ \ | |/ / |/| |
| * | UI for switching texture upload modeTeng-Hui Zhu2011-09-235-0/+19
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | For browser, default will be CPU upload until bug 5334978 fix. bug:5347539 The webkit part is in https://android-git.corp.google.com/g/#/c/137610/ Change-Id: Iec3a100dc142b28e54145f08a5c76210f8634cba
* | | Merge "Browser layout fixes and asset updates"Peter Ng2011-09-2344-11/+18
|\ \ \
| * | | Browser layout fixes and asset updatesPeter Ng2011-09-2344-11/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | -darker actionbar -folder icon is smaller and no longer blue, and padding is removed -textfield is cleaned up and given margins on left and right -various padding changes for icons to fit inside the padded in textfield -textfield is now activated blue Bug: 5190316 Change-Id: I12a09545933c9e5437cb22b38116820600e71808
* | | | am 1555175a: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-09-230-0/+0
|\ \ \ \ | | |_|/ | |/| | | | | | | | | | * commit '1555175addcca292d36a6a32555498de32eaed0b': Import revised translations. DO NOT MERGE
| * | | Import revised translations. DO NOT MERGEEric Fischer2011-09-234-85/+85
| | | | | | | | | | | | | | | | Change-Id: I7e2b3d859974ae182c6d8f45a45fd0b83b644ee6
* | | | Merge "Add transparency to tab switcher"Michael Kolb2011-09-231-4/+15
|\ \ \ \ | |_|/ / |/| | |
| * | | Add transparency to tab switcherMichael Kolb2011-09-231-4/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5361553 This fixes the transparency issue. No change to physics. Change-Id: I85177dd87296155ad923f3967d311337b6cd8b52
* | | | am f9819430: (-s ours) DO NOT MERGE Fix Resources.getIdentifier usageJohn Reck2011-09-220-0/+0
|\ \ \ \ | | |/ / | |/| | | | | | | | | | * commit 'f98194300b8849be6d8736d0d7112ff95c8d5e02': DO NOT MERGE Fix Resources.getIdentifier usage
| * | | DO NOT MERGE Fix Resources.getIdentifier usageJohn Reck2011-09-223-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5352337 Change-Id: Ie90211fa7ff991db276c76b976a0e780ce1711ce
* | | | Merge "Fix Resources.getIdentifier usage"John Reck2011-09-223-3/+9
|\ \ \ \ | |_|/ / |/| | |
| * | | Fix Resources.getIdentifier usageJohn Reck2011-09-223-3/+9
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5352337 Change-Id: If639cf6dec892f2952f8eb3fedbb267e4cc7c0ae
* | | | Merge "Implement pseudo 3d overscroll for tab switcher"Michael Kolb2011-09-2210-1803/+2496
|\ \ \ \
| * | | | Implement pseudo 3d overscroll for tab switcherMichael Kolb2011-09-2110-1803/+2496
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5255100 Change-Id: Id756e36bba2644cc1be1a699f80dbd78119ec56f
* | | | | am d02ec2f6: (-s ours) Clean up build artifacts from Browser - do not mergeJason Chen2011-09-220-0/+0
|\ \ \ \ \ | |_|/ / / |/| | / / | | |/ / | |/| | * commit 'd02ec2f65d194c65d78ebb900e91a2de2295ecc5': Clean up build artifacts from Browser - do not merge
| * | | Clean up build artifacts from Browser - do not mergeJason Chen2011-09-221-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (Cherry pick from master) Bug: 5284700 Change-Id: I6b43d89150ec062b24ac5d988f38c8d1fa023fc0
* | | | am 43f47728: (-s ours) DO NOT MERGE Disable overscroll in tab switcherMichael Kolb2011-09-210-0/+0
|\ \ \ \ | |/ / / | | | / | |_|/ |/| | * commit '43f4772858c4928ccaffde82e7fdbfc730f6fba8': DO NOT MERGE Disable overscroll in tab switcher
| * | DO NOT MERGE Disable overscroll in tab switcherMichael Kolb2011-09-211-2/+1
| | | | | | | | | | | | | | | | | | Bug: 5347693 Change-Id: I76481fcd584f2b935c39ef1b8dea7a5ffb4e9368
* | | Clean up build artifacts from BrowserJason Chen2011-09-201-0/+2
| |/ |/| | | | | Change-Id: I404efce0da92efaab1c71710a12079d76f0d5156
* | am 52e7598c: (-s ours) Import revised translations. DO NOT MERGEEric Fischer2011-09-200-0/+0
|\ \ | |/ | | | | | | * commit '52e7598c3df2682aa41e7034545d8d6bd41da20d': Import revised translations. DO NOT MERGE
| * Import revised translations. DO NOT MERGEEric Fischer2011-09-203-8/+8
| | | | | | | | Change-Id: Id6a2da7d2da9150c3361cb7dc13006004dedac6e
* | Hide breadcrumbs at root folderJohn Reck2011-09-202-1/+7
| | | | | | | | | | | | Bug: 5346728 Change-Id: I0dd247bac233e632546cf4fa92ec7ddf3842d588
* | Merge "Widget update"John Reck2011-09-204-23/+13
|\ \
| * | Widget updateJohn Reck2011-09-204-23/+13
| | | | | | | | | | | | | | | | | | | | | | | | Bug: 5342786 Remove widget padding Update for new cell forumala (40 * (110 * (n-1))) Change-Id: I33291a54f9a26c395ca90673b12182e3d1aae4bc
* | | Merge "Move action bar in tab switcher"Michael Kolb2011-09-201-2/+2
|\ \ \
| * | | Move action bar in tab switcherMichael Kolb2011-09-201-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 5334321 And up again. Change-Id: I41d2a81adccc36f8afa36cc1f14afb42328a5548
* | | | Merge "Import revised translations."Eric Fischer2011-09-2038-1694/+1059
|\ \ \ \ | |_|/ / |/| | |
| * | | Import revised translations.Eric Fischer2011-09-2038-1694/+1059
| | | | | | | | | | | | | | | | Change-Id: Ief74fee2d9ae3adf4ee75de55402032ab0863469