689741bd5c
Bug 917396: Move the grid to "TopSites" page. [r=lucasr]
...
--HG--
rename : mobile/android/base/home/PinBookmarkDialog.java => mobile/android/base/home/PinSiteDialog.java
rename : mobile/android/base/home/TopBookmarksAdapter.java => mobile/android/base/home/TopSitesGridAdapter.java
rename : mobile/android/base/home/TopBookmarkItemView.java => mobile/android/base/home/TopSitesGridItemView.java
rename : mobile/android/base/home/TopBookmarksView.java => mobile/android/base/home/TopSitesGridView.java
rename : mobile/android/base/home/BookmarkThumbnailView.java => mobile/android/base/home/TopSitesThumbnailView.java
rename : mobile/android/base/resources/color/top_bookmark_item_title.xml => mobile/android/base/resources/color/top_sites_grid_item_title.xml
rename : mobile/android/base/resources/drawable-hdpi/top_bookmark_add.png => mobile/android/base/resources/drawable-hdpi/top_site_add.png
rename : mobile/android/base/resources/drawable-mdpi/top_bookmark_add.png => mobile/android/base/resources/drawable-mdpi/top_site_add.png
rename : mobile/android/base/resources/drawable-xhdpi/top_bookmark_add.png => mobile/android/base/resources/drawable-xhdpi/top_site_add.png
rename : mobile/android/base/resources/drawable/bookmark_thumbnail_bg.xml => mobile/android/base/resources/drawable/top_sites_thumbnail_bg.xml
rename : mobile/android/base/resources/layout/pin_bookmark_dialog.xml => mobile/android/base/resources/layout/pin_site_dialog.xml
rename : mobile/android/base/resources/layout/top_bookmark_item_view.xml => mobile/android/base/resources/layout/top_sites_grid_item_view.xml
rename : mobile/android/base/resources/menu/top_bookmarks_contextmenu.xml => mobile/android/base/resources/menu/top_sites_contextmenu.xml
2013-09-17 16:24:48 -04:00
92f66d6671
Bug 833800: FadedTextView should handle compound drawables. [r=lucasr]
2013-09-17 13:59:10 -04:00
7fe469beea
Bug 833800: Change the pin to be an image. [r=wesj]
2013-09-17 13:39:18 -04:00
ed9279760c
Bug 917394 - Rearrange about:home tabs as per new design (r=sriram)
...
--HG--
rename : mobile/android/base/home/MostVisitedPage.java => mobile/android/base/home/TopSitesPage.java
rename : mobile/android/base/resources/layout/home_most_visited_page.xml => mobile/android/base/resources/layout/home_top_sites_page.xml
2013-09-17 16:58:12 -04:00
356f594ec7
Merge mozilla-central into build-system
2013-09-17 09:16:10 -07:00
955293338e
Backout 312925464acb:f24d5b2801f8 (bug 911375) for breaking the build
2013-09-17 09:14:58 -07:00
78cc8a9f85
Merging in version bump NO BUG
2013-09-17 09:38:37 -04:00
e9cd106832
Added tag FIREFOX_AURORA_26_BASE for changeset 2520866d5874
2013-09-17 09:36:55 -04:00
85a9c933ff
Backed out 2 debugging changesets (bug 916757) to avoid uplifting, now the failures have been identified; CLOSED TREE
...
Backed out changeset 1713de744990 (bug 916757)
Backed out changeset 861e1c86d759 (bug 916757)
--HG--
extra : transplant_source : %A0%FC%C3%EB%89/%BD%B9%08lv%3F%C1q%AD%DC%B5%E0bE
2013-09-17 07:42:40 -04:00
61ea412a96
Merge m-i to a CLOSED TREE m-c
2013-09-16 23:12:03 -07:00
7359294014
Bug 899420 - Disable accidentally enabled Android x86 media tests on a CLOSED TREE r=bustage
...
--HG--
extra : amend_source : 30e839e40d27414167bb7a99e9767f7c3123912c
2013-09-17 15:41:39 +12:00
5e1dfafdb3
Bug 911375 - Part 2b: Restore removed make rules necessary for PGO builds; r=bustage
2013-09-16 19:52:28 -07:00
8ba7f243f2
Backed out changeset 4d44bc8da75c (bug 913110)
...
CLOSED TREE
2013-09-16 22:45:42 -04:00
d41e108a3f
Backed out changeset 0d92b16a748b (bug 906620)
2013-09-16 22:45:33 -04:00
1ae2973b6d
Backed out changeset a04d4a573863 (bug 914435)
2013-09-16 22:45:27 -04:00
5cc87d9147
Backed out changeset 1d12266ddc4c (bug 914927)
...
CLOSED TREE
2013-09-16 17:55:17 -07:00
b770c3935d
Backed out changeset acce93fb65a1 (bug 914926)
...
CLOSED TREE
2013-09-16 17:55:08 -07:00
e65c4e0350
Bug 911375 - Part 3: Remove PurgeManifest; r=glandium
2013-09-16 17:50:04 -07:00
2c8e8832bd
Bug 911375 - Part 2: Convert uses of PurgeManifest to InstallManifest; r=glandium
2013-09-16 17:49:44 -07:00
bd6b0afca8
Bug 907902 - Create system isolated virtualenv, remove --system-ply support; r=glandium
2013-09-16 17:21:59 -07:00
78b3dbc50a
Merge b2g-inbound to m-c on a CLOSED TREE and DONTBUILD because it's just pushbot stuff.
2013-09-16 13:37:32 -04:00
31a2144ac4
Merge fx-team to m-c on a CLOSED TREE.
2013-09-16 13:33:25 -04:00
c3e19fa1f1
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/eb5973515698
Author: Arthur Chen <crh0716@gmail.com>
Desc: Merge pull request #12238 from dwi2/916066_wording_of_active_keyboard_page
Bug 916066 - [Keyboard][V1.2] Need to modify the wording of Active Keyboard page r=crh0716
========
https://hg.mozilla.org/integration/gaia-central/rev/d41b761bcfa5
Author: tzhuang <tzhuang@mozilla.com>
Desc: Bug 916066 - [Keyboard][V1.2] Need to modify the wording of Active Keyboard page
2013-09-16 04:20:22 -07:00
251db9b4ae
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/fdb817bb9058
Author: Ben Francis <ben@tola.me.uk>
Desc: Merge pull request #12090 from benfrancis/908927
Bug 908927 - Use templates instead of string concatenation for search URIs
========
https://hg.mozilla.org/integration/gaia-central/rev/03070fa85815
Author: Ben Francis <ben@tola.me.uk>
Desc: Bug 908927 - Use templates instead of string concatenation for search URIs
2013-09-16 04:05:22 -07:00
a5da31befb
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/893d7a1cf6b6
Author: Cristian Rodriguez <crdlc@tid.es>
Desc: Merge pull request #12202 from crdlc/bug-916050
Bug 916050 - We can save 700-1000kbs of memory loading confirm dialog in a lazy mode and deleting IccHelper when is finished
========
https://hg.mozilla.org/integration/gaia-central/rev/55033a80bf3d
Author: crdlc <crdlc@tid.es>
Desc: Bug 916050 - We can save 700-1000kbs of memory loading confirm dialog in a lazy mode and deleting IccHelper when is finished
2013-09-16 02:31:24 -07:00
dd795ac6f6
Bumping gaia.json for 1 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/e30273e5aca9
Author: Hans Liss <Hans@Liss.nu>
Desc: Bug 906767 - Swedish keyboard layout. r=rudylu
Removed country distinction for Swedish keyboard layout
Removed country marker on sv keyboard layout name
2013-09-16 01:35:22 -07:00
0aa06cef5c
Bumping gaia.json for 1 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/7d05f26ed46c
Author: Dave Hunt <dave.hunt@gmail.com>
Desc: Bug 916023 - Add Gaia functional tests. r=jgriffin
2013-09-16 01:25:23 -07:00
cc0cdb7a29
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/7949dab98fbf
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Merge pull request #10838 from comoyo/profanity
Bug 803189 - Allow profane words in dictionary but dont suggest them. r=djf
========
https://hg.mozilla.org/integration/gaia-central/rev/ee2ff8dbf603
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Bug 803189 - Allow profane words in dictionary but dont suggest them
2013-09-16 01:10:24 -07:00
4abe2b9d25
Backed out changeset acf80b86d630 (bug 904617) for compilation failures
2013-09-16 08:44:44 +01:00
7766485842
Backed out changeset 9cc6dd50c93a (bug 904617)
2013-09-16 08:43:56 +01:00
3cf7ed846a
Backed out changeset 81cee5ae7973 (bug 904617)
2013-09-16 08:43:47 +01:00
77ff767b7d
Backed out changeset a317a2d59ed5 (bug 904617)
2013-09-16 08:43:37 +01:00
32315b86ba
Bumping gaia.json for 4 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/7405487508e2
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Merge pull request #12203 from comoyo/globalkey
Bug 910713 - Global key isnt hidden if there is only one layout. r=RudyL
========
https://hg.mozilla.org/integration/gaia-central/rev/d18133b60624
Author: Jan Jongboom <janjongboom@gmail.com>
Desc: Bug 910713 - Global key isnt hidden if there is only one layout
========
https://hg.mozilla.org/integration/gaia-central/rev/f329d89b9b55
Author: Ian Liu <iliu@mozilla.com>
Desc: Merge pull request #12234 from EragonJ/bug-914317
Bug 914317 - [B2G] [Bluetooth] "Unable to Pair" message has placeholder text. r=@alivedise
========
https://hg.mozilla.org/integration/gaia-central/rev/32bfa536a0d0
Author: EragonJ <eragonj@eragonj.me>
Desc: Bug 914317 - Add a check to remove title in prompts
2013-09-16 00:35:22 -07:00
7f3a3729b9
Bug 904617: Part 4 - Add windows wasapi latency entries for cubeb r=kinetik
2013-09-16 03:26:31 -04:00
e49df05ddc
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/13e01795177d
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12237 from lightsofapollo/bug-916655
Bug 916655 - vbump marionette client (5s element search timeout)
========
https://hg.mozilla.org/integration/gaia-central/rev/a9f87605b70f
Author: James Lal <james@lightsofapollo.com>
Desc: Bug 916655 - vbump marionette client (5s element search timeout)
2013-09-15 21:20:23 -07:00
c2887a3df1
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/0bd51266be55
Author: Alive.Kuo <alegnadise@gmail.com>
Desc: Merge pull request #12232 from JinhoHwang/Bug_907505_Screen_Manager_registers_duplicated_event_listeners
Bug 907505 - [System] Screen_Manager registers duplicated event listener... r=alive
========
https://hg.mozilla.org/integration/gaia-central/rev/54a8c48fc105
Author: jinho.hwang <jinho.hwang@lge.com>
Desc: Bug 907505 - [System] Screen_Manager registers duplicated event listeners
2013-09-15 20:45:28 -07:00
6e4df608cd
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/596dd2c001aa
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #12198 from huchengtw-moz/video/Bug_916032_unable_to_pick_file
Bug 916032 - pick activity of video unable to choose file, r=djf
========
https://hg.mozilla.org/integration/gaia-central/rev/7bd29d92ecab
Author: John Hu <johu@mozilla.com>
Desc: Bug 916032 - pick activity of video unable to choose file
2013-09-15 20:35:24 -07:00
114e193d06
Bumping gaia.json for 4 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/23bdefe73507
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12235 from lightsofapollo/revert-11915
Revert "Merge pull request #11915 from reubenmorais/contacts-customizati...
========
https://hg.mozilla.org/integration/gaia-central/rev/ead989351aad
Author: James Lal <james@lightsofapollo.com>
Desc: Revert "Merge pull request #11915 from reubenmorais/contacts-customization"
This reverts commit 84e2d96144ce9e94cc1bd2f8da6a1d2f97c39181, reversing
changes made to 9cb0bf07dd6b8c23ee4c4db3d866464077f81e45.
========
https://hg.mozilla.org/integration/gaia-central/rev/09c2b6e4e082
Author: Rudy Lu <left.lu@gmail.com>
Desc: Merge pull request #12223 from yxl/setInputMethodActive
Bug 842436 - Keyboard API: There should only be one keyboard active, and...
r=rudylu
========
https://hg.mozilla.org/integration/gaia-central/rev/9e6440eede90
Author: Yuan Xulei <xyuan@mozilla.com>
Desc: Bug 842436 - Keyboard API: There should only be one keyboard active, and Gecko should block interaction from non-active keyboards. r=rudyl
2013-09-15 20:25:22 -07:00
b86e8eccaf
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/7aa503060000
Author: John Hu <johu@mozilla.com>
Desc: Merge pull request #12189 from huchengtw-moz/camera/Bug_915994_show_preview_when_preview_is_not_big_enough
Bug 915994 - [Camera][REG] reset of media frame still trying to show pre..., r=djf
========
https://hg.mozilla.org/integration/gaia-central/rev/43b6068f4806
Author: John Hu <johu@mozilla.com>
Desc: Bug 915994 - [Camera][REG] reset of media frame still trying to show preview image when it is not big enough
2013-09-15 20:10:23 -07:00
cadfa392b8
Bumping gaia.json for 3 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/b44ba604bd3b
Author: James Lal <james@lightsofapollo.com>
Desc: Merge pull request #12231 from qdot/revert-revert-915920
Revert revert 915920
========
https://hg.mozilla.org/integration/gaia-central/rev/093f08b9789b
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Bug 915920 - Fix gjslint quote errors
========
https://hg.mozilla.org/integration/gaia-central/rev/0c597b9bcea7
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Revert "Revert "Merge pull request #12206 from qdot/915920""
This reverts commit 4433c772ad5d1367157dddae08ce235ee28096b2.
2013-09-15 19:50:23 -07:00
40173a35b1
Merge b2g-inbound to m-c.
2013-09-15 21:53:23 -04:00
13efcd8ed8
Merge inbound to m-c.
2013-09-15 21:48:02 -04:00
6328c989fc
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/e089fe3d2b9a
Author: Reuben Morais <reuben.morais@gmail.com>
Desc: Merge pull request #11915 from reubenmorais/contacts-customization
Bug 891723 - Implement preloaded contacts customization by SIM. r=arcturus
========
https://hg.mozilla.org/integration/gaia-central/rev/4fed03c0b3b4
Author: Reuben Morais <reuben.morais@gmail.com>
Desc: Bug 891723 - Implement preloaded contacts customization by SIM. r=arcturus
2013-09-15 16:55:22 -07:00
697e59b489
Bug 916531 - Backed out changeset 47e05e8df03b (bug 915482, part 4) for causing hangs on Windows. r=me.
...
--HG--
extra : rebase_source : 1c3d96a670c031137d984584449704f32f728c3f
2013-09-15 16:20:17 -07:00
a3f1ea6990
Backed out 7 changesets (bug 902525) for B2G reftest failures.
...
Backed out changeset bbca63772c83 (bug 902525)
Backed out changeset edb386989dbd (bug 902525)
Backed out changeset 3137dadb4fcd (bug 902525)
Backed out changeset e562afcb3c89 (bug 902525)
Backed out changeset 8ef3a516bd68 (bug 902525)
Backed out changeset 520fcd422150 (bug 902525)
Backed out changeset 4e553e8da44e (bug 902525)
2013-09-15 18:59:27 -04:00
53987a6270
Backed out changesets f6402ce2b67a and 5bdec1cb1428 (bug 915705) because it depends on bug 882145, which was also backed out.
2013-09-15 18:51:50 -04:00
4e9b624c26
No bug - Add B2G fuzz to max-prop.html.
2013-09-15 18:38:00 -04:00
45c4ca50e7
Backed out changesets bc4ee7cbd7bd and cf373e408a6b (bug 882145) for causing bug 916609. r=jsmith
2013-09-15 18:19:42 -04:00
be64a6e9fb
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/d1e1683abc3c
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Merge pull request #12218 from qdot/uitest-fix
Bug 916081 - Fix UITest Notification Test Bind
========
https://hg.mozilla.org/integration/gaia-central/rev/3f13d4e38b05
Author: Kyle Machulis <kyle@nonpolynomial.com>
Desc: Bug 916081 - Fix UITest Notification Test Bind
2013-09-15 14:35:22 -07:00
fa3fda4dd3
Bumping gaia.json for 2 gaia-central revision(s)
...
========
https://hg.mozilla.org/integration/gaia-central/rev/10e2e685f748
Author: Pavel Ivanov <pivanov@mozilla.com>
Desc: Merge pull request #12208 from epang/bug915149-missing-setting-assets
Bug 915149 - Add Missing Setting Graphics
========
https://hg.mozilla.org/integration/gaia-central/rev/4b6c57ad015e
Author: Eric Pang <epang@mozilla.com>
Desc: Bug 915149 - Add Missing Setting Graphics
2013-09-15 13:35:22 -07:00
Sriram Ramasubramanian
Lucas Rocha
Gregory Szorc
Alex Keybl
Ehsan Akhgari
Phil Ringnalda
Edwin Flores
Ryan VanderMeulen
Gaia Pushbot
Ed Morley
Paul Adenot
Nicholas Nethercote