From 5dce3adde9341e753e20a8fd3c12f198951d1246 Mon Sep 17 00:00:00 2001 From: Maxim Zhilyaev Date: Wed, 19 Aug 2015 04:29:26 -0700 Subject: [PATCH 01/19] Bug 1195699 - Port tests fixes from 1180387 uplift [r=emtwo] --- .../base/content/test/newtab/browser_newtab_bug991111.js | 7 +++++++ .../base/content/test/newtab/browser_newtab_bug998387.js | 7 +++++++ browser/base/content/test/newtab/browser_newtab_focus.js | 7 +++++-- browser/base/content/test/newtab/head.js | 3 ++- 4 files changed, 21 insertions(+), 3 deletions(-) diff --git a/browser/base/content/test/newtab/browser_newtab_bug991111.js b/browser/base/content/test/newtab/browser_newtab_bug991111.js index e9932094ca88..ce36ef2bc29a 100644 --- a/browser/base/content/test/newtab/browser_newtab_bug991111.js +++ b/browser/base/content/test/newtab/browser_newtab_bug991111.js @@ -1,9 +1,15 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ +const PREF_NEWTAB_ROWS = "browser.newtabpage.rows"; + function runTests() { + // set max rows to 1, to avoid scroll events by clicking middle button + Services.prefs.setIntPref(PREF_NEWTAB_ROWS, 1); yield setLinks("-1"); yield addNewTabPageTab(); + // we need a second newtab to honor max rows + yield addNewTabPageTab(); // Remember if the click handler was triggered let cell = getCell(0); @@ -16,4 +22,5 @@ function runTests() { // Send a middle-click and make sure it happened yield EventUtils.synthesizeMouseAtCenter(cell.node, {button: 1}, getContentWindow()); ok(clicked, "middle click triggered click listener"); + Services.prefs.clearUserPref(PREF_NEWTAB_ROWS); } diff --git a/browser/base/content/test/newtab/browser_newtab_bug998387.js b/browser/base/content/test/newtab/browser_newtab_bug998387.js index d2e51e7d1bd5..04ff21294ab4 100644 --- a/browser/base/content/test/newtab/browser_newtab_bug998387.js +++ b/browser/base/content/test/newtab/browser_newtab_bug998387.js @@ -1,9 +1,15 @@ /* Any copyright is dedicated to the Public Domain. http://creativecommons.org/publicdomain/zero/1.0/ */ +const PREF_NEWTAB_ROWS = "browser.newtabpage.rows"; + function runTests() { + // set max rows to 1, to avoid scroll events by clicking middle button + Services.prefs.setIntPref(PREF_NEWTAB_ROWS, 1); yield setLinks("0"); yield addNewTabPageTab(); + // we need a second newtab to honor max rows + yield addNewTabPageTab(); // Remember if the click handler was triggered let {site} = getCell(0); @@ -22,4 +28,5 @@ function runTests() { // Make sure the cell didn't actually get blocked checkGrid("0"); + Services.prefs.clearUserPref(PREF_NEWTAB_ROWS); } diff --git a/browser/base/content/test/newtab/browser_newtab_focus.js b/browser/base/content/test/newtab/browser_newtab_focus.js index a423e3397801..82d9b4237bc8 100644 --- a/browser/base/content/test/newtab/browser_newtab_focus.js +++ b/browser/base/content/test/newtab/browser_newtab_focus.js @@ -10,7 +10,8 @@ function runTests() { // Focus count in new tab page. // 30 = 9 * 3 + 3 = 9 sites, each with link, pin and remove buttons; search - // bar; search button; and toggle button. + // bar; search button; and toggle button. Additionaly there may or may not be + // a scroll bar caused by fix to 1180387, which will eat an extra focus let FOCUS_COUNT = 30; // Create a new tab page. @@ -42,7 +43,9 @@ function countFocus(aExpectedCount) { let focusedElement = document.commandDispatcher.focusedElement; if (focusedElement && focusedElement.classList.contains("urlbar-input")) { window.removeEventListener("focus", onFocus, true); - is(focusCount, aExpectedCount, "Validate focus count in the new tab page."); + // account for a potential presence of a scroll bar + ok(focusCount == aExpectedCount || focusCount == (aExpectedCount + 1), + "Validate focus count in the new tab page."); executeSoon(TestRunner.next); } else { if (focusedElement && focusedElement.ownerDocument == contentDoc && diff --git a/browser/base/content/test/newtab/head.js b/browser/base/content/test/newtab/head.js index e936ad75b0dd..6eb54ebf03f9 100644 --- a/browser/base/content/test/newtab/head.js +++ b/browser/base/content/test/newtab/head.js @@ -587,7 +587,8 @@ function createExternalDropIframe() { iframe.style.position = "absolute"; iframe.style.zIndex = 50; - let margin = doc.getElementById("newtab-margin-top"); + // the frame has to be attached to a visible element + let margin = doc.getElementById("newtab-search-container"); margin.appendChild(iframe); iframe.addEventListener("load", function onLoad() { From 42c13743245b639f2066b654ba5686cee9294af0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A3o=20Gottwald?= Date: Wed, 19 Aug 2015 16:32:58 +0200 Subject: [PATCH 02/19] Bug 1196150 - Use semitransparent border between toolbars and content for lightweight themes. r=gijs --- browser/themes/linux/browser.css | 4 ++++ browser/themes/windows/browser.css | 8 ++++++-- 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/browser/themes/linux/browser.css b/browser/themes/linux/browser.css index 95c3d8ac5eac..759cca1bb97d 100644 --- a/browser/themes/linux/browser.css +++ b/browser/themes/linux/browser.css @@ -61,6 +61,10 @@ background-color: ThreeDShadow; } +#navigator-toolbox:-moz-lwtheme::after { + background-color: rgba(0,0,0,.3); +} + #navigator-toolbox > toolbar:not(:-moz-lwtheme):not(#toolbar-menubar):not(#TabsToolbar) { -moz-appearance: none; border-style: none; diff --git a/browser/themes/windows/browser.css b/browser/themes/windows/browser.css index be2e3dc41903..021fca9b6855 100644 --- a/browser/themes/windows/browser.css +++ b/browser/themes/windows/browser.css @@ -107,19 +107,23 @@ @media (-moz-windows-default-theme) { @media (-moz-os-version: windows-vista), (-moz-os-version: windows-win7) { - #navigator-toolbox:not(:-moz-lwtheme)::after { + #navigator-toolbox::after { background-color: #aabccf; } } @media (-moz-os-version: windows-win8), (-moz-os-version: windows-win10) { - #navigator-toolbox:not(:-moz-lwtheme)::after { + #navigator-toolbox::after { background-color: #c2c2c2; } } } +#navigator-toolbox:-moz-lwtheme::after { + background-color: rgba(0,0,0,.3); +} + #navigator-toolbox > toolbar { -moz-appearance: none; border-style: none; From cfcb34dfd888e0b96e1bc9a25f53e7b9f54bfac9 Mon Sep 17 00:00:00 2001 From: Sebastian Kaspari Date: Fri, 14 Aug 2015 10:17:40 +0200 Subject: [PATCH 03/19] Bug 1084062 - Support read/unread state in reading list UI. r=mhaigh --HG-- extra : commitid : 3su8zvEUDZv extra : rebase_source : fbd7f06405bc7a4c1ba6034f31abd7911ed7179a --- mobile/android/base/db/BrowserContract.java | 2 +- .../base/db/LocalReadingListAccessor.java | 8 ++++++++ .../android/base/db/ReadingListAccessor.java | 1 + mobile/android/base/db/StubBrowserDB.java | 4 ++++ .../base/home/HomeContextMenuInfo.java | 1 + mobile/android/base/home/HomeFragment.java | 19 ++++++++++++++++++ .../android/base/home/ReadingListPanel.java | 12 +++++++++++ mobile/android/base/home/ReadingListRow.java | 9 +++++++++ .../base/locales/en-US/android_strings.dtd | 2 ++ .../drawable/reading_list_indicator_read.xml | 20 +++++++++++++++++++ .../reading_list_indicator_unread.xml | 14 +++++++++++++ .../layout/reading_list_row_view.xml | 7 ++++++- .../base/resources/menu/home_contextmenu.xml | 6 ++++++ .../android/base/resources/values/dimens.xml | 1 - .../android/base/resources/values/styles.xml | 16 +++++++++++++++ mobile/android/base/strings.xml.in | 2 ++ 16 files changed, 121 insertions(+), 3 deletions(-) create mode 100644 mobile/android/base/resources/drawable/reading_list_indicator_read.xml create mode 100644 mobile/android/base/resources/drawable/reading_list_indicator_unread.xml diff --git a/mobile/android/base/db/BrowserContract.java b/mobile/android/base/db/BrowserContract.java index 7cc275984123..f764310508e5 100644 --- a/mobile/android/base/db/BrowserContract.java +++ b/mobile/android/base/db/BrowserContract.java @@ -415,7 +415,7 @@ public class BrowserContract { public static final String DEFAULT_SORT_ORDER = CLIENT_LAST_MODIFIED + " DESC"; - public static final String[] DEFAULT_PROJECTION = new String[] { _ID, URL, TITLE, EXCERPT, WORD_COUNT }; + public static final String[] DEFAULT_PROJECTION = new String[] { _ID, URL, TITLE, EXCERPT, WORD_COUNT, IS_UNREAD }; // Minimum fields required to create a reading list item. public static final String[] REQUIRED_FIELDS = { ReadingListItems.URL, ReadingListItems.TITLE }; diff --git a/mobile/android/base/db/LocalReadingListAccessor.java b/mobile/android/base/db/LocalReadingListAccessor.java index 850e313943b8..ed468339cbb3 100644 --- a/mobile/android/base/db/LocalReadingListAccessor.java +++ b/mobile/android/base/db/LocalReadingListAccessor.java @@ -189,6 +189,14 @@ public class LocalReadingListAccessor implements ReadingListAccessor { cr.update(mReadingListUriWithProfile, values, ReadingListItems._ID + " = " + itemID, null); } + @Override + public void markAsUnread(ContentResolver cr, long itemID) { + final ContentValues values = new ContentValues(); + values.put(ReadingListItems.IS_UNREAD, 1); + + cr.update(mReadingListUriWithProfile, values, ReadingListItems._ID + " = " + itemID, null); + } + @Override public void updateContent(ContentResolver cr, long itemID, String resolvedTitle, String resolvedURL, String excerpt) { final ContentValues values = new ContentValues(); diff --git a/mobile/android/base/db/ReadingListAccessor.java b/mobile/android/base/db/ReadingListAccessor.java index b1ff8fdc2cd3..66682f6ab368 100644 --- a/mobile/android/base/db/ReadingListAccessor.java +++ b/mobile/android/base/db/ReadingListAccessor.java @@ -37,6 +37,7 @@ public interface ReadingListAccessor { void registerContentObserver(Context context, ContentObserver observer); void markAsRead(ContentResolver cr, long itemID); + void markAsUnread(ContentResolver cr, long itemID); void updateContent(ContentResolver cr, long itemID, String resolvedTitle, String resolvedURL, String excerpt); void deleteItem(ContentResolver cr, long itemID); } diff --git a/mobile/android/base/db/StubBrowserDB.java b/mobile/android/base/db/StubBrowserDB.java index 877074cf7269..8cf55767c63d 100644 --- a/mobile/android/base/db/StubBrowserDB.java +++ b/mobile/android/base/db/StubBrowserDB.java @@ -73,6 +73,10 @@ class StubReadingListAccessor implements ReadingListAccessor { public void markAsRead(ContentResolver cr, long itemID) { } + @Override + public void markAsUnread(ContentResolver cr, long itemID) { + } + @Override public void updateContent(ContentResolver cr, long itemID, String resolvedTitle, String resolvedURL, String excerpt) { } diff --git a/mobile/android/base/home/HomeContextMenuInfo.java b/mobile/android/base/home/HomeContextMenuInfo.java index cfdce3ee4e22..c0ba23a83fe0 100644 --- a/mobile/android/base/home/HomeContextMenuInfo.java +++ b/mobile/android/base/home/HomeContextMenuInfo.java @@ -25,6 +25,7 @@ public class HomeContextMenuInfo extends AdapterContextMenuInfo { public int historyId = -1; public int bookmarkId = -1; public int readingListItemId = -1; + public boolean isUnread; public RemoveItemType itemType = null; // Item type to be handled with "Remove" selection. diff --git a/mobile/android/base/home/HomeFragment.java b/mobile/android/base/home/HomeFragment.java index f6fbdd2fa154..15775a87dd9f 100644 --- a/mobile/android/base/home/HomeFragment.java +++ b/mobile/android/base/home/HomeFragment.java @@ -155,6 +155,9 @@ public abstract class HomeFragment extends Fragment { if (!RestrictedProfiles.isAllowed(view.getContext(), Restriction.DISALLOW_PRIVATE_BROWSING)) { menu.findItem(R.id.home_open_private_tab).setVisible(false); } + + menu.findItem(R.id.mark_read).setVisible(info.isInReadingList() && info.isUnread); + menu.findItem(R.id.mark_unread).setVisible(info.isInReadingList() && !info.isUnread); } @Override @@ -253,6 +256,22 @@ public abstract class HomeFragment extends Fragment { return true; } + if (itemId == R.id.mark_read) { + GeckoProfile + .get(context) + .getDB() + .getReadingListAccessor() + .markAsRead(context.getContentResolver(), info.id); + } + + if (itemId == R.id.mark_unread) { + GeckoProfile + .get(context) + .getDB() + .getReadingListAccessor() + .markAsUnread(context.getContentResolver(), info.id); + } + return false; } diff --git a/mobile/android/base/home/ReadingListPanel.java b/mobile/android/base/home/ReadingListPanel.java index 9a826596a23b..64575f240ea5 100644 --- a/mobile/android/base/home/ReadingListPanel.java +++ b/mobile/android/base/home/ReadingListPanel.java @@ -90,6 +90,8 @@ public class ReadingListPanel extends HomeFragment { // This item is a TwoLinePageRow, so we allow switch-to-tab. mUrlOpenListener.onUrlOpen(url, EnumSet.of(OnUrlOpenListener.Flags.ALLOW_SWITCH_TO_TAB)); + + markAsRead(id); } }); @@ -100,6 +102,7 @@ public class ReadingListPanel extends HomeFragment { info.url = cursor.getString(cursor.getColumnIndexOrThrow(ReadingListItems.URL)); info.title = cursor.getString(cursor.getColumnIndexOrThrow(ReadingListItems.TITLE)); info.readingListItemId = cursor.getInt(cursor.getColumnIndexOrThrow(ReadingListItems._ID)); + info.isUnread = cursor.getInt(cursor.getColumnIndexOrThrow(ReadingListItems.IS_UNREAD)) == 1; info.itemType = RemoveItemType.READING_LIST; return info; } @@ -107,6 +110,15 @@ public class ReadingListPanel extends HomeFragment { registerForContextMenu(mList); } + private void markAsRead(long id) { + final Context context = getActivity(); + + GeckoProfile.get(context).getDB().getReadingListAccessor().markAsRead( + context.getContentResolver(), + id + ); + } + @Override public void onDestroyView() { super.onDestroyView(); diff --git a/mobile/android/base/home/ReadingListRow.java b/mobile/android/base/home/ReadingListRow.java index 03659fe80615..a32739b112f3 100644 --- a/mobile/android/base/home/ReadingListRow.java +++ b/mobile/android/base/home/ReadingListRow.java @@ -18,6 +18,7 @@ import android.database.Cursor; import android.text.TextUtils; import android.util.AttributeSet; import android.view.LayoutInflater; +import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.TextView; @@ -28,6 +29,7 @@ public class ReadingListRow extends LinearLayout { private final TextView title; private final TextView excerpt; private final TextView readTime; + private final ImageView indicator; // Average reading speed in words per minute. private static final int AVERAGE_READING_SPEED = 250; @@ -50,6 +52,7 @@ public class ReadingListRow extends LinearLayout { title = (TextView) findViewById(R.id.title); excerpt = (TextView) findViewById(R.id.excerpt); readTime = (TextView) findViewById(R.id.read_time); + indicator = (ImageView) findViewById(R.id.indicator); } public void updateFromCursor(Cursor cursor) { @@ -57,13 +60,19 @@ public class ReadingListRow extends LinearLayout { return; } + final boolean isUnread = cursor.getInt(cursor.getColumnIndexOrThrow(ReadingListItems.IS_UNREAD)) == 1; + final String url = cursor.getString(cursor.getColumnIndexOrThrow(ReadingListItems.URL)); final String titleText = cursor.getString(cursor.getColumnIndexOrThrow(ReadingListItems.TITLE)); title.setText(TextUtils.isEmpty(titleText) ? StringUtils.stripCommonSubdomains(StringUtils.stripScheme(url)) : titleText); + title.setTextAppearance(getContext(), isUnread ? R.style.Widget_ReadingListRow_Title_Unread : R.style.Widget_ReadingListRow_Title_Read); final String excerptText = cursor.getString(cursor.getColumnIndexOrThrow(ReadingListItems.EXCERPT)); excerpt.setText(TextUtils.isEmpty(excerptText) ? url : excerptText); + excerpt.setTextAppearance(getContext(), isUnread ? R.style.Widget_ReadingListRow_Title_Unread : R.style.Widget_ReadingListRow_Title_Read); + + indicator.setImageResource(isUnread ? R.drawable.reading_list_indicator_unread : R.drawable.reading_list_indicator_read); /* Disabled until UX issues are fixed (see bug 1110461). final int lengthIndex = cursor.getColumnIndexOrThrow(ReadingListItems.LENGTH); diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd index d3a8c548d3c8..22ef325f1cb0 100644 --- a/mobile/android/base/locales/en-US/android_strings.dtd +++ b/mobile/android/base/locales/en-US/android_strings.dtd @@ -391,6 +391,8 @@ size. --> + + + + + + + + + + + diff --git a/mobile/android/base/resources/drawable/reading_list_indicator_unread.xml b/mobile/android/base/resources/drawable/reading_list_indicator_unread.xml new file mode 100644 index 000000000000..f052902efc67 --- /dev/null +++ b/mobile/android/base/resources/drawable/reading_list_indicator_unread.xml @@ -0,0 +1,14 @@ + + + + + + + + + diff --git a/mobile/android/base/resources/layout/reading_list_row_view.xml b/mobile/android/base/resources/layout/reading_list_row_view.xml index 6bb799d6cbe4..a8ded1dfeef7 100644 --- a/mobile/android/base/resources/layout/reading_list_row_view.xml +++ b/mobile/android/base/resources/layout/reading_list_row_view.xml @@ -5,11 +5,16 @@ + + diff --git a/mobile/android/base/resources/menu/home_contextmenu.xml b/mobile/android/base/resources/menu/home_contextmenu.xml index 294b8aee5086..5fb6964765b6 100644 --- a/mobile/android/base/resources/menu/home_contextmenu.xml +++ b/mobile/android/base/resources/menu/home_contextmenu.xml @@ -29,6 +29,12 @@ + + + + diff --git a/mobile/android/base/resources/values/dimens.xml b/mobile/android/base/resources/values/dimens.xml index f2fa452d702d..1487a12240cd 100644 --- a/mobile/android/base/resources/values/dimens.xml +++ b/mobile/android/base/resources/values/dimens.xml @@ -86,7 +86,6 @@ 128dp - 15dp 10dp diff --git a/mobile/android/base/resources/values/styles.xml b/mobile/android/base/resources/values/styles.xml index 577e5d93bbc2..baa1fa8bcf39 100644 --- a/mobile/android/base/resources/values/styles.xml +++ b/mobile/android/base/resources/values/styles.xml @@ -137,6 +137,14 @@ end + + + + + + + + diff --git a/mobile/android/base/strings.xml.in b/mobile/android/base/strings.xml.in index bb8353bc2a90..659af713ed75 100644 --- a/mobile/android/base/strings.xml.in +++ b/mobile/android/base/strings.xml.in @@ -360,6 +360,8 @@ &contextmenu_top_sites_pin; &contextmenu_top_sites_unpin; &contextmenu_add_search_engine; + &contextmenu_mark_read; + &contextmenu_mark_unread; &doorhanger_login_no_username; &doorhanger_login_edit_title; From 025771fc446834426dc60d5710b2b9a6b9e27e6c Mon Sep 17 00:00:00 2001 From: Gijs Kruitbosch Date: Wed, 19 Aug 2015 17:41:30 +0100 Subject: [PATCH 04/19] Bug 1196311 - actually ship edge migrator, r=jaws --HG-- extra : commitid : 7VewJalFyq9 extra : rebase_source : 76d50265d9b00417b245136e481d79bc6a37bdc1 extra : amend_source : 8a9b388f4fe7c1d12618f7cc5f063271da27ef20 --- browser/components/migration/MigrationUtils.jsm | 1 + browser/installer/package-manifest.in | 1 + 2 files changed, 2 insertions(+) diff --git a/browser/components/migration/MigrationUtils.jsm b/browser/components/migration/MigrationUtils.jsm index 862a65777059..e0febf7da9ff 100644 --- a/browser/components/migration/MigrationUtils.jsm +++ b/browser/components/migration/MigrationUtils.jsm @@ -457,6 +457,7 @@ this.MigrationUtils = Object.freeze({ * * @param aKey internal name of the migration source. * Supported values: ie (windows), + * edge (windows), * safari (mac/windows), * canary (mac/windows), * chrome (mac/windows/linux), diff --git a/browser/installer/package-manifest.in b/browser/installer/package-manifest.in index e68059c1e7a6..a9ce916744c5 100644 --- a/browser/installer/package-manifest.in +++ b/browser/installer/package-manifest.in @@ -489,6 +489,7 @@ @RESPATH@/browser/components/FirefoxProfileMigrator.js #ifdef XP_WIN @RESPATH@/browser/components/360seProfileMigrator.js +@RESPATH@/browser/components/EdgeProfileMigrator.js @RESPATH@/browser/components/IEProfileMigrator.js @RESPATH@/browser/components/SafariProfileMigrator.js #endif From 960774d138b3f0eb8c537fbed2d3c442141ae58e Mon Sep 17 00:00:00 2001 From: Michael Comella Date: Tue, 18 Aug 2015 14:33:23 -0700 Subject: [PATCH 05/19] Bug 1196005 - Add l10n note for "Private Browsing" capitalizations. r=margaret --HG-- extra : commitid : IDOPBIWMTex extra : rebase_source : 624d78d49de9f07170b7bcb5a78b85ef7a5197ba --- .../android/locales/en-US/chrome/aboutPrivateBrowsing.dtd | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/mobile/android/locales/en-US/chrome/aboutPrivateBrowsing.dtd b/mobile/android/locales/en-US/chrome/aboutPrivateBrowsing.dtd index 7e29d554e1ee..95fec647497e 100644 --- a/mobile/android/locales/en-US/chrome/aboutPrivateBrowsing.dtd +++ b/mobile/android/locales/en-US/chrome/aboutPrivateBrowsing.dtd @@ -8,9 +8,15 @@ is used as a title, with the privatebrowsingpage.title string preceding it but on a separate line. So the final line will say "Private Browsing + Tracking Protection". --> + + From bdd19a5b3116f1fd503a433ab9a4b1c1a1e294b9 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 19 Aug 2015 05:47:07 -0700 Subject: [PATCH 06/19] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/7f8c58134988 Author: Wilson Page Desc: Merge pull request #31308 from wilsonpage/1191671 Bug 1191671 - clearing previous search in rocketbar should not dismiss keyboard ======== https://hg.mozilla.org/integration/gaia-central/rev/513eec64eac4 Author: Wilson Page Desc: Bug 1191671 - clearing previous search in rocketbar should not dismiss keyboard --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 96c9375f66e9..a88354859e25 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "8f77edf3ac39d36f6df0f5517223d3ed35ed89e0", + "git_revision": "fa32b801f6d854e846ea8294dc37840450d36c1e", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "cf72b9fb98db96ea36b50a7db87bc978ef94833c", + "revision": "7f8c581349881b9ca6afc880b31cf83c80daa8a9", "repo_path": "integration/gaia-central" } From e76f650e1e29b200a94fb73bfdfec52c8a2234f8 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 19 Aug 2015 05:48:45 -0700 Subject: [PATCH 07/19] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 6c936f19bcbc..1d755eca5950 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index a8384fdfc68a..c28ee81c7aa3 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 9f80bd952f5a..9c2c5240fa75 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index eccf412e2e24..302f706088e6 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 82346d88dc26..62442101031c 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 57ca26d53dcc..f2fe27344ed7 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 9f80bd952f5a..9c2c5240fa75 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 682285119223..e9969ed4a8df 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 8a02e4bd6811..61f9f14d3071 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index b34b64e6d128..6430df2b4779 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From a25d54a4ee1f4e5e934d157ad12b1666b7cf09c5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 19 Aug 2015 06:12:58 -0700 Subject: [PATCH 08/19] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/afda764ea25c Author: Borja Salguero Desc: Merge pull request #31372 from borjasalguero/update_selfcontained_rebased Bug 1183727 - [Contacts][NGA] Create #update view and connect it to #… ======== https://hg.mozilla.org/integration/gaia-central/rev/39f61a0cf7ef Author: borjasalguero Desc: Bug 1183727 - [Contacts][NGA] Create #update view and connect it to #open within Contacts App r=arcturus --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index a88354859e25..b5ca1fd5f6e0 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "fa32b801f6d854e846ea8294dc37840450d36c1e", + "git_revision": "b57de4c493b611dc70c27c7d78445fcb04b1491c", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "7f8c581349881b9ca6afc880b31cf83c80daa8a9", + "revision": "afda764ea25c4340bb0be32ae11c9be471e2db04", "repo_path": "integration/gaia-central" } From be2aa87d9a34d137e96af638f592510c12e22cbc Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 19 Aug 2015 06:14:37 -0700 Subject: [PATCH 09/19] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 1d755eca5950..aef386b67986 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index c28ee81c7aa3..82fcf0e82a14 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 9c2c5240fa75..8a4c51df3569 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 302f706088e6..280842d8da00 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 62442101031c..f3e86664ee64 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index f2fe27344ed7..7961644eae49 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 9c2c5240fa75..8a4c51df3569 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index e9969ed4a8df..a31cf741897b 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 61f9f14d3071..52d39937b2da 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 6430df2b4779..33b654b4ffd8 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 77cc53e4bb7acbaee6bfb5f83a4e1fe0e8206f1f Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 19 Aug 2015 07:55:10 -0700 Subject: [PATCH 10/19] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/8d04695c1582 Author: Chris Lord Desc: Merge pull request #31398 from Cwiiis/bug1191746-new-homescreen-marionette-remaining-app-tests Bug 1191746 - Port remaining app tests to new homescreen. r=gmarty ======== https://hg.mozilla.org/integration/gaia-central/rev/57323361364f Author: Chris Lord Desc: Bug 1191746 - Port remaining app tests to new homescreen. r=gmarty ======== https://hg.mozilla.org/integration/gaia-central/rev/427356d4bc45 Author: Chris Lord Desc: Merge pull request #31395 from Cwiiis/bug1191746-new-homescreen-marionette-packaged-app-tests Bug 1191746 - Port packaged app tests to new homescreen. r=gmarty ======== https://hg.mozilla.org/integration/gaia-central/rev/1f14518b694f Author: Chris Lord Desc: Bug 1191746 - Port packaged app tests to new homescreen. r=gmarty --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index b5ca1fd5f6e0..bc02e7704497 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "b57de4c493b611dc70c27c7d78445fcb04b1491c", + "git_revision": "d277f2be513ea4d9e28a131dbe6a516e3ebf0d9b", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "afda764ea25c4340bb0be32ae11c9be471e2db04", + "revision": "8d04695c1582e71670af42bda3b2b63378bfb963", "repo_path": "integration/gaia-central" } From e0cc2a1edbbb07964fb0d765c18895d978db6491 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 19 Aug 2015 07:56:47 -0700 Subject: [PATCH 11/19] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index aef386b67986..bbfa2b1f053f 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 82fcf0e82a14..ebf96577d31f 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 8a4c51df3569..a18e5e85b8c8 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 280842d8da00..29af8a2e464d 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index f3e86664ee64..525b1dad5d04 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 7961644eae49..ab9c81a4da94 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 8a4c51df3569..a18e5e85b8c8 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index a31cf741897b..119d80c17bb7 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 52d39937b2da..9b9acd957839 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 33b654b4ffd8..68de8eba352e 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From d73041937fe07c3a43cf2b443d0a0fc86c8205f5 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 19 Aug 2015 09:05:32 -0700 Subject: [PATCH 12/19] Bumping gaia.json for 4 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/ba3b3d8d1379 Author: Wilson Page Desc: Merge pull request #31176 from wilsonpage/1151625 Bug 1151625 - [Camera][Volume Rocker] Pressing the volume button during a self timer countdown will not cancel the countdown ======== https://hg.mozilla.org/integration/gaia-central/rev/bbada9e1c5e1 Author: Wilson Page Desc: Bug 1151625 - [Camera][Volume Rocker] Pressing the volume button during a self timer countdown will not cancel the countdown ======== https://hg.mozilla.org/integration/gaia-central/rev/940a1c38f21a Author: Tzu-Lin Huang Desc: Merge pull request #31387 from dwi2/bug1193163 Bug 1193163 - [JSDOC] write documentation of smart-home in jsdoc format ======== https://hg.mozilla.org/integration/gaia-central/rev/f4eaf0b420c1 Author: Tzu-Lin Huang Desc: Bug 1193163 - [JSDOC] write documentation of smart-home in jsdoc format --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index bc02e7704497..5657f15a45eb 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "d277f2be513ea4d9e28a131dbe6a516e3ebf0d9b", + "git_revision": "7fc5fbacf3ad8842a3959687e3689e08c749b108", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "8d04695c1582e71670af42bda3b2b63378bfb963", + "revision": "ba3b3d8d1379cd3519f12a1ef844f790ed07ca51", "repo_path": "integration/gaia-central" } From 1552ce1e8edd02b14864410280e8277526b69a41 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 19 Aug 2015 09:07:10 -0700 Subject: [PATCH 13/19] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index bbfa2b1f053f..6c121135bcfb 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index ebf96577d31f..e3979c5469a7 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index a18e5e85b8c8..13f5b0c87988 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 29af8a2e464d..455e5b281633 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 525b1dad5d04..10694db68672 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index ab9c81a4da94..ecfba3f103f4 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index a18e5e85b8c8..13f5b0c87988 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 119d80c17bb7..6dbebff07423 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 9b9acd957839..07f83fa455d6 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 68de8eba352e..25a15914e6df 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 3866243243a1a9764a8389bb66e92f16937f0326 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 19 Aug 2015 09:55:31 -0700 Subject: [PATCH 14/19] Bumping gaia.json for 6 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/6bc7ea353785 Author: Julien Wajsberg Desc: Merge pull request #31210 from julienw/1190276-body-and-number-activity Bug 1190276 - [Messages] In a "new" activity, don't redirect to a thread if there is a specified body r=azasypkin ======== https://hg.mozilla.org/integration/gaia-central/rev/1363542fe78e Author: Julien Wajsberg Desc: Bug 1190276 - [Messages] In a "new" activity, don't redirect to a thread if there is a specified body r=azasypkin ======== https://hg.mozilla.org/integration/gaia-central/rev/30172d27e0ea Author: Francisco Jordano Desc: Merge pull request #31424 from arcturus/bug-1186108 Bug 1186108 - [Contacts] Cannot share contact via MMS. r=francisco ======== https://hg.mozilla.org/integration/gaia-central/rev/127ae8c4af66 Author: Francisco Jordano Desc: Bug 1186108 - [Contacts] Cannot share contact via MMS. r=francisco ======== https://hg.mozilla.org/integration/gaia-central/rev/5c565e6d72b0 Author: Wilson Page Desc: Merge pull request #31425 from wilsonpage/1022134 Bug 1022134 - [Camera] Remove snap back rotation in AF indicator animation ======== https://hg.mozilla.org/integration/gaia-central/rev/7ac080d99487 Author: Wilson Page Desc: Bug 1022134 - [Camera] Remove snap back rotation in AF indicator animation --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 5657f15a45eb..a23e457e44b0 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "7fc5fbacf3ad8842a3959687e3689e08c749b108", + "git_revision": "9ac577619f17877c3831c960d7ec0b5524497b30", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "ba3b3d8d1379cd3519f12a1ef844f790ed07ca51", + "revision": "6bc7ea3537858ebe9e0b6e668f0886c040e2c60f", "repo_path": "integration/gaia-central" } From 81b0a52cf31e85e722329d5e742ecb13d5b1ca19 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 19 Aug 2015 09:57:15 -0700 Subject: [PATCH 15/19] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 6c121135bcfb..4ee4058dbebc 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index e3979c5469a7..e61c72c7d5af 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index 13f5b0c87988..aa44bf725aa4 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 455e5b281633..bb22c21e0286 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 10694db68672..ce90f7db3abb 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index ecfba3f103f4..67df89c5ceb0 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index 13f5b0c87988..aa44bf725aa4 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 6dbebff07423..313739df2819 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 07f83fa455d6..e5586ba52218 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 25a15914e6df..9fa35b71a84e 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 7c0df5871e7d7b8b390e198faace071fc1d9a075 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 19 Aug 2015 10:20:10 -0700 Subject: [PATCH 16/19] Bumping gaia.json for 2 gaia revision(s) a=gaia-bump ======== https://hg.mozilla.org/integration/gaia-central/rev/6310c0674f2d Author: Martijn Desc: Merge pull request #31419 from mwargers/1196231 Bug 1196231 - Fix error in ftu_step3.py in is_data_alert_switch_checked ======== https://hg.mozilla.org/integration/gaia-central/rev/5f3d54545f0b Author: Martijn Wargers Desc: Bug 1196231 - Fix error in ftu_step3.py in is_data_alert_switch_checked --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index a23e457e44b0..51d8f671eb99 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "9ac577619f17877c3831c960d7ec0b5524497b30", + "git_revision": "9860df1fcfab19db2d3d6b1f83075588518c2fbd", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "6bc7ea3537858ebe9e0b6e668f0886c040e2c60f", + "revision": "6310c0674f2dc5865b4181236aa7c6ff47171906", "repo_path": "integration/gaia-central" } From 2679bece5de5e1ed9ef5a2b40f4ef9baa31fe578 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 19 Aug 2015 10:21:49 -0700 Subject: [PATCH 17/19] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 4ee4058dbebc..02fbd3e1227c 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index e61c72c7d5af..77ab928d5377 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index aa44bf725aa4..b2f3d68fb57d 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index bb22c21e0286..905288900c06 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index ce90f7db3abb..80dcdf433ad3 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index 67df89c5ceb0..ba4f259c68ea 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index aa44bf725aa4..b2f3d68fb57d 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index 313739df2819..ba28211d9992 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index e5586ba52218..2c826eccde6b 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 9fa35b71a84e..2e61944de3e6 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - + From 089f57da65f4b3270a0658ad3610f571faa47bb7 Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 19 Aug 2015 12:00:29 -0700 Subject: [PATCH 18/19] Bumping gaia.json for 6 gaia revision(s) a=gaia-bump MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ======== https://hg.mozilla.org/integration/gaia-central/rev/68da3c242dcd Author: Jim Porter Desc: Merge pull request #31378 from jimporter/music-metadata-doc Bug 1181272 - [music] Provide developer documentation (metadata part) ======== https://hg.mozilla.org/integration/gaia-central/rev/505989869c14 Author: Jim Desc: Add docs for the metadata parser and correct some comments ======== https://hg.mozilla.org/integration/gaia-central/rev/19230eeaa34a Author: Jim Porter Desc: Merge pull request #31382 from jimporter/music-bulletproof-metadata Bug 1191760 - [music] Speculative patch to bulletproof metadata parsi… ======== https://hg.mozilla.org/integration/gaia-central/rev/3b4fce661d9f Author: Jim Desc: Bug 1191760 - [music] Speculative patch to bulletproof metadata parsing even further ======== https://hg.mozilla.org/integration/gaia-central/rev/6ff99926696b Author: Jim Porter Desc: Merge pull request #31381 from jimporter/music-open-activity Bug 1193498 - [Music] Opening a downloaded song doesn't work ======== https://hg.mozilla.org/integration/gaia-central/rev/42264926d255 Author: Jim Desc: Bug 1193498 - [Music] Opening a downloaded song doesn't work --- b2g/config/gaia.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/b2g/config/gaia.json b/b2g/config/gaia.json index 51d8f671eb99..79974c5ff09a 100644 --- a/b2g/config/gaia.json +++ b/b2g/config/gaia.json @@ -1,9 +1,9 @@ { "git": { - "git_revision": "9860df1fcfab19db2d3d6b1f83075588518c2fbd", + "git_revision": "89e0096a3de0378e3eda77e6a2a0bb5ca03eb8bb", "remote": "https://git.mozilla.org/releases/gaia.git", "branch": "" }, - "revision": "6310c0674f2dc5865b4181236aa7c6ff47171906", + "revision": "68da3c242dcd332c0aa579fbdc9da20d9db60022", "repo_path": "integration/gaia-central" } From c53c389a7213765ca053ec46ef92c7f7afa9d28e Mon Sep 17 00:00:00 2001 From: B2G Bumper Bot Date: Wed, 19 Aug 2015 12:02:07 -0700 Subject: [PATCH 19/19] Bumping manifests a=b2g-bump --- b2g/config/aries/sources.xml | 2 +- b2g/config/dolphin/sources.xml | 2 +- b2g/config/emulator-ics/sources.xml | 2 +- b2g/config/emulator-jb/sources.xml | 2 +- b2g/config/emulator-kk/sources.xml | 2 +- b2g/config/emulator-l/sources.xml | 2 +- b2g/config/emulator/sources.xml | 2 +- b2g/config/flame-kk/sources.xml | 2 +- b2g/config/nexus-4/sources.xml | 2 +- b2g/config/nexus-5-l/sources.xml | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/b2g/config/aries/sources.xml b/b2g/config/aries/sources.xml index 02fbd3e1227c..4894e311f8ad 100644 --- a/b2g/config/aries/sources.xml +++ b/b2g/config/aries/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/dolphin/sources.xml b/b2g/config/dolphin/sources.xml index 77ab928d5377..a0e8dd256e63 100644 --- a/b2g/config/dolphin/sources.xml +++ b/b2g/config/dolphin/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-ics/sources.xml b/b2g/config/emulator-ics/sources.xml index b2f3d68fb57d..5d077f691b41 100644 --- a/b2g/config/emulator-ics/sources.xml +++ b/b2g/config/emulator-ics/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/emulator-jb/sources.xml b/b2g/config/emulator-jb/sources.xml index 905288900c06..fd7eb8958ff7 100644 --- a/b2g/config/emulator-jb/sources.xml +++ b/b2g/config/emulator-jb/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/emulator-kk/sources.xml b/b2g/config/emulator-kk/sources.xml index 80dcdf433ad3..c4ed6913a6e0 100644 --- a/b2g/config/emulator-kk/sources.xml +++ b/b2g/config/emulator-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator-l/sources.xml b/b2g/config/emulator-l/sources.xml index ba4f259c68ea..172f98f05264 100644 --- a/b2g/config/emulator-l/sources.xml +++ b/b2g/config/emulator-l/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/emulator/sources.xml b/b2g/config/emulator/sources.xml index b2f3d68fb57d..5d077f691b41 100644 --- a/b2g/config/emulator/sources.xml +++ b/b2g/config/emulator/sources.xml @@ -19,7 +19,7 @@ - + diff --git a/b2g/config/flame-kk/sources.xml b/b2g/config/flame-kk/sources.xml index ba28211d9992..7ca09d0ac785 100644 --- a/b2g/config/flame-kk/sources.xml +++ b/b2g/config/flame-kk/sources.xml @@ -15,7 +15,7 @@ - + diff --git a/b2g/config/nexus-4/sources.xml b/b2g/config/nexus-4/sources.xml index 2c826eccde6b..aa062d0082f4 100644 --- a/b2g/config/nexus-4/sources.xml +++ b/b2g/config/nexus-4/sources.xml @@ -17,7 +17,7 @@ - + diff --git a/b2g/config/nexus-5-l/sources.xml b/b2g/config/nexus-5-l/sources.xml index 2e61944de3e6..ed070f55062b 100644 --- a/b2g/config/nexus-5-l/sources.xml +++ b/b2g/config/nexus-5-l/sources.xml @@ -15,7 +15,7 @@ - +