Commit Graph

20665 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
e8d8c705a1 Backed out changeset 490d3460a197 (bug 1230462) for test failures in test_modal_prompts.html
--HG--
rename : toolkit/components/prompts/test/test_subresources_prompts.html => toolkit/components/prompts/test/test_bug625187.html
2016-06-05 11:26:57 +02:00
Dragana Damjanovic
8d4a3a8b49 Bug 1230462 - Change the authentiation dialog message. r=mayhemer,dolske,margaret,tanvi
--HG--
rename : toolkit/components/prompts/test/test_bug625187.html => toolkit/components/prompts/test/test_subresources_prompts.html
extra : rebase_source : f37ed50a558040dee1958c215ccc5559637d2f84
2016-06-03 09:09:00 +02:00
Sebastian Kaspari
2c68379e9b Bug 1265710 - Treat apple-touch-icons like favicons and use them in the app UI. r=ahunt
Originally I wanted to keep them as a separate type of icon and store them separately.
But this is much simpler and a big improvement. We wanted to treat touch icons as
better favicons anyways and making them go through the same pipeline gives us exactly
that.

MozReview-Commit-ID: LgEd1Fl6a4t

--HG--
extra : rebase_source : 618c6aa41edb5f3a9ad12ed748714482c0a7eb4c
2016-06-03 19:48:16 +02:00
Kartikaya Gupta
09d3bcfff8 Bug 1276850 - Back out part 3 of bug 1220307. rs=froydnj
Enabling rust in Fennec builds appears to switch some floating point operations
from hardware to software and slows down paint operations. Since no rust code
is actually used in Fennec builds, we can disable this until the rust toolchain
has better support for ARM fp hardware.
2016-06-03 14:28:48 -04:00
Jim Chen
cdc5a62ddc Bug 1277064 - Use ConcurrentHashMap for profile cache; r=snorp
Use ConcurrentHashMap for the profile cache so that accessing the cache
won't cause inadvertent deadlocks.
2016-06-03 12:01:17 -04:00
Carsten "Tomcat" Book
71eb3110f9 merge mozilla-inbound to mozilla-central a=merge 2016-06-03 12:00:06 +02:00
Michael Comella
af565b6cbb Bug 1277214 - Move MOZ_DISABLE_* to single MOZ_IN_AUTOMATION env var. r=grisha
We hit an issue where adding a new env var, MOZ_DISABLE_TELEMETRY, added env10
and caused crashes. I suspect the issue is that there are is now a double-digit
number of env vars (bug 1277390). Here, we do the quick fix by removing
MOZ_DISABLE_TELEMETRY & repurposing MOZ_DISABLE_SWITCHBOARD to be generic.

While we're at it, we simplify the code by making the setDisabled methods a
strict getter without checking for how many times they're called.

MozReview-Commit-ID: 19DDbVYRZ2

--HG--
extra : rebase_source : 1590ae4f49bf725ab8a3bb26f10dab324903aa8c
2016-06-01 16:46:44 -07:00
Michael Comella
4bbd712e84 Bug 1277214 - Stop reading env vars when the key no longer exists. r=grisha
In the previous implementation, we'd stop reading when the value would return
null, however, this breaks with SafeIntents where null is returned if a value
throws a runtime exception - i.e. we might stop reading at env2 if it throws
even though env3+ exist.

MozReview-Commit-ID: 7iZgUAjBSmB

--HG--
extra : rebase_source : a7440dd14bb406afcd6ac1ec514bf0b188b5b2b7
2016-06-01 16:29:26 -07:00
Michael Comella
aaa16e308e Bug 1277214 - Use SafeIntent in getEnvVarMap. r=grisha
MozReview-Commit-ID: 5eXjgCsd6Rl

--HG--
extra : rebase_source : 4c6c9cf2b41cd5ba236c273104723bc9f6e3dafc
2016-06-01 15:34:34 -07:00
Michael Comella
dd4052c5e0 Bug 1277214 - Move remaining SafeIntentUtils functions to IntentUtils. r=grisha
I feel this better follows the util class pattern: IntentUtils acts on Intents
as StringUtils would act on Strings.

MozReview-Commit-ID: 7n2B9q1KlSy

--HG--
rename : mobile/android/base/java/org/mozilla/gecko/util/SafeIntent.java => mobile/android/base/java/org/mozilla/gecko/mozglue/SafeIntent.java
extra : rebase_source : ac953ac44f91f1d9b8fa4c0c2a21c539974e9df8
2016-06-01 15:32:41 -07:00
Michael Comella
200e23d1c7 Bug 1277214 - Move SafeIntent to its own class. r=grisha
This gets used often enough that it's annoying to do full class name imports.

MozReview-Commit-ID: 7Yhp1NCgwQw

--HG--
extra : rebase_source : 4e4875153d171d8eb4c8ce49f8a6e6170ac5c616
2016-06-01 15:27:41 -07:00
Michael Comella
9fda412bd8 Bug 1277214 - Add javadoc to explain SafeIntent. r=grisha
MozReview-Commit-ID: LqQm6yAKbr5

--HG--
extra : rebase_source : ddad22a46263fd13955b89828547158c9c723ecb
2016-06-01 15:21:36 -07:00
Carsten "Tomcat" Book
91c45dd470 Merge mozilla-central to fx-team 2016-06-02 12:00:53 +02:00
Carsten "Tomcat" Book
e0f231ace5 merge mozilla-inbound to mozilla-central a=merge 2016-06-02 11:56:07 +02:00
Michael Comella
aeb8cb76b8 Bug 1273689 - review - remove inner class & move methods to containing class; use BrowserAppDelegateWithReference. r=me
It's all a little cleaner.
2016-06-01 17:46:19 -07:00
Michael Comella
790cfdc8dd Bug 1273689 - Rename CorePingDelegate. r=sebastian
We are doing more than just uploading in the delegate now.

I didn't fix this in the previous commits because version control makes this
non-trivial.

MozReview-Commit-ID: IjXsQC19k2S

--HG--
extra : rebase_source : 710fd827dd1468ca22c6372d101d3541040005ce
2016-05-31 15:39:58 -07:00
Michael Comella
e81040062d Bug 1273689 - Upload in onStop for first run. r=sebastian
MozReview-Commit-ID: 4UReiDeNCg4

--HG--
extra : rebase_source : f8b71109e5673c083b1f7d9d184f901998a40174
2016-05-31 15:32:41 -07:00
Michael Comella
9022a32d3c Bug 1273689 - Move session measurement calls to CorePingDelegate. r=sebastian
MozReview-Commit-ID: EPLUd5Uq0Pc

--HG--
extra : rebase_source : ad7f650414c15ac44b64acb371a04f3cfea3d0e2
2016-05-31 14:16:04 -07:00
Michael Comella
3013ee94dd Bug 1273689 - Factor out getSharedPreferences call. r=sebastian
The same preferences will be used by the new code & the old code.

MozReview-Commit-ID: BXuSQjhhXQq

--HG--
extra : rebase_source : 8824624c524392c0178535c47bf9657ba9cf9168
2016-05-31 14:07:26 -07:00
Michael Comella
0d36237547 Bug 1273689 - Elaborate on why we upload when we do. r=sebastian
MozReview-Commit-ID: DIxkY3F3Z6S

--HG--
extra : rebase_source : 0e13c316b6fc4a5522a52f75c5f00ffd54a7baab
2016-05-31 15:32:04 -07:00
Michael Comella
8bae604593 Bug 1273689 - Move core ping upload to BrowserAppDelegate. r=sebastian
This lets us put the two paths of upload code all in the same place.

MozReview-Commit-ID: BUsdyEAcdDO

--HG--
extra : rebase_source : a854facb606afd95764feac19fb5ef64f216addf
2016-05-31 13:57:44 -07:00
Andrzej Hunt
5e633581d1 Bug 1276050 - Remove duplicate code from Favicons r=sebastian
loadUncachedFavicon does exactly the same thing.

MozReview-Commit-ID: 58Yi28JZfv4

--HG--
extra : amend_source : 04776f9507d0b17432b4d74913ea20b84db5c012
2016-05-23 13:27:26 -07:00
Grigory Kruglov
218043cb63 Bug 1274029 - Part 5: Unit tests for aggregate updates r=sebastian
MozReview-Commit-ID: 9EljLhpySAj

--HG--
extra : rebase_source : ee29f463f14322e88672e49dce119e2ad3db5ec5
2016-06-01 10:21:14 -07:00
Grigory Kruglov
bdaf8e4677 Bug 1274029 - Part 4: Update aggregates during history import from android browser r=sebastian
MozReview-Commit-ID: EaR15lbuDQm

--HG--
extra : rebase_source : 4320fe191bd5bc1b8f02b254c711681ee3973c95
2016-06-01 12:38:51 -07:00
Grigory Kruglov
7023147d0d Bug 1274029 - Part 3: Update aggregates during syncing r=sebastian
MozReview-Commit-ID: 9WyBE0Lk3Tp

--HG--
extra : rebase_source : 8dd2af4cf71d810a94620a67734d6ca492574a76
2016-06-01 15:02:46 -07:00
Grigory Kruglov
3a506f704b Bug 1274029 - Part 2: Update aggregates during local browsing r=sebastian
MozReview-Commit-ID: 9Z9uFKxbRZm

--HG--
extra : rebase_source : 9e3f8d74dba70106650c886502cf6327cfbfa65d
2016-05-27 23:50:29 -07:00
Grigory Kruglov
e6c225c1e5 Bug 1274029 - Part 1: Database migration; initial aggregates calculation r=sebastian
MozReview-Commit-ID: 7nR2pwGV7nE

--HG--
extra : rebase_source : b91792560e9570d2032925d10f0597058a3a3882
2016-06-01 12:40:19 -07:00
Grigory Kruglov
c82fe23303 Bug 1274029 - Pre 2: Correct old comments about combined view r=grisha
MozReview-Commit-ID: IiePFWmkPKZ

--HG--
extra : rebase_source : 6f5fd3628823a567dcb9b8ee5324e9d3906461e3
2016-06-01 12:25:36 -07:00
Grigory Kruglov
78921a288e Bug 1274029 - Pre: Fix v32.db test db, set combined view to what it should be at this time r=sebastian
MozReview-Commit-ID: AgaxNgPHoJM

--HG--
extra : rebase_source : 40072f536b94ec593c20cda46fb7990bc02142bb
2016-05-30 18:16:49 -07:00
Sebastian Kaspari
6e4b1228f5 Bug 1276910 - Do not show "Add to home screen" prompt in private browsing. r=margaret
MozReview-Commit-ID: DFoMnyx4Gde

--HG--
extra : rebase_source : 4f91aea87e161fa08d07677f5c90717e7514e59c
extra : histedit_source : b8f02f27216478603d61c3f71562da74e0297e16
2016-06-01 10:02:51 +02:00
Carsten "Tomcat" Book
c2494b5883 merge mozilla-inbound to mozilla-central a=merge 2016-06-01 15:07:48 +02:00
Michael Comella
9912677a15 Bug 1277071 - Move PREF_SEQ_COUNT to CorePingBuilder. r=jonalmeida
MozReview-Commit-ID: 44R0ahE094N

--HG--
extra : rebase_source : a7283f8da674ea315f9fa0ac0dd59dead66f3e80
extra : source : e22b131d462f845529713d8a3e0612525d06b78c
2016-05-31 16:33:08 -07:00
Michael Comella
82181ad56b Bug 1270191 - Correct my previous patches to more faithfully reproduce the refactored code. r=liuche
The previous code checked:

if (env.startsWith("MOZ_DISABLE_SWITCHBOARD=")) {
    if (!env.endsWith("=")) {

So it would not pass with the empty String but my previous revision permitted
the empty string.

Practically speaking, I don't think it matters because this is only used in
remoteautomation.py where the value is 1, but better safe than sorry.

MozReview-Commit-ID: DLtmvWlQYs7

--HG--
extra : rebase_source : 3c96cf81f729911bfefcc103f46068bd9b8fb202
2016-05-31 17:25:17 -07:00
Michael Comella
1e85dedec9 Bug 1270191 - Disable telemetry upload during tests. r=grisha
MozReview-Commit-ID: GoQQRfGRvd4

--HG--
extra : rebase_source : c2d56638e078012766e8f7c9b64de6d3988e6dbc
2016-05-31 17:04:40 -07:00
Michael Comella
8fc95417b0 Bug 1270191 - Move Experiments to env var solution. r=grisha
MozReview-Commit-ID: 5Rpdyg7zpNG

--HG--
extra : rebase_source : 1642484993287d489060e95e3fbeb62232b422c6
2016-05-31 17:04:25 -07:00
Michael Comella
b50b3795da Bug 1270191 - Add IntentUtils.getEnvVarMap. r=grisha
MozReview-Commit-ID: 7ojczu4rOnD

--HG--
extra : rebase_source : f33965372fdfdb801d5f9b999c91dd591f6c856c
2016-05-31 16:48:03 -07:00
Chenxia Liu
a9a8e90f7c Bug 1276374 - Remove firstrun Content Notifications slide. r=ahunt
MozReview-Commit-ID: CIkvOZrqHwT

--HG--
extra : rebase_source : 9ed4662dd6b766536ecaef2e6e7b199d1d444cd3
2016-05-31 15:35:29 -07:00
Chenxia Liu
ca0df37914 Bug 1275782 - Disable "search-term" experiment. r=ahunt
MozReview-Commit-ID: FQY76x04Ilo
2016-05-31 15:49:51 -07:00
Jan Henning
d0ea6f3ea5 Bug 1251362 - Part 16 - Remove the Recent Tabs panel from the default home panel config. r=liuche
MozReview-Commit-ID: IX6AkBoa3Mg

--HG--
extra : transplant_source : %C0%C6m%D9%83-I%05%FC%8F%05k%88T%3D%96%BD%2B%EB%F7
2016-05-15 02:22:03 +02:00
Jan Henning
1a868a596f Bug 1251362 - Part 15 - Redirect direct loads of the Recent Tabs panel about:home URL to the Recent Tabs folder of the Combined History panel. r=liuche
After detecting multiple successive crashes in a row, we temporarily switch off automatic session restoring and display the Recent Tabs panel instead. As that panel is going to be removed, we intercept loads of the Recent Tabs panel about:home?panel=... URL and redirect them to the Combined History panel. We also use the facilities provided by bug 1060544 to jump directly to the Recent Tabs folder in that case.

MozReview-Commit-ID: 7dQ7tW2dD1M

--HG--
extra : transplant_source : %AA%1C%F1%2AD%DDR%29%D5%A2%AA%8D%1B%B6%EE%81%BE%A9%0B%CF
2016-05-26 23:04:53 +02:00
Jan Henning
9c0527fbb4 Bug 1251362 - Part 14 - Add telemetry for restoring tabs. r=liuche
This adds telemetry for clicking on a closed tab or the "Open all" button. Methods and extras strings are based on those used for the old Recent Tabs panel.

MozReview-Commit-ID: 1Kc8fACkmIc

--HG--
extra : transplant_source : m%09%FA%DB%8E%E5%DEG%FF%D1%83%AB%EA%D8%3B%10%9E%08%E3%85
2016-05-18 19:04:49 +02:00
Jan Henning
6f59a5b498 Bug 1251362 - Part 13 - Only enable swipe to refresh within the Synced devices smart folder. r=liuche
Recently closed tabs aren't synced, therefore being able to swipe to refresh within the Recent tabs folder isn't necessary. To avoid triggering a refresh by accident, we restrict swipe to refresh to the Synced devices folder itself.

MozReview-Commit-ID: YwekSwQr2q

--HG--
extra : transplant_source : %BB%AE%CB%A8W%9B%9F%CD%ECM%C5%B1%94u%9A%25%EE%FDN%AD
2016-05-14 23:38:29 +02:00
Jan Henning
96a4071908 Bug 1251362 - Part 12 - Remember more recently closed tabs. r=liuche
MozReview-Commit-ID: 37mYEiJKfTz

--HG--
extra : transplant_source : %1E%20%05%F8%D6%B8wN3%3C%0E%0C%E2%1E%2A%83%8Fa%F4%10
2016-05-26 13:46:00 +02:00
Jan Henning
c442f23a2f Bug 1251362 - Part 11 - Directly notify the RecentTabsAdapter when clearing history. r=liuche
Sessionstore.bak is only read when we are initialising the home panels, so after clearing all history from the button in the Combined History panel, the "Tabs from last time" section would still linger around until the home panels have been closed and reopened. To prevent this, we now directly notify the RecentTabsAdapter when all history has been deleted, so it can immediately clear its own copy of the last session's tabs.

MozReview-Commit-ID: 3EFY2WbWqzh

--HG--
extra : transplant_source : %C1%3FyzYZ%81F%5E%F9%98%FE%DC%B0%3F%0D%D3%18%7Bt
2016-05-14 21:27:23 +02:00
Jan Henning
6b24235a53 Bug 1251362 - Part 10 - Display a context menu for closed tab entries. r=liuche
MozReview-Commit-ID: Gv2tJoNRldX

--HG--
extra : transplant_source : N%8C%22%19%CD%7F%9E%CC%E4T%BEU%01D%29HZ%A6%0A%D5
2016-05-14 19:42:00 +02:00
Jan Henning
17ac1af323 Bug 1251362 - Part 9 - Display a button to open all recently closed tabs. r=liuche
Depending on the History panel's PanelLevel state, we now dynamically set the panel footer button's text and determine its onClick behaviour.

MozReview-Commit-ID: EjesnHsntyC

--HG--
extra : transplant_source : NCs%94C%DE%F5%FC%E6%D7%EA%F8%05%1E%D4%0E%2B%2B6%02
2016-05-26 16:36:25 +02:00
Jan Henning
4af4b8a0fa Bug 1251362 - Part 8 - Handle Recent Tabs in onItemClicked(). r=liuche
Clicking a tab in the list of recently closed tabs now sends the appropriate message back to the session store.

MozReview-Commit-ID: KF3UJjq5zQK

--HG--
extra : transplant_source : %3FU%EB%87%1B%C4%13I/a%FB%C5%C2v%06%26V%0C%A0%D8
2016-05-18 18:55:32 +02:00
Jan Henning
0df288dda3 Bug 1251362 - Part 7 - Update closed tabs count in the History panel main view. r=liuche
We need to update the recent tabs count displayed by the smart folder as necessary. To do this, we copy the approach used for updating the synced devices count.

MozReview-Commit-ID: BFwv5bY1DWk

--HG--
extra : transplant_source : %1A%EB%B0g%05%94%F3%E9%26%D8%1F%15%DF7%C3%EB%1E%27%C6_
2016-05-14 20:35:07 +02:00
Jan Henning
a8cf872eed Bug 1251362 - Part 6 - Update empty panel state when recent tabs count changes. r=liuche
The recent tabs count might change while the Recent Tabs folder is open, e.g. immediately after startup, once we receive the first "ClosedTabs:Data" message from the session store. Therefore, we need to hide/unhide the empty view as necessary, which is normally handled by the Combined History panel's updateEmptyView() function. Since we aren't using a cursor, we can't hinge calling that on the CursorLoader's onLoadFinished() callback, so instead, we include our own callback to the Combined History panel, modelled after the DeviceUpdateHandler used for updating the count of synced devices.

MozReview-Commit-ID: GLHM9LoWk2h

--HG--
extra : transplant_source : %09E%B2D%DCB%F6%D3%B5%8A%28%DCx%94e%A2%0F%14%A3%96
2016-05-15 01:41:45 +02:00
Jan Henning
ebe769ff81 Bug 1251362 - Part 5 - Actually show recently closed tabs when opening the smart folder. r=liuche
This fills the new smart folder we've previously added with life and displays the recently closed tabs as we receive them from the session store. If we can find a sessionstore.bak file (previously the "Tabs from last time"), we also add those tabs to the bottom of the list.

Most of the code for communicating with the session store and reading sessionstore.bak is adapted from the original Recent Tabs panel, however unlike the previous implementation, I've opted for a cursor-less approach of storing and retrieving the recent tabs data, since the recent tabs data isn't actually powered by a database anyway. Instead, the RecentTabsAdapter maintains two arrays for storing "Recently closed tabs" (as received through messages from the Gecko session store) and "Tabs from last time" (as read from sessionstore.bak during panel initialisation).

Also, as per the other Combined History panel adapters and because we're now using a RecyclerView instead of a ListView, list item types are now determined on demand through getItemTypeForPosition() instead of precalculating them during a data update and directly storing together with the tab data items in a cursor.

MozReview-Commit-ID: IpoUr9f0JBP

--HG--
extra : transplant_source : %C4%D5%AF%CA%A4_-%85%1AL%1D%9CF%2B%20Lh%7B%02%21
2016-06-02 18:08:23 +02:00
Jan Henning
2b737b8819 Bug 1251362 - Part 4 - Add a Recent Tabs folder to the Combined History panel. r=liuche
This folder can be opened and closed to get back to the history view, however it doesn't contain any actual content (closed tabs) yet. Its empty view is based on the original empty view of the Recent Tabs panel.

For displaying the recently closed tabs count within the smart folder similarly to how we display the number of synced devices, two new strings need to be added.

MozReview-Commit-ID: IAL0yDrc2Ld

--HG--
extra : transplant_source : %A1%80jZ%1Eg%14p%7D%DD%DD%EA%E8%7E%CA%0E%CD%28%99%3C
2016-05-13 23:52:24 +02:00
Jan Henning
0df88b27db Bug 1251362 - Part 3 - Add new "Recent" icon. r=liuche
Bug 1277277 will track getting this icon used for the search term history, too, so we can remove the old resources (icon_most_recent_empty.png) completely.

MozReview-Commit-ID: GFFovwiRokc

--HG--
extra : transplant_source : %5C%E5%EA%E4%D5%B7%F7%11%8E%DDSG%3C%93%13%DE%18%14%0E%03
2016-06-04 12:32:02 +02:00
Jan Henning
82c02802b1 Bug 1251362 - Part 2 - Import OnPanelLevelChangeListener.PanelLevel. r=liuche
OnPanelLevelChangeListener.PanelLevel.CHILD_SYNC really is a mouthful.

MozReview-Commit-ID: 3uEHQjUlTxf

--HG--
extra : transplant_source : %C8%E3%7E%D3%DB%84%92%0DPQ5/a%23%18%8F%8D%FD%BB7
2016-05-15 01:24:13 +02:00
Jan Henning
2e5e99233a Bug 1251362 - Part 1 - Increase SwipeRefreshLayout weight. r=liuche
Otherwise, depending on the device's display dimensions, a second smart folder would be overlapped by the empty view message that is displayed when no history is present for the history panel to display.

Once we've updated to a newer version of the support library (see bug 1267884), we should revisit this and see if using "wrap_content" is working properly instead.

MozReview-Commit-ID: 1xBCeiST9n4

--HG--
extra : transplant_source : %E5%A6%C7%DB%8E%DCQ%3D%B29%94%9BZ%EC%0CbJ%0F%08%B0
2016-05-16 17:53:01 +02:00
Chris Manchester
20da05d2ba Bug 1278959 - Move MOZ_ANDROID_PACKAGE_INSTALL_BOUNCER to Python configure and make it settable by mozconfig. r=glandium
MozReview-Commit-ID: Hoo4vaIrRHq
2016-06-09 11:37:40 -07:00
Justin D'Arcangelo
c3d19303c2 Bug 1272102 - FlyWeb Android UI delta patch - last push was not final version of patch. r=sebastian
--HG--
extra : amend_source : 1de587ba13ec631f924eedccd8591d3d5780fa79
2016-06-09 12:06:20 -04:00
Nathan Froyd
85e988af23 Bug 1277189 - update android to NDK r11c; r=snorp 2016-06-09 18:44:34 -04:00
Kannan Vijayan
e4d6db6820 Bug 1272101 - Changes in preparation for FlyWeb landing. Add nsINetworkInfoService and implementation for various platforms. r=hurley 2016-06-01 16:16:40 -04:00
Carsten "Tomcat" Book
fbac2cff2c Merge mozilla-central to mozilla-inbound
--HG--
extra : rebase_source : 4d615ba5f76e2c989cc3f4d676d21105b67b25f0
2016-06-01 15:10:05 +02:00
Alastor Wu
5600b6dd28 Bug 1240423 - part6 : remove useless pref in Android. r=snorp
MozReview-Commit-ID: 8JFMZ5384wZ

--HG--
extra : rebase_source : 8d81b08eaac84181f63306a269f5e9c3478171b0
2016-06-01 10:26:24 +08:00
Alastor Wu
ae6fa1e22d Bug 1240423 - part1 : implement the remote media-control on Fennec. r=ahunt
MozReview-Commit-ID: GjkSCy5ecbQ

--HG--
extra : rebase_source : d0f3c81e5f42d556a19e3283b8b0dfdc0e3e7381
2016-06-01 10:26:01 +08:00
Michael Comella
6aa25533cb Bug 1278008 - Add all_jars to annotation processing classpath. r=sebastian
Because I don't know much about the build system, this may not be an optimal
fix. See the added code comments for more details.

Since this is an annotation processor and they tend to be self-analyzing, my
one concern is that this code uses the classpath in some way to identify which
files need to be kept. That being said:
 1) I don't think it makes sense to use the classpath in this way, particularly
when the files we want to operate on are passed as a command line argument.
 2) My build did not warn me that the generated JNI wrappers have changed so I
expect no side effects from this change.

MozReview-Commit-ID: 5mm6TClO1Su

--HG--
extra : rebase_source : c1ae4f0e9972f9efd8d6593fcbf27a500a6e0b63
2016-06-06 10:30:21 -07:00
Michael Comella
d1c8268ecb Bug 1079874 - Define device configuration in inflated resources. r=sebastian
See the added code comments for motivations.

Note that this is a speculative patch - I was unable to reproduce the crash and
thus do not know if it fixes it, however, I did test that the appropriate
toolbar configuration is created on vanilla Android for phone & tablet.

MozReview-Commit-ID: 2v1Ix8X68LH

--HG--
extra : rebase_source : ee32c374d9e2daf1a75975b657cb173dd1432fc3
2016-06-01 14:49:29 -07:00
Sebastian Kaspari
f8fae386c0 Bug 1270068 - TopSitesGridAdapter: Implement getItemId() so that Android can recycle views appropriately. r=grisha
MozReview-Commit-ID: 5mwPOTcIRRs

--HG--
extra : rebase_source : 3a9e017ce40c1f84d2542f0fa9b1e7db3f4e03a0
2016-06-07 14:34:36 +02:00
Sebastian Kaspari
4ba704d3e2 Bug 1207739 - SearchEngineBar: Fix calculation to determine number of search engines to display. r=ahunt
If we cannot display all search engines then we want to show a smaller number so that the last one is
cut-off (we only display half of it). The previous version did not calculate the next smallest half
correctly: Instead of displaying 3.5 engines if we have space for 3.7 engines, we only displayed 2.5.

MozReview-Commit-ID: KfopL9td3ba

--HG--
extra : rebase_source : 22534e56a0b9668921fc7bc0d5c2f874823645ed
2016-06-06 16:28:27 +02:00
Carsten "Tomcat" Book
06a7fd0491 Merge mozilla-central to mozilla-inbound
--HG--
rename : toolkit/components/prompts/test/test_bug625187.html => toolkit/components/prompts/test/test_subresources_prompts.html
2016-06-06 12:02:34 +02:00
Dragana Damjanovic
1de3e688ca Bug 1230462 - Change the authentiation dialog message. r=mayhemer,dolske,margaret,tanvi
--HG--
rename : toolkit/components/prompts/test/test_bug625187.html => toolkit/components/prompts/test/test_subresources_prompts.html
2016-06-06 01:06:00 +02:00
Dragana Damjanovic
87fd6ae3a9 Bug 968273 - On reload load from the original uri, so that all redirects are reloader.r=mayhemer 2016-06-01 11:57:52 +02:00
Francesco Lodolo (:flod)
acf7c3abc5 Bug 1277460 - Add localization comment for "Data saver" in android_strings.dtd. r=sebastian 2016-06-01 23:08:00 +02:00
Andrzej Hunt
d5d064e85d Bug 1258549 - Upgrade fennec support links r=margaret
MozReview-Commit-ID: 2fgrkbppx5g

--HG--
extra : rebase_source : 5687cb057ac57c3a2a5cd6328bfd0cae2459857a
extra : histedit_source : b78e548b58738b5e701d36eb5ebf5145704c089b
2016-06-03 11:10:26 -07:00
Sebastian Kaspari
f31ddc4973 Bug 1278255 - MediaControlService: Set correct action title. r=ahunt
MozReview-Commit-ID: 5QT7zFQIMTF

--HG--
extra : rebase_source : 6e03195520e01fd3e40ac45d8e34fdd4fa156b1b
extra : histedit_source : 683052863dd4411ca8a485d86fd083cac3cd5936
2016-06-06 16:55:26 +02:00
Andrzej Hunt
9a046aec20 Bug 1264783 - Use Hardware layers for tabs curve (except on pre-lollipop) r=sebastian
On Android N, the tab button flickers when drawing animations such as the loading progress bar,
or even the tab count increment, over the tabs button. Using hardware layers appears to fix
this. For consistency we could use this across most devices, except those running 4.4 or earlier.
There the button background (light gray) is drawn black with hardware layers, so we should stick
with the default on such devices.

MozReview-Commit-ID: H5VWEkrRbVf

--HG--
extra : amend_source : bf1973e336f9bfc0cdface27b1d2038bf616a45a
2016-06-03 15:12:54 -07:00
Carsten "Tomcat" Book
e3a66bb557 Backed out changeset f685593ac3cc (bug 1265708) for android bustage 2016-06-04 09:26:43 +02:00
Carsten "Tomcat" Book
b6ffedfa85 Backed out changeset 974090a524da (bug 1265708) 2016-06-04 09:24:16 +02:00
Carsten "Tomcat" Book
bfbbefdf47 Backed out changeset 047961bdb4ad (bug 1265708) 2016-06-04 09:24:15 +02:00
Carsten "Tomcat" Book
a9940b780e Backed out changeset e994f70de049 (bug 1265708) 2016-06-04 09:24:14 +02:00
Carsten "Tomcat" Book
3038127996 Backed out changeset 10fa130289d7 (bug 1265708) 2016-06-04 09:24:13 +02:00
Carsten "Tomcat" Book
442dd628d7 Backed out changeset 67c37ed1a25f (bug 1265708) 2016-06-04 09:24:11 +02:00
Andrzej Hunt
f56d78e496 Bug 1265708 - Post: query topsites metadata by URL without ref too r=sebastian
MozReview-Commit-ID: KzbKJjRm4Za

--HG--
extra : rebase_source : 5f85dece79b9779a729882ce1841fd893f9e9056
2016-06-03 14:05:42 -07:00
Andrzej Hunt
d6431459a5 Bug 1265708 - Set URL metadata based on URL without ref r=sebastian
MozReview-Commit-ID: DNiKYFJiXjY

--HG--
extra : rebase_source : 0f577e201bb404011a8d23abf80e8b5d357fbdd1
2016-06-02 14:41:47 -07:00
Andrzej Hunt
1fd425a95e Bug 1265708 - Strip ref from URL when adding homescreen icons r=sebastian
We add URL metadata based on the base URL, we should retrieve it this way too.

MozReview-Commit-ID: ICP54V5vRgv

--HG--
extra : rebase_source : ba9444683883f47fe7fa7b5fb7bbca1201ac2f5d
2016-06-03 14:05:29 -07:00
Andrzej Hunt
0717f299cf Bug 1265708 - Pre: make getForURLs arguments more generic r=sebastian
MozReview-Commit-ID: IkPiLVB5mop

--HG--
extra : rebase_source : f486b1635994cf80f02214931e3dfe24acec1a28
2016-06-02 14:25:05 -07:00
Andrzej Hunt
a4a2b068c3 Bug 1265708 - Pre: Implement StringUtils.stripRef r=sebastian
MozReview-Commit-ID: AO25iiUMXLE

--HG--
extra : rebase_source : dcf2be733663ad242c28e1fab9a5cb814887bbd4
2016-06-03 14:04:39 -07:00
Andrzej Hunt
342b90bc16 Bug 1265708 - Pre: remove unused variable r=sebastian
We already pass the URL inside the JSON object.

MozReview-Commit-ID: J4RjxLAzdI

--HG--
extra : rebase_source : 9a4c365fbd2ce4321c84a994db680f8906c13bea
2016-06-02 13:51:52 -07:00
Krishna
3890e06afe Bug 1276577 - Using Switchboard.isInExperiment() r=sebastian
MozReview-Commit-ID: F4X1KbLXfqM

--HG--
extra : amend_source : c68226d47b43485891894e56e04e7ceb6a3c56bb
2016-05-31 01:16:14 +08:00
Michael Comella
b42a94e7c4 Bug 1275669 - Do not enable adjust if we are in automation. r=grisha
MozReview-Commit-ID: 9i10xv6nZem

--HG--
extra : rebase_source : 1b7546228f8fa4f411d7b977e6d3e97f9a06cec8
2016-06-02 13:21:40 -07:00
Jonathan Almeida (:jonalmeida)
9603ccd028 Bug 1274901 - NullPointerException thrown in Tabs.java should be checked r=mcomella
MozReview-Commit-ID: 2hMZn75BpeT

--HG--
extra : rebase_source : 342d6184c8433a7f1d7a27b3ea3762d15ea56124
2016-05-24 15:08:52 -07:00
Andrzej Hunt
175bca873e Bug 1277854 - Post: add comment explaining local loading r=sebastian
MozReview-Commit-ID: J8eJrzkExeX

--HG--
extra : rebase_source : a9ccb5ca9778eb24bdf7bb22a7966284d7cebe2e
2016-06-03 10:51:18 -07:00
Andrzej Hunt
9de231d999 Bug 1277854 - Back out bug 1276050 to ensure we load only local favicons when requested r=sebastian
(Backed out changeset 9575e608cabe)

loadUncachedFavicon allows loading favicons from the internet, whereas
getSizedFaviconForPageFromLocal restricts itself to the favicon cache.
(LoadFaviconTask's last parameter is (boolean) onlyFromLocal, which is
set to true in getSizedFaviconForPageFromLocal.

We could probably replace this with an Enum to make the parameter's purpose
more obvious.

MozReview-Commit-ID: C9uwcG0h0N

--HG--
extra : rebase_source : 291dd46988bcbe2dd307bdc3f030daca6bd154bf
2016-06-03 10:40:49 -07:00
Ray Lin
92dbfbcf0f Bug 1276686 - Prevent selection when tapping on reader mode toolbar. r=margaret
MozReview-Commit-ID: 9A4aZBUTKf6

--HG--
extra : rebase_source : 7bd6aabb46164e0760dba17d4dec06907ff0727f
2016-06-03 22:38:39 +08:00
Andrzej Hunt
225a2d3f5b Bug 1264223 - Reduce firstrun image size on smaller devices r=liuche
Previously the "next" link was hidden on devices such as the Nexus S.
Reducing the size of the top image seems to be the most efficient way
of ensuring that all content fits on screen.

MozReview-Commit-ID: JFCYbXTEKp1

--HG--
extra : rebase_source : 22e0ed9a3a3038a5f8c397a3b575f6aa9449dfdb
extra : histedit_source : 8e66bebb93235670ca0c4262c68d43a19333806d
2016-06-01 16:36:37 -07:00
Andrzej Hunt
a2920faf94 Bug 1264223 - Pre: move values-large-v11 into values-large r=liuche
MozReview-Commit-ID: 4U2N3D4qNpr

--HG--
rename : mobile/android/base/resources/values-large-v11/dimens.xml => mobile/android/base/resources/values-large/dimens.xml
rename : mobile/android/base/resources/values-large-v11/integers.xml => mobile/android/base/resources/values-large/integers.xml
rename : mobile/android/base/resources/values-large-v11/styles.xml => mobile/android/base/resources/values-large/styles.xml
extra : rebase_source : d3020e0d8d441163bf3f85ae24a37f144e12c7c3
extra : histedit_source : a3d8f562797183a6d59f420a54f48c72d1892815
2016-06-01 15:12:01 -07:00
Andrzej Hunt
9a5f53bff3 Bug 1276977 - remove unused variable and call r=liuche
Apparently this code can crash despite the nullcheck, let's completely
remove it since we don't use the results.

MozReview-Commit-ID: CzHn8kABLYd

--HG--
extra : amend_source : d254ee112a10a115d6a9c44f95a6713931cd4509
2016-06-02 14:54:32 -07:00
Andrzej Hunt
19e3a5c7e9 Bug 1245692 - Force height for CalendarView on pre-lollipop r=sebastian
By default CalendarView doesn't receive sufficient height on pre-lollipop
devices, in fact the entire dialog won't even appear unless we manually
assign height. This is slightly hacky, but necessary to ensure correct
layouting. (We previously assigned both height and width to the CalendarView,
however that results in all kinds of odd behaviour - this change is necessary
only to have acceptable behaviour on older devices.)

MozReview-Commit-ID: H7wzHsrOJy4

--HG--
extra : rebase_source : 9d3a6c3aab6958b45459a36045ccb8f7f7b165e1
extra : amend_source : 3a7e289e5e237f2cad725b73bd2e5399f5052c70
extra : histedit_source : 03c1b50843e1724058061faad267ce41880123a1
2016-06-03 08:48:05 -07:00
Andrzej Hunt
9877848eea Bug 1245692 - Make CalendarView use full width of dialog r=sebastian
Squashing CalendarView makes it look bad and hard to use - by allowing
it to expand to the dialog width we get a usable CalendarView.

Note that this breaks on Android 4.x. On these devices CalendarView is
implemented using a ListView, which for some reason isn't given
any space during layouting - this results in the actual days in the month
being hidden (we do however see the weekday titles / month title).

MozReview-Commit-ID: wHNx1xG3JK

--HG--
extra : rebase_source : 6eb01c3cd4d9a38d7df516875201ab1eea265828
extra : histedit_source : c99960cd21663875f826894433ba57d99cf0facd
2016-05-27 10:29:04 -07:00
Andrzej Hunt
cf75cebe3a Bug 1245692 - Always use CalendarView for date selection r=sebastian
Our current decision criteria is arbitrary: there's no good reason not
to use a CalendarView here. Moreover our previous criteria would result
in small tablets showing different views depending on orientation (Nexus 7:
CalendarView in landscape, pickers in portrait mode).

MozReview-Commit-ID: 8H0HTmCnzfP

--HG--
extra : histedit_source : 70cac01314055881370cf342614c18c2eafceba3
2016-06-03 09:03:49 -07:00
Kit Cambridge
02d8a1e5d9 Bug 1265593 - Forward app server keys to Autopush on Android. r=nalexander
MozReview-Commit-ID: 3J4mM1k0pcY

--HG--
extra : rebase_source : c5a33f2f7043321307da17a6915dedfac66f1fc9
extra : histedit_source : 0357740fc62df416635c90a1ad075f6ee5e492e8
2016-03-22 12:09:31 -07:00
Alastor Wu
b76ee4b13b Bug 1257738 - part2 : modify logic of requesting audio focus in Android.
MozReview-Commit-ID: AG095CIgnA5
2016-06-01 10:21:58 +08:00
Alastor Wu
fa47d77e11 Bug 1257738 - part1 : implement the audio competing mechanism.
MozReview-Commit-ID: GZw7P0kbhOa
2016-06-01 10:21:13 +08:00
Wes Kocher
6e70ed1223 Merge m-c to inbound, a=merge 2016-05-31 17:18:54 -07:00
Wes Kocher
738f9c933b Backed out changeset d51737cf083d for android reftest failures 2016-05-31 16:05:58 -07:00
Michael Comella
94f6e41492 Bug 1243305 - Only share images whose src length is not too long. r=margaret
If the src is too long, we crash!

To test this, you can use my test page:
  https://people.mozilla.org/~mcomella/test/base64.html

An alternative approach would be to prevent users from sharing base64
images altogether because the experience is slightly jarring (since the
base64 string is copied to the application rather than the image).

MozReview-Commit-ID: AQeQ0Ff6ZMB

--HG--
extra : rebase_source : f265c9c474adaeaef9dd50bde5b9f80c6d5b0f53
2016-05-20 14:10:05 -07:00
Michael Kaply
b2516f1220 Bug 1272439 - Make distribution.searchplugins.defaultLocale work on Fennec. r=margaret 2016-05-31 13:04:35 -05:00
Michael Comella
8b44ee5388 Bug 1275880 - Correct action mode styling. r=liuche
MozReview-Commit-ID: H7up9G5vlcg

--HG--
extra : rebase_source : 6c881551c530b0ce90801bf272b8a3ab0f8b35f2
2016-05-27 12:49:55 -07:00
Michael Comella
c903ed153c Bug 1275880 - Give preferences action bar the correct config & delete unused. r=liuche
MozReview-Commit-ID: DavXaecwtux

--HG--
extra : rebase_source : 557a628bdf8fe3d67de7f703d406fd43d2d41c18
2016-05-26 10:28:33 -07:00
Michael Comella
898b428762 Bug 1275880 - Consolidate gecko preferences theme to one api level. r=liuche
MozReview-Commit-ID: BscET9LeUYM

--HG--
extra : rebase_source : 676b86bd3679c41e9cb464dd2964e2dfb8f73b72
2016-05-26 09:42:35 -07:00
Carsten "Tomcat" Book
6f2926b4e4 Backed out changeset ca182106b9e6 (bug 1264815) for bustage 2016-05-31 07:05:17 +02:00
Carsten "Tomcat" Book
a52403d289 Backed out changeset 20d0b05e708b (bug 1264815) 2016-05-31 07:05:01 +02:00
Carsten "Tomcat" Book
62db018fa7 Backed out changeset d049a47c24c1 (bug 1264815) 2016-05-31 07:05:00 +02:00
danhuang1202
a4be4050b9 Bug 1272677 - Hide content width setting and line-height setting buttons in android's reader mode control panel. r=Margaret
MozReview-Commit-ID: 4AnnPTcvqzg

--HG--
extra : transplant_source : %EFf%CC%F2%99%C4%DF%26Q%BBj%CE%8A%B7py%BA%18%C3%A8
2016-05-27 17:39:48 +08:00
SUN Haitao
f2ea042b72 Bug 1264815 - Add a component to handle 'persisent-notification-click'. r=kcambridge 2016-05-12 09:28:46 +08:00
SUN Haitao
bcc1e5ad16 Bug 1264815 - Add a 'showPersistentAlertNotification' method to GeckoAppShell. r=wchen 2016-04-17 21:18:20 +08:00
SUN Haitao
f18489fcdb Bug 1264815 - Add a 'data' parameter to GeckoThread.createServices; r=jchen 2016-04-16 14:19:37 +08:00
Felipe Gomes
d2bf40b405 Bug 1273685. Further reduce the message size by limiting the size of the URI to be sent. r=Gijs
MozReview-Commit-ID: EMXYaUwnGR2
2016-05-30 19:03:16 -03:00
Jan Henning
4834308be5 Bug 810981 - Part 4 - Test session store scroll position and zoom level handling. r=margaret
MozReview-Commit-ID: 4jZ0ixoJmOO

--HG--
extra : rebase_source : eb39f09fd93d8a50d4e36c1f92667b025cf5e32d
2016-05-06 18:44:42 +02:00
Jan Henning
8268d23f01 Bug 810981 - Part 3 - Recalculate zoom level before restoring to a different screen orientation. r=kats
On pages that aren't "width=device-width" or similar, Gecko adjusts the resolution when the display dimensions change, e.g. because the device has been rotated. The session store needs to do something similar when restoring a page if the device orientation has changed since the moment the tab state was captured.

Therefore, we now include the width of the browser window in the saved zoom data and use it to scale the zoom level as necessary when restoring a tab.

MozReview-Commit-ID: LBbEquO1bZ9

--HG--
extra : rebase_source : 38465ee3f16dded1d1e953fd3cdbf31b821d4777
2016-05-18 22:53:34 +02:00
Jan Henning
c2dbf437b9 Bug 810981 - Part 2 - Save the current zoom level when scrolling. r=kats r=margaret
Since we're now recording the scroll position in the session data, it makes sense to store the zoom level as well.

To do this, we make use of the new facility introduced in bug 1270019, which allows us to provide a desired initial resolution to the MobileViewportManager. For this to work, we need to send our desired zoom level before the MVM calculates the initial page resolution, i.e. before first paint/page load. Therefore, we now have browser.js notify us of location change events, so we can set the zoom level to restore early enough.

This also means that we can no longer restore the scroll position on load, because the MobileViewportManager applies the resolution we provide it via utils.setRestoreResolution() only after the first paint or page load ( whichever happens earlier). In the latter case, our JS load event handler will run shortly before the MVM has applied the desired zoom level in its own event handling code, which means that any scroll attempt which depends on the page already being zoomed in will fail to apply.
Therefore, the scroll position restoring needs to be moved to a later point in time, i.e. in this case the "pageshow" event.

MozReview-Commit-ID: 6NtYqc8pm3N

--HG--
extra : rebase_source : a6737e5c047ab2327e3a0e52c2a1176e9248a361
2016-05-26 23:31:15 +02:00
Jan Henning
ac14326b20 Bug 810981 - Part 1 - Record current scroll position in mobile session store. r=margaret
This copies the approach we've taken for form data saving and applies it to recording the current scroll position of the page, too.

This means that after receiving a scroll event, we capture the scroll position for the top level document and all direct child frames and include it in the session store data. Because compared to the form data input events the scroll event can fire at a relatively high rate, we throttle the scroll position capturing using timeouts to run at most twice per second.

MozReview-Commit-ID: C0lBxzHav7Z

--HG--
extra : rebase_source : 325c0f92ce003ea9026e3206b4bb101db1f037a7
2016-05-18 22:24:16 +02:00
Carsten "Tomcat" Book
743296ac11 Merge mozilla-central to fx-team 2016-05-30 15:31:42 +02:00
Jan Henning
7f05689996 Bug 905223 - Part 2 - Move session data parsing into a background thread. r=jchen
Parsing the session store JSON data to restore the last session's tabs is both
- computationally relatively expensive
- involving disk I/O

therefore, we shouldn't be doing it on the main thread.

To make sure the session data is actually ready, subsequent code running from a different thread that needs to access it (loading the startup tab, the Recent Tabs panel reading the "Tabs from last time") checks that session store data processing has actually finished and waits if necessary.

MozReview-Commit-ID: EYf1fdglIrA

--HG--
extra : transplant_source : %0D%60F%B0%16%DF%7E%03%CEL%F9%15G%E0%8E%8Fl%21%EEZ
2016-04-23 22:36:46 +02:00
Jan Henning
08568edccd Bug 905223 - Part 1 - Factor out external URL calculation. r=margaret
For session data parsing, we need to know whether we were invoked with an external URL or not. Since we want to move session data parsing forward to an earlier point in time, but also continue needing that external URL info during initialize() as well, we'll factor out those calculations into their own functions which can then be called from both places.

MozReview-Commit-ID: HFlT8uxC9yz

--HG--
extra : transplant_source : %A4%AE/%F5%00P%89%95N%033%F3%C6%0E%98%A4%8A%9F%B6%2A
2016-04-23 20:08:58 +02:00
Jan Henning
8968ec7154 Bug 905223 - Part 0 - Add target API annotations to get rid of errors in Android Studio. r=margaret
Android Studio doesn't recognise our version guards and is consequentially always showing two errors in GeckoApp, which makes it more difficult to spot when you've introduced an actual error.

MozReview-Commit-ID: LpNIwHOhEWE

--HG--
extra : transplant_source : %22%86%80q%1E%CE%FE%B1%16%BF%40%DF%C0%0F%5D%CB%E0%F8%A0%8A
2016-04-23 22:29:03 +02:00
Sebastian Kaspari
a6e3c6698c Bug 1247047 - Update releng manifests to use new SDK. r=ahunt
MozReview-Commit-ID: D3cbfRAhe5l

--HG--
extra : rebase_source : 25797dbb7d76369c5b0ad4ae322835bad185fd65
2016-05-23 20:55:41 +02:00
Sebastian Kaspari
65248e9ba7 Bug 1247047 - Remove play-services-{analytics,appindexing}, no longer required by play-services-ads 8.4.0. r=ahunt
MozReview-Commit-ID: KowZ2gjzs8a

--HG--
extra : rebase_source : f639ad1107a7723cf3d7a4dcbeb7b3b64fda9504
2016-05-23 17:56:05 +02:00
Sebastian Kaspari
586f1b35ad Bug 1247047 - Add play-services-measurement, required by play-services-gcm 8.4.0. r=ahunt
MozReview-Commit-ID: 4T65x2u3LmZ

--HG--
extra : rebase_source : f0f78a031da64a8ec638e08c8f50f611930190e9
2016-05-23 17:51:27 +02:00
Jim Chen
fcea6181e7 Bug 1272557 - Delay initializing PushService and DLC; r=snorp
Delay initialization of PushService and DLC in GeckoApplication to after
the Gecko:Ready message. That way, hopefully they give up some CPU time
to other initialization tasks.
2016-05-27 14:29:46 -04:00
Jim Chen
2772cc3e2b Bug 1275371 - Add test for shift+backspace; r=esawin 2016-05-27 14:29:15 -04:00
Ryan VanderMeulen
dd7d068db8 Backed out changeset 7323e625d203 (bug 1238128) for various test failures on a CLOSED TREE. 2016-05-26 21:38:35 -04:00
Boris Zbarsky
98aa24ddc7 Bug 1275704 part 3. Remove the nsXPConnect::ReportAllJSExceptions mechanism, since it's dead code now. r=bholley 2016-05-26 19:39:03 -04:00
Thom Chiovoloni
2ac6c74c3a Bug 1238128 - Ensure that the details passed to WebChannelMessageToChrome is a string, with a whitelist for messages from existing users r=Margaret,markh,MattN
MozReview-Commit-ID: DpdJ5bUcBdQ

--HG--
extra : rebase_source : 69753093e4e7506572329a50ee1be73d2ba4285d
2016-05-06 12:23:42 -04:00
Chris Manchester
44e4ff1fb6 Bug 1275721 - Remove --enable-android-resource-constrained. r=mshal
MozReview-Commit-ID: DqL0KCkbj9r

--HG--
extra : rebase_source : 18ed93ef68ecdfbd85fb4c13c39283932c38290c
2016-05-26 11:13:58 -07:00
Michael Comella
10648eb845 Bug 1271000 - Add explanation of potential test failures in TestClientsEngineStage. r=sebastian
MozReview-Commit-ID: 98KOJvB3IXC

--HG--
extra : rebase_source : abecf108e663c0cce5aa443509e99ad04fd93b3f
2016-05-25 11:03:55 -07:00
Sebastian Hengst
5a4685ed2f Backed out changeset a38fb5ad3684 (bug 1247047) 2016-05-25 18:31:55 +02:00
Sebastian Hengst
b83d99d00b Backed out changeset fac238070399 (bug 1247047) 2016-05-25 18:31:48 +02:00
Sebastian Hengst
66a50c6061 Backed out changeset bbd294728ecc (bug 1247047) 2016-05-25 18:31:40 +02:00
Sebastian Kaspari
8cb678bf6b Bug 1247047 - Update releng manifests to use new SDK. r=ahunt
MozReview-Commit-ID: D3cbfRAhe5l

--HG--
extra : rebase_source : a8bbe3b8bbc38279bc9e65f1345bb4bbf3539bc5
2016-05-23 20:55:41 +02:00
Sebastian Kaspari
abdc8c2da2 Bug 1247047 - Remove play-services-{analytics,appindexing}, no longer required by play-services-ads 8.4.0. r=ahunt
MozReview-Commit-ID: KowZ2gjzs8a

--HG--
extra : rebase_source : 40a9a4309891063b3ca9b4b2e89133d051d6563e
2016-05-23 17:56:05 +02:00
Sebastian Kaspari
164ed8d6be Bug 1247047 - Add play-services-measurement, required by play-services-gcm 8.4.0. r=ahunt
MozReview-Commit-ID: 4T65x2u3LmZ

--HG--
extra : rebase_source : 76665608e6d884538977e4ca1261e36a9fc5540e
2016-05-23 17:51:27 +02:00
Carsten "Tomcat" Book
de96ed94a7 Merge mozilla-central to fx-team 2016-05-25 15:21:01 +02:00
Carsten "Tomcat" Book
c715836c7f merge mozilla-inbound to mozilla-central a=merge 2016-05-25 15:04:00 +02:00
Jan Henning
88f8f117d7 Bug 1274390 - Include isPrivate and desktopMode in the session store data used for initialising new tabs. r=sebastian
Restoring a tab from the Recent Tabs panel, which goes via the session store's _restoreTabs() function and ultimately via BrowserApp.addTab() and a Tab:Added message back to the Java UI requires the value for isPrivate to be present in the session store data for the respective tab - if it isn't, we end up sending isPrivate as "undefined", which breaks the process of adding the new tab in our UI.

When the session store collects the full tab data for a browser, it always includes the values for isPrivate and desktopMode, therefore we now include those values in the basic session store data we use in initialising a new tab object, too.

MozReview-Commit-ID: 5BZ9PL7xDWA

--HG--
extra : transplant_source : %01%8B%E7%1Asg%FF%D8%DC%07%21Ly%F4%9A9Q%B9%00O
2016-05-21 19:41:07 +02:00
Bhavin Dave
1dd6ff80f3 Bug 893836 - Update Android menu contents to sentence case. r=margaret 2016-05-23 09:20:00 -04:00
Andrzej Hunt
82b51acd43 Bug 1246159 - Add histogram probe for disk space used by reader view cache r=mcomella
MozReview-Commit-ID: 4r1yvWZ4lid

--HG--
extra : rebase_source : 7e7e66460409e51884e409713db2b7b30d88d48f
2016-05-12 13:37:58 -07:00
Andrzej Hunt
177caafc15 Bug 1246159 - Pre: implement SavedReaderViewHelper.getBytesUsed r=mcomella
MozReview-Commit-ID: EJ81q6f515q

--HG--
extra : rebase_source : 98902d97e0495d132be3eaffb6ba36a2a7a8a10b
2016-05-24 15:01:17 -07:00
Andrzej Hunt
2b97ce68b0 Bug 1246159 - Pre: import cleanup r=me
MozReview-Commit-ID: 9PxTKEV2pH5

--HG--
extra : rebase_source : 3f54b9697a8b69c8dcf42a93e93e89d2009dbb9c
2016-05-23 08:11:42 -07:00
Sebastian Kaspari
aaab192fc8 Bug 1274955 - Extract Android dependency versions. r=glandium
MozReview-Commit-ID: FXwWjWIXke4

--HG--
extra : rebase_source : 8532dd6049bc411990547888600d1a394d8fbc14
2016-05-23 13:20:43 +02:00
Andrzej Hunt
c1794a0e7c Bug 1267467 - Strip about:reader when storing URIs in history r=margaret
MozReview-Commit-ID: JbUBMVNFdU9

--HG--
extra : amend_source : 5f2a41567dd1155188e09f691ae6099892ea3a09
2016-05-10 15:33:33 -07:00
Ray Lin
e084e2d68f Bug 1091241 - Make add-on details look like a page. r=Margaret
MozReview-Commit-ID: CrTHzKYrxU6

--HG--
extra : rebase_source : 074cf6cc004811f389c02efcb314e9972e0791d4
2016-05-12 14:43:50 +08:00
James Willcox
f583ffbc0e Bug 1270522 - Guard against a null view in GeckoLayerClient.sendResizeEventIfNecessary(). r=rbarker
--HG--
extra : rebase_source : 4bd7b70151e4593391b91e41eeb5c9f8532feef1
2016-05-23 06:41:00 -04:00
Mike Hommey
b47ba46ecf Bug 1274497 - Avoid running adb every time we run make on Android builds. r=gps
As seen in bug 1274273, the build system is running adb uselessly.
Moreover, on automation, adb doesn't even run, because it requires a
more recent glibc than available, adding confusing error messages to the
logs.
2016-05-25 08:43:49 +09:00
Andrzej Hunt
21ccc189ed Bug 1267467 - Don't filter out reader view pages when storing history r=jchen
MozReview-Commit-ID: VnQuAMAkBL

--HG--
extra : amend_source : 02ed08bd5febc68ea63ff067009d3f1782686088
2016-05-06 13:46:24 -07:00
Andrzej Hunt
da861c32d2 Bug 1270880 - Make first reader-view prompt independent of first reader-view-bookmark prompt r=sebastian
MozReview-Commit-ID: 34MmPdoZCzL

--HG--
extra : rebase_source : 8bc9e24c1bd3e3198beaccdd65f87acd6973ea9e
extra : amend_source : d5a16a28549e65ea1336bbf8b1ec48ad5a27cc88
extra : histedit_source : 3d2d17a2406a8d23c53a956884c03ad626db7953
2016-05-10 10:50:06 -07:00
Andrzej Hunt
52a27309a0 Bug 1270880 - Show bookmarking helper UI first time reader view is used r=sebastian
Note: this is currently an experiment, which was previousl de-facto disabled.

MozReview-Commit-ID: 3BfyMD6E3b3

--HG--
extra : rebase_source : 60513a9e78ab88c51f5c28f6ac8d26d0c52b72b7
extra : histedit_source : ff3c66aa8740df5c0fc873f60adb16819265a431
2016-05-10 10:36:47 -07:00
Andrzej Hunt
b002b31088 Bug 1270880 - Check switchboard when showing experiment, not in onCreate r=sebastian
Switchboard might not have any data during onCreate, instead we should query
switchboard when actually deciding whether to show the prompt.

MozReview-Commit-ID: DdulFoWHiF9

--HG--
extra : rebase_source : 0f47a6ae7bccbe0b6ccd88396aa6467df9945ba6
extra : histedit_source : 092b80cf6b096b5b175c24f5d35377aecceaf168
2016-05-10 10:58:22 -07:00
Andrzej Hunt
4ac8128302 Bug 1270880 - Pre: import cleanup r=me
MozReview-Commit-ID: 5dcnr3WZ3Me

--HG--
extra : rebase_source : a0ffda2f98ff50227b8edfcc5b0df30acaccea8d
2016-05-10 10:37:02 -07:00
Michael Comella
fc9ec09c75 Bug 1269924 - Move telemetry upload to NetworkUtils.isConnected. r=grisha
The concept of "background data" (as it exists in the Android options menu)
doesn't exist in the Android APIs - I think it should be covered under
isConnected. Thus, I removed our `isBackgroundDataEnabled` method.

One other network consideration, however: we may want to consider stopping
uploads on roaming.

In the previous implementation, we did not queue the ping for upload if
the network was not connected (in order to conserve disk space). However,
this doesn't allow us to see all of the days the user interacted with
the device (e.g. for engagement) so in this implementation, we always
queue the ping and stop in the UploadService if we're not connected.

MozReview-Commit-ID: 1mjnHq3l7Jj

--HG--
extra : rebase_source : 4640aad21783f8e8edc568ea341a6e910a066d01
2016-05-19 11:54:54 -07:00
Michael Comella
ee1be4d654 Bug 1268606 - Correct action bar style for url bar. r=liuche
MozReview-Commit-ID: 7mCwUzR7rqE

--HG--
extra : rebase_source : 59a68f638154b2f9b722a79a6238a47a74262657
2016-05-23 19:15:46 -07:00
Carsten "Tomcat" Book
3cab03a461 Merge mozilla-central to fx-team 2016-05-24 15:15:55 +02:00
Carsten "Tomcat" Book
cb4337c62c merge mozilla-inbound to mozilla-central a=merge
--HG--
rename : dom/presentation/tests/mochitest/file_presentation_non_receiver_oop.html => dom/presentation/tests/mochitest/file_presentation_non_receiver.html
rename : dom/presentation/tests/mochitest/file_presentation_non_receiver_inner_iframe_oop.html => dom/presentation/tests/mochitest/file_presentation_non_receiver_inner_iframe.html
rename : dom/presentation/tests/mochitest/file_presentation_receiver_inner_iframe_oop.html => dom/presentation/tests/mochitest/file_presentation_receiver_inner_iframe.html
2016-05-24 14:52:23 +02:00
Michael Comella
252b6ec614 Bug 1274727 - Use toString method for search engine identifiers. r=bnicholson
These values are what are actually used UI telemetry (perhaps because the enums were added after the strings?). They're also a little less obnoxious than the enum names.

MozReview-Commit-ID: K5i2Hr4DR4J

--HG--
extra : rebase_source : 5750fe71960616ad8014b473c6a5d99c2d3b2dc3
2016-05-23 15:26:26 -07:00
Michael Comella
f42408cb87 Bug 1274433 - Construct TelemetryDispatcher on background thread. r=ahunt
MozReview-Commit-ID: 6H5Wp4uzNQb

--HG--
extra : rebase_source : 108d30fed9802bf7e2bfb3d35aca1126c808e1b6
2016-05-20 18:00:22 -07:00
Jim Chen
7ff874f7ba Bug 1270870 - Check profile when delivering pending push message; r=nalexander
For pending push messages, we used to check for correct profile when the
message is received, but it's better to check for correct profile when
the message is delivered to Gecko.

This fixes a crash in headless mode that the previous patches
introduced.
2016-05-24 01:11:16 -04:00
Jim Chen
236d468faf Bug 1270870 - Fix testGeckoProfile; r=snorp
Fix testGeckoProfile to compile and pass following the guest profile
changes.
2016-05-24 01:11:16 -04:00
Jim Chen
635b1b611a Bug 1270870 - Use shared prefs to keep guest mode setting; r=snorp
This patch restores the previous behavior of restoring to guest mode if
Fennec is killed during a guest session. Instead of using a separate
lock file or an Intent argument, this patch uses shared prefs to keep
the guest mode setting.

The patch also introduces the behavior that, for headless mode, the
profile must agree with the guest mode setting. For example, in guest
mode, push messages under a regular profile will not be processed; this
is necessary to avoid profile mismatches.
2016-05-24 01:11:16 -04:00
Jim Chen
b2f8c1d77f Bug 1270870 - Simplify guest profile management; r=snorp
Treat the guest profile as a custom profile with a special profile
directory. This lets us get rid of a lot of the guest profile handling
code. This patch does not attempt to restore to guest mode if Fennec is
killed during a guest session. A later patch will fix that behavior.

Patch renames GeckoProfile.getFromArgs to GeckoProfile.initFromArgs,
because the method now has possible side-effects (i.e. deleting stale
guest profiles). The new name also differentiates the method from the
GeckoProfile.get family of methods. initFromArgs now always returns a
profile (using the default profile if necessary), to make it easier for
its callers.
2016-05-24 01:11:16 -04:00
Jim Chen
953c2c7b71 Bug 1270870 - Create specified profile directory if necessary; r=snorp
When getting a profile with a specific profile directory, we used to
require the directory to already exist. This patch makes sure the
directory is created if necessary. It lets us treat the guest profile as
an ordinary custom profile at a specific location.
2016-05-24 01:11:16 -04:00
Jim Chen
9159053a5b Bug 1270870 - Don't get profile in GeckoApp when launching; r=snorp
Let GeckoThread manage the active profile, and don't get the profile in
GeckoApp. This also avoids possible main-thread IO.
2016-05-24 01:11:16 -04:00
Cesar Valiente
2c5e3332f6 Bug 1272506 - Change GeckoApp.ONE_DAY_MS to be initialized with the TimeUnit class. r=mcomella 2016-05-14 11:42:04 +02:00
guillaume
cd71b8ee5b Bug 1264599 - "GeckoPreferences: Remove CheckBoxPrefSetter and TwoStatePrefSetter". r=sebastian 2016-05-23 03:41:00 +02:00
Victor Ng
649e0d92c0 Bug 1272057 - "API17 guard is required to use Location::getElapsedRealtimeNanos()". sr=hschlichting
--HG--
extra : rebase_source : 94560988dd664c9ae2d680c6f5963e951967fdd5
2016-05-19 13:27:00 +02:00
Nick Alexander
3eed392f10 Bug 1274956 - Pre: Make it easier to test Adjust locally. r=mcomella
This does a few things.  First, it makes non-official builds use the
Adjust sandbox.  Second, I observe that the fake sandbox key no longer
sends anything, so it's no longer valuable; this patch instead
requires an Adjust token if install tracking is enabled, since we
can't provide a default any more.  Third, it removes a spurious
default in configure.in; without this default, builders can easily
enable Adjust locally using the following in their mozconfig:

ac_add_options --with-adjust-sdk-keyfile=/path/to/adjust-sdk.keyfile
export MOZ_INSTALL_TRACKING=1

With the default, the "export" had no impact, because it was
overwritten immediately.

MozReview-Commit-ID: Cn62fmrgwJL

--HG--
extra : rebase_source : 3b817c815043e0339e65125f6d6963ddd3f4570e
2016-05-23 13:42:09 +02:00
Sebastian Kaspari
68ecc4e66c Bug 1271352 - Update static catalog to match online version. r=margaret
MozReview-Commit-ID: 9ZKk95zHmrd

--HG--
extra : rebase_source : c9d3eedaccfcbe49118a102af9acea4072d59c01
extra : histedit_source : eb8f7a3a9b0ccf4fdaf0d627975d9810c67ff87e
2016-05-16 10:15:18 -07:00
Sebastian Kaspari
7d64948770 Bug 1271352 - DLC Sync: Update kinto endpoint and CDN base domain. r=margaret
MozReview-Commit-ID: 8TbsANSzpZZ

--HG--
extra : rebase_source : b28399a5da495258a8abc67c01dc90e9803a6a01
extra : histedit_source : a1e41e7779f9701f11dc31b37296a4929632d9be
2016-05-16 09:59:14 -07:00
Sebastian Kaspari
e670771049 Bug 1272340 - ToolbarDisplayLayout: Handle about:reader URLs. r=margaret
This patch changes two things:
* Check if the URL is http/https after stripping the about:reader URL.
* Always call updateAndColorTitleFromFullURL() as fallback for URL formatting (like in previous versions)

MozReview-Commit-ID: 1Zgf12FsOQe

--HG--
extra : rebase_source : d23c2d2d2392be9ae6e9fdaf8d560d5af07f387d
2016-05-13 10:57:57 +02:00
billel
02e5be4023 Bug 1271577 - FloatingToolbarTextSelection: Remove Log.w() call. r=sebastian
MozReview-Commit-ID: CQPeFsjJmfk

--HG--
extra : amend_source : 899352c7894660d068f746b3d64affd5167d14a1
2016-05-23 09:56:04 +02:00
Grigory Kruglov
d5ec6fbd7b Bug 1258428: If activity is active, always listen for network status updates r=sebastian
MozReview-Commit-ID: HwTmnOReUBb

--HG--
extra : rebase_source : d12318a244bada2ce5c648662305437ba96e8f34
2016-05-06 17:31:52 -07:00
Andrzej Hunt
8a222627a2 Bug 1267580 - Hide Reading List smartfolder if empty r=mcomella
MozReview-Commit-ID: HIGkK9Z19aq

--HG--
extra : amend_source : ad64e390ccacfd5f4f725d587dc396d511804ae7
2016-05-18 08:59:56 -07:00
Andrzej Hunt
5d2d2e7bf7 Bug 1272659 - Revert additional padding for the share icon r=mcomella
We were experimenting with this on phones, however we decided this
was unnecessary.

MozReview-Commit-ID: LSJILxFO3a

--HG--
rename : mobile/android/base/resources/drawable-hdpi/ic_menu_share_icon.png => mobile/android/base/resources/drawable-hdpi/ic_menu_share.png
rename : mobile/android/base/resources/drawable-xhdpi/ic_menu_share_icon.png => mobile/android/base/resources/drawable-xhdpi/ic_menu_share.png
rename : mobile/android/base/resources/drawable-xxhdpi/ic_menu_share_icon.png => mobile/android/base/resources/drawable-xxhdpi/ic_menu_share.png
extra : rebase_source : a889bf9e1faf5c3c894c28950e8ef7654f38fbb1
extra : amend_source : 130383a287249d0b67701b7d6a1815c7c88fbc5c
2016-05-18 10:13:32 -07:00
Wes Kocher
fa48509cda Merge fx-team to central, a=merge 2016-05-20 14:14:00 -07:00
Ryan VanderMeulen
5337e6e882 Merge m-c to inbound. a=merge
CLOSED TREE
2016-05-19 21:43:31 -04:00
bzrd_Sdn
42695329a2 Bug 1266199 - Rename BrowserApp.searchEngineManager to mSearchEngineManager. r=mcomella 2016-05-19 21:38:38 -04:00
Ryan VanderMeulen
65843654f3 Merge m-c to fx-team. a=merge 2016-05-19 12:50:27 -04:00
Ryan VanderMeulen
4cffb5461e Merge inbound to m-c. a=merge 2016-05-19 12:46:54 -04:00
Michael Comella
f089edd104 Bug 1243595 - Add session measurement hooks for record and retrieval. r=ahunt
MozReview-Commit-ID: AuZ6WEN6aCH

--HG--
extra : rebase_source : bd588a0a0b404aee3e8ef6c0798e42e86ad81917
2016-05-17 15:00:41 -07:00
Michael Comella
36ea09ba64 Bug 1243595 - Add session measurements to core ping builder & update version. r=ahunt
MozReview-Commit-ID: Erwd83PZ57k

--HG--
extra : rebase_source : 7279a86fc027a665f824b647fd8d8540d2b906f6
2016-05-17 17:13:35 -07:00
Michael Comella
cd62b5cf48 Bug 1243595 - Add SessionMeasurements and tests. r=ahunt
MozReview-Commit-ID: NEKDPblKEE

--HG--
extra : rebase_source : d1a75c6ad5c202718a785b4b99dda27d1a08b7b9
2016-05-17 14:56:00 -07:00
Michael Comella
d6c3b6486a Bug 1274051 - Only log telemetry in non-release builds. r=grisha
MozReview-Commit-ID: LXTWSIrSvob

--HG--
extra : rebase_source : 51791b3812d4fc51dbec8cde5ded1b2dc6ab3c12
2016-05-18 14:42:46 -07:00
Michael Comella
f1b4c6dac0 Bug 1274052 - Log search engine identifier as extra. r=grisha
For privacy, custom search engines are "other".

MozReview-Commit-ID: GTM7d9k8JFZ

--HG--
extra : rebase_source : c7a1f8ba5694bb05680ea768110eb346dae91be0
2016-05-18 14:54:51 -07:00
Jan Henning
fda3775237 Bug 1270543 - Part 2: Enable choosing an app by double tapping in the download prompt. r=liuche
This tells the app chooser dialog that appears when downloading a file to use the "Just once" button when two successive taps in a row on the same app have been detected.

MozReview-Commit-ID: Iejs1ROvt6n

--HG--
extra : transplant_source : %D3Y%C4%5D%DB%BC%26%C1Tr%8D%82%1Cmy%A5B%08g%D8
extra : histedit_source : e0e0eb9e7d0a64d86384515c2d93ac527d45e967
2016-05-05 19:01:05 +02:00
Jan Henning
222df1171c Bug 1270543 - Part 1: Enable double tapping to select an action in the prompt dialog. r=liuche
On newer Android versions, double tapping an entry in the app chooser is equivalent to tapping it once and selecting "Just once". To enable this functionality for our own app chooser when downloading a file, this patch enables passing a button index to the prompt dialog which will be chosen by default if a double tap has been detected.

To do this, we track the input value we receive in onChange. If we receive the same value twice in a row and a button has been configured, we close the dialogue and pass the result with that button back to the caller.

MozReview-Commit-ID: EVs2x3OtHmB

--HG--
extra : transplant_source : %85Td%83%0D%DD%D0%1D%F48a%5D%A0%CF%B4%A5%CE%5E%22%7E
extra : histedit_source : 190cf52e481b637172ea3b49ccec606f31dc86cf
2016-05-17 22:52:59 +02:00
Jan Henning
4da5c1c52b Bug 1270543 - Part 0: Fix whitespace. r=liuche
MozReview-Commit-ID: IDsOmws3eWB

--HG--
extra : transplant_source : %2Ah%FBi%3CR%25%E7%B4i%DF%C4%3E%D2%91%94%C7k%FDG
extra : histedit_source : 9e98e1a7a7550aa666e4898dafa2636c2b6cdb67
2016-05-17 21:26:33 +02:00
Michael Comella
584d3e9910 Bug 1261210 - Rename omg.mozglue.ContextUtils -> omg.mozglue.SafeIntentUtils. r=mcomella
MozReview-Commit-ID: 99kZNBPmqes

--HG--
rename : mobile/android/base/java/org/mozilla/gecko/mozglue/ContextUtils.java => mobile/android/base/java/org/mozilla/gecko/mozglue/SafeIntentUtils.java
extra : rebase_source : 215173a778e4ef29a125a4ba30de7c729a193384
2016-05-18 15:48:07 -07:00
Michael Comella
7814e49f2f Bug 1273686 - Don't crash on invalid sequence number argument in core ping. r=ahunt
MozReview-Commit-ID: A2nNBgQz5yr

--HG--
extra : rebase_source : 4b922cc86caddcd5c92310d9220fcf06e7d734f2
2016-05-17 17:10:56 -07:00
Michael Comella
beb524dc18 Bug 1272431 - Do not use API 19+ method for FileLastModifiedComparator. r=ahunt
MozReview-Commit-ID: 7lN0mJgWYg5

--HG--
extra : rebase_source : c80732eb1b5e4fe011f3a286167921e87f03b4b0
2016-05-16 18:48:42 -07:00
Michael Comella
987c62f877 Bug 1272431 - Return pings from getAllPings in guaranteed order. r=ahunt
MozReview-Commit-ID: GDju0fOGATj

--HG--
extra : rebase_source : 24e8549645bf4e5fc5f496b26e2a960981a59bf5
2016-05-16 18:45:32 -07:00
Michael Comella
0ffccb4798 Bug 1272431 - Correct order errors in maybePrunePings tests. r=ahunt
MozReview-Commit-ID: CQKjiD5PomF

--HG--
extra : rebase_source : cc06c7ecbf958f3a82cf982fbcc491772b56f63e
2016-05-16 18:43:59 -07:00
Grigory Kruglov
551df5bc27 Bug 1271318 - Don't keep context in GeckoNetworkManager, and get it from GeckoAppShell r=mcomella
MozReview-Commit-ID: DX4GOca5IoO

--HG--
extra : rebase_source : 23e745bbc5b0a23af0b9ee9d0a12d9f1523b2c10
extra : amend_source : 39f07b2f13a0d8aeb8c35be810d3200974d51c50
2016-05-16 14:41:09 -07:00
Andrzej Hunt
4088c4ece0 Bug 1271428 - Use CardView for main menu r=sebastian
MozReview-Commit-ID: BCZ3tmgqY0z

--HG--
extra : rebase_source : b3dc0aada8b4df5f200ee8ae74d11bc017a7fa52
2016-05-09 15:18:07 -07:00
Andrzej Hunt
1aec36f857 Bug 1271428 - Pre: add cardview support library r=sebastian
MozReview-Commit-ID: 3rOJRnv1ujO

--HG--
extra : rebase_source : ddd199820174110bafdcf625a6bf9a359290e0ea
2016-05-09 14:05:21 -07:00
Ryan VanderMeulen
54c922ca84 Merge inbound to m-c. a=merge
CLOSED TREE
2016-05-18 12:02:42 -04:00