Commit Graph

11619 Commits

Author SHA1 Message Date
Margaret Leibovic
7bc6c6fb9c Bug 1111142 - (Part 1) Turn aboutReader.js into an AboutReader module. r=mfinkle,bnicholson
--HG--
rename : toolkit/components/reader/content/aboutReader.js => toolkit/components/reader/AboutReader.jsm
extra : rebase_source : 3dad2e92d4dcc8c4f8df32d2b2b6321b7f874a7d
2014-12-19 13:51:24 -08:00
Margaret Leibovic
6c0d9cdf77 Bug 1116231 - Move reader.parse-on-load. pref change observer back to Reader.js. r=bnicholson
--HG--
extra : rebase_source : bfd297fd0af91bbfce62c22db0ca7a958ab4430f
2014-12-29 15:12:45 -05:00
Margaret Leibovic
ea0dadcc9d Bug 1107588 - Use an xhr to download reader mode content instead of creating new browser elements. r=mfinkle
--HG--
extra : rebase_source : fe24bfefa2efc5500ca74a9be5f79a958bab32ee
2014-12-30 14:56:09 -05:00
vivek
1a4bb3bd58 Bug 1116027 - Switch to tab not available in Recent Tabs Panel. r=margaret 2014-12-29 12:09:00 +01:00
Richard Newman
47777418c6 Bug 1116872 - Don't crash on startup when CastDevice.getFromBundle returns null. r=mfinkle 2015-01-01 18:56:27 -08:00
Wes Kocher
3ec5d7dd85 Merge fx-team to mozilla-central a=merge 2014-12-31 16:52:30 -08:00
Wes Kocher
e9a45aaea6 Merge m-c to fx-team a=merge 2014-12-31 13:15:50 -08:00
Michael Comella
5d40acc3ad Bug 1105472 - Part 2: Add FadedMultiColorTextView. r=bnicholson 2014-12-31 12:31:17 -08:00
Michael Comella
647ea513b5 Bug 1105472 - Part 1: Make FadedTextView abstract and move current implementation to FadedSingleColorTextView. r=bnicholson 2014-12-31 12:31:17 -08:00
Mark Finkle
bea67c62d6 Bug 1116693 - Use a simpler setter for mTitle in the GeckoMenuItem constructors r=rnewman 2014-12-31 14:49:23 -05:00
Mark Finkle
a1d01313b5 Bug 1116693 - Block dispatching onItemChanged during MenuItem inflation r=rnewman 2014-12-31 14:47:18 -05:00
Mark Finkle
8dc5f3a0bf Bug 1116693 - Support stopping/starting dispatch of onItemChanged updates r=rnewman 2014-12-31 14:43:59 -05:00
Wes Kocher
75e2c4034c Merge fx-team to m-c a=merge 2014-12-31 11:34:18 -08:00
Mark Finkle
2cfccff4b5 Bug 1116599 - Use a cache to create a GeckoMenu.findItem fast path r=rnewman 2014-12-31 14:32:44 -05:00
Mark Finkle
77b4193420 Bug 1116615 - Use TextUtils.equals to avoid null string issues r=mcomella 2014-12-31 12:55:42 -05:00
Mark Finkle
ba19dc9232 Bug 1116615 - Remove unneeded UI thread Runnable from GeckoMenuItem updater r=rnewman 2014-12-31 01:37:54 -05:00
Mark Finkle
8be6026657 Bug 1116615 - Only update the GeckoMenuItem View if property setter changes a value r=rnewman 2014-12-31 01:37:37 -05:00
Mark Capella
af50c398a2 Bug 1106800 - Rename Selection Cache Handle Names, r=margaret 2014-12-30 16:42:17 -05:00
Mark Capella
6103040147 Bug 1106800 - Rename Selection Handle Names, r=margaret
--HG--
rename : mobile/android/base/resources/drawable/handle_start_level.xml => mobile/android/base/resources/drawable/handle_anchor_level.xml
rename : mobile/android/base/resources/drawable/handle_end_level.xml => mobile/android/base/resources/drawable/handle_focus_level.xml
2014-12-30 16:42:17 -05:00
Mark Capella
a4a993c60f Bug 1106800 - Refactor out string constants in favor of existing Enums, r=margaret 2014-12-30 16:42:17 -05:00
Mark Capella
e86e3c783c Bug 1115370 - TextSelection lost abruptly on unrelated Tab:pagehide messages, r=margaret
* * *
Bug 1115370 - Update SelectionHandler test for Tab:pagehide messages, r=margaret
2014-12-30 16:42:16 -05:00
Michael Comella
2f2112c2a0 Bug 1116369 - Remove new tablet toggle settings strings. r=margaret 2014-12-30 09:48:55 -08:00
Mark Finkle
03e33fd423 Bug 1072997 - Check for a disabled System Download Manager before trying to use it r=margaret 2014-12-30 12:34:55 -05:00
Wes Kocher
dcdfc08c13 Merge m-c to fx-team a=merge 2014-12-29 17:35:54 -08:00
Wes Kocher
36b93d20b2 Merge inbound to m-c a=merge CLOSED TREE 2014-12-29 17:28:04 -08:00
Michael Comella
5867915caa Bug 1095278 - Part 4: Disable testGetUserMedia on release builds. r=rnewman 2014-12-29 11:29:32 -08:00
Michael Comella
15eabdf17b Bug 1095278 - Part 3: Do not test for tracking protection on non-nightly builds. r=rnewman 2014-12-29 11:29:29 -08:00
Michael Comella
2a3d3b7407 Bug 1095278 - Part 2: Disable testAboutPasswords on non-Nightly builds. r=rnewman 2014-12-29 11:29:27 -08:00
wesj
6c1130e68d Bug 1100100 - "Downloaded file can't be opened from "Downloads" page" [r=wjohnston] 2014-12-19 13:46:00 -08:00
Michael Comella
639a6fc37d Bug 1095278 - Part 1: assume new tablet UI. r=rnewman 2014-12-15 18:23:25 +00:00
Richard Newman
0fd52a5906 Bug 1095278 - Allow new tablet UI to ride the trains. r=mfinkle 2014-12-15 17:13:42 +00:00
Kartikaya Gupta
4a7f12361f Bug 1116048 - Don't send to SingleTap gesture events if the double-tap-zoom flag changes during the tap. r=bnicholson 2014-12-29 11:11:55 -05:00
Wes Kocher
c214bcc122 Merge m-c to inbound a=merge 2014-12-30 16:04:20 -08:00
Geoff Brown
fd5ef4e2f9 Bug 1114655 - Increase robocop WaitHelper default wait time; r=mcomella 2014-12-30 14:27:44 -07:00
Geoff Brown
c095dea1c3 Bug 1113754 - Wait for view in robocop getToolbarView; r=mcomella 2014-12-30 14:27:42 -07:00
Botond Ballo
755b86ca3a Bug 1076241 - Get rid of the nontransient async transform. r=kats 2014-12-19 18:53:05 -05:00
Geoff Brown
848cb25a8e Bug 1118039 - Delete unused skip-if in robocop.ini; r=margaret 2015-01-06 10:07:41 -07:00
Brad Lassey
9e798a5bc9 bug 1116860 - Get size of second screen from the chromecast r=mfinkle,rbarker 2015-01-13 18:15:09 -08:00
Christoph Kerschbaumer
2a98bda953 Bug 1087737: Make JS callers of ios.newChannel call ios.newChannel2 in mobile/ (r=wesj) 2014-10-24 15:01:55 -07:00
James Willcox
0940ea8354 Bug 1062758 - Try to shutdown gracefully on Android r=mfinkle 2014-12-29 14:04:22 -06:00
Jim Chen
3f60abecb6 Bug 1078304 - Call GeckoAppShell.setLayerView early; r=snorp a=topcrasher,tracking-firefox35 2014-10-22 12:51:43 -04:00
Shih-Chiang Chien
fbddc387d5 Bug 1080474 - Part 2 - expose device information via PresentationDeviceInfoManager API. r=khuey r=fabrice. 2014-11-14 13:55:24 -08:00
Nick Alexander
e171f23efb Bug 1121622 - Insert omnijar and libraries into debug APK only; Proguard release APK. r=me
DONTBUILD NPOTB

Local developers should only be building debug APKs.  I intend
automation to only build release APKs, and automation will insert the
omnijar and native libraries into the release APK during packaging.

This change requires local developers to delete
$OBJDIR/mobile/android/gradle/app/src/main/{assets,jniLibs}.

--HG--
extra : rebase_source : 455a098eae4586a3010576a4acfde250e8b5837b
2015-01-14 11:07:06 -08:00
Nick Alexander
d1f80fc6ec Bug 1120032 - Use Android-Gradle plugin version 1.0.0 everywhere. r=me
DONTBUILD NPOTB

There are significant problems with the combination of Android-Gradle
0.14.4, Gradle 2.2.1, and IntelliJ 14.0.2.  The problems include
imports that have no recognized source directories and a quasi-working
debugger that fails to stop on breakpoints.

Rather than claim some support for this configuration, we'll move the
Android-Gradle plugin version forward.  This should support both
IntelliJ 14.0.3 (sadly still Early Access Preview only) and Android
Studio 1.0.0.

--HG--
extra : rebase_source : f2394bd65549cef3a2dafb1f83c8d405f0d00124
2015-01-14 11:11:00 -08:00
Wes Johnston
9fff609248 Bug 1064669 - Use a Viewless Fragment for managing MediaPlayer lifecycle. r=mfinkle 2014-09-19 16:55:18 -07:00
Shih-Chiang Chien
de67b6547d Bug 1080474 - Part 1 - device manager for Presentation API. r=fabrice. 2014-08-27 10:28:03 +08:00
Andrea Marchesini
6b6fa3fbff Bug 1018320 - RequestSync API - patch 1 - webIDL and basic logic, r=ehsan 2015-01-13 09:53:14 +00:00
Prabhjyot Singh Sodhi
ff2a77f518 Bug 721421 - Accelerated speed of scrolling by multiplying with constant factors in case of quick successive flings;r=kats 2014-12-25 15:51:22 -05:00
Paolo Amadini
e3f6b034bc Bug 1114617 - Remove nsIDownloadManagerUI from Firefox for Android. r=margaret 2014-12-24 18:10:04 +00:00
Paolo Amadini
18c8d8408d Bug 931776 - Use Downloads.jsm functions to get download directories in Firefox for Android. r=margaret 2014-12-24 18:10:04 +00:00
Richard Newman
a19b9550b2 Bug 1075558 - Fix Notifications.unregisterHandler. r=mcomella 2014-12-23 18:02:20 -08:00
Richard Newman
494aac9b1b Bug 1115075 - Part 1: add telemetry for DBUtils.ensureDatabaseIsNotLocked. r=mfinkle 2014-12-23 12:58:28 -08:00
Richard Newman
3d54dc2d06 Bug 1115075 - Part 0: rename HistogramAdd -> addToHistogram. r=mfinkle 2014-12-23 12:58:28 -08:00
Richard Newman
cf06fe7534 Bug 1109361 - Handle empty files when loading ProfileInformationCache. r=mcomella 2014-12-23 14:28:46 -08:00
Richard Newman
af9ea30eac Bug 1102604 - SysInfo.getLocale() is wrong. r=mcomella 2014-12-23 14:28:46 -08:00
Nick Alexander
694a293c49 Bug 1115064 - Fix small errors and make Gradle integration work in Android Studio 1.0.2. r=me
The important change here is that we allow the Android-Gradle plugin
to be version 0.14.4 or version 1.0.0, which appears to work in
IntelliJ 14.0.2 and in Android Studio 1.0.2.

Testing feedback came from imjalpreet and garvank.

--HG--
extra : rebase_source : 2b93dd91603666f1c6a1d2fe0fa7721d5741bdda
2014-12-23 11:39:15 -08:00
Margaret Leibovic
ab4715e09d Bug 1114593 - Replace defaultDownloadsDirectory calls in DirectoryProvider.js. r=mfinkle
--HG--
extra : rebase_source : 8e6574838cafecc5c26ed68a1d1a4b3cb6a6a617
2014-12-22 14:59:03 -05:00
Margaret Leibovic
18bdf973b0 Bug 1114506 - Update Sanitizer.jsm to use Downloads.jsm to clear downloads. r=mfinkle
--HG--
extra : rebase_source : 6a491763ce64715ea53ec76f6b9e116d25089cae
2014-12-22 16:14:32 -05:00
Margaret Leibovic
c1137df2a6 Bug 1111729 - Default to show URL in toolbar instead of page title, and remove preference. r=mcomella
--HG--
extra : rebase_source : e26d5f123b2a14c73adfd858d5b5ca2c59899068
2014-12-15 13:21:55 -08:00
Ryan VanderMeulen
fa76109465 Backed out changeset 078591b255a0 (bug 1107627) for testSessionOOMRestore permafail. 2014-12-23 12:50:28 -05:00
Margaret Leibovic
e916693046 Bug 1113092 - Don't create new download notifications for succeeded downloads. r=paolo,mfinkle
--HG--
extra : rebase_source : 8bff5f90af53931cea0a53672594c4ac421d89eb
2014-12-22 14:28:39 -05:00
wesj
5f86da76ea Bug 1107627 - browser.css is never loaded r=mfinkle 2014-12-23 10:13:41 -05:00
Chris Kitching
ff5ab9b7f6 Bug 1081375: Remove write-only datastructures. r=rnewman 2014-10-10 23:24:12 +01:00
Chris Kitching
fdedd36409 Bug 1107398: Stop lying about Robocop and Reflection. r=wesj 2014-12-03 21:58:39 -08:00
Chris Kitching
7fed543832 Bug 1081389: Stop overriding abstract methods with more abstract methods. r=rnewman 2014-10-11 00:04:25 +01:00
Nick Alexander
4f3f4284e1 Bug 1098239 - Rewrite mobile/android Gradle integration. r=me
This is a big patch, but it's essentially NPOTB.  The part that is POTB
is ... removing Gradle integration from the build.  I've implemented
|mach gradle-install| as a substitute for the build system stuff; it's
just so much easier to iterate on a mach command than a moz.build and
Makefile.in.

I'm landing this with self-review because this lessens the impact of the
Gradle integration on the build system and because I am the only person
who understands either the old or the new system.

You'll need to run |mach gradle-install| at top level to configure the
new Gradle integration.  But |mach gradle ...| does the right thing
configuration steps too.

This patch rewrites most of the Gradle integration.  The major changes
are:

* all .gradle files move into mobile/android/gradle;
* all the Gradle projects live in the object directory;
* mozconfig exposed to all build.gradle files;
* simplification of Android configuration between build.gradle files;
* support for user-specified version of build tools;
* first steps towards supporting builds from the source directory;
* bumps Gradle to 2.2.1;
* bumps the Android-Gradle plugin to 0.14.4.

This is seemingly a step backwards given that we'd prefer to ship the
.idea directory in the source directory.  But in fact we get closer to
that; it's possible to run ./gradlew in the source directory and get a
reasonable build.  We'll progress with this in time.  The win right now
is that the projects are nested, which makes importing work better on
Linux machines.

Unfortunately IntelliJ 13 and 14 now have conflicting Android-Gradle
plugin version requirements, so we now only support IntelliJ 14.0.2 and
above.

--HG--
rename : mobile/android/base/gradle_AndroidManifest.xml => mobile/android/gradle/base/AndroidManifest.xml
rename : mobile/android/base/gradle_AndroidManifest.xml => mobile/android/gradle/branding/AndroidManifest.xml
rename : mobile/android/gradle/omnijar/gradle_AndroidManifest.xml => mobile/android/gradle/omnijar/AndroidManifest.xml
rename : mobile/android/base/gradle_AndroidManifest.xml => mobile/android/gradle/preprocessed_code/AndroidManifest.xml
rename : mobile/android/base/gradle_AndroidManifest.xml => mobile/android/gradle/preprocessed_resources/AndroidManifest.xml
rename : mobile/android/thirdparty/gradle_AndroidManifest.xml => mobile/android/gradle/thirdparty/AndroidManifest.xml
2014-12-22 19:49:04 -08:00
Ryan VanderMeulen
2c3cbbecba Merge m-c to fx-team. a=merge 2014-12-22 17:59:25 -05:00
Ryan VanderMeulen
93534bdf01 Merge inbound to m-c. a=merge 2014-12-22 17:55:32 -05:00
Nick Alexander
12ed8ba738 Bug 1075797 - Move new tablet resources into regular resources. r=lucasr,rnewman,mcomella
The move command was:

$ cd mobile/android/base/newtablet/res
$ find . -type f -exec hg mv {} ../../resources/{} \;

--HG--
rename : mobile/android/base/newtablet/res/color-large-v11/new_tablet_tab_item_title.xml => mobile/android/base/resources/color-large-v11/new_tablet_tab_item_title.xml
rename : mobile/android/base/newtablet/res/color-large-v11/new_tablet_tab_strip_item_bg.xml => mobile/android/base/resources/color-large-v11/new_tablet_tab_strip_item_bg.xml
rename : mobile/android/base/newtablet/res/color-large-v11/new_tablet_tab_strip_item_title.xml => mobile/android/base/resources/color-large-v11/new_tablet_tab_strip_item_title.xml
rename : mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_default_favicon.png => mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_default_favicon.png
rename : mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_ic_menu_back.png => mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_ic_menu_back.png
rename : mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_ic_menu_forward.png => mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_ic_menu_forward.png
rename : mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_ic_menu_reload.png => mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_ic_menu_reload.png
rename : mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_menu.png => mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_menu.png
rename : mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_nav_back.png => mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_nav_back.png
rename : mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_tab_close.png => mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_tab_close.png
rename : mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_tab_close_active.png => mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_tab_close_active.png
rename : mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_tab_new_dark.png => mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_tab_new_dark.png
rename : mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_tabs_count.png => mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_tabs_count.png
rename : mobile/android/base/newtablet/res/drawable-large-hdpi-v11/new_tablet_tabs_count_foreground.png => mobile/android/base/resources/drawable-large-hdpi-v11/new_tablet_tabs_count_foreground.png
rename : mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_default_favicon.png => mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_default_favicon.png
rename : mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_ic_menu_back.png => mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_ic_menu_back.png
rename : mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_ic_menu_forward.png => mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_ic_menu_forward.png
rename : mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_ic_menu_reload.png => mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_ic_menu_reload.png
rename : mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_menu.png => mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_menu.png
rename : mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_nav_back.png => mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_nav_back.png
rename : mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_tab_close.png => mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_tab_close.png
rename : mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_tab_close_active.png => mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_tab_close_active.png
rename : mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_tab_new_dark.png => mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_tab_new_dark.png
rename : mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_tabs_count.png => mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_tabs_count.png
rename : mobile/android/base/newtablet/res/drawable-large-mdpi-v11/new_tablet_tabs_count_foreground.png => mobile/android/base/resources/drawable-large-mdpi-v11/new_tablet_tabs_count_foreground.png
rename : mobile/android/base/newtablet/res/drawable-large-v11/new_tablet_action_bar_button.xml => mobile/android/base/resources/drawable-large-v11/new_tablet_action_bar_button.xml
rename : mobile/android/base/newtablet/res/drawable-large-v11/new_tablet_site_security_level.xml => mobile/android/base/resources/drawable-large-v11/new_tablet_site_security_level.xml
rename : mobile/android/base/newtablet/res/drawable-large-v11/new_tablet_site_security_unknown.xml => mobile/android/base/resources/drawable-large-v11/new_tablet_site_security_unknown.xml
rename : mobile/android/base/newtablet/res/drawable-large-v11/new_tablet_tab_item_close_button.xml => mobile/android/base/resources/drawable-large-v11/new_tablet_tab_item_close_button.xml
rename : mobile/android/base/newtablet/res/drawable-large-v11/new_tablet_tab_strip_add_tab.xml => mobile/android/base/resources/drawable-large-v11/new_tablet_tab_strip_add_tab.xml
rename : mobile/android/base/newtablet/res/drawable-large-v11/new_tablet_tab_strip_button.xml => mobile/android/base/resources/drawable-large-v11/new_tablet_tab_strip_button.xml
rename : mobile/android/base/newtablet/res/drawable-large-v11/new_tablet_tab_strip_divider.xml => mobile/android/base/resources/drawable-large-v11/new_tablet_tab_strip_divider.xml
rename : mobile/android/base/newtablet/res/drawable-large-v11/new_tablet_url_bar_nav_button.xml => mobile/android/base/resources/drawable-large-v11/new_tablet_url_bar_nav_button.xml
rename : mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_default_favicon.png => mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_default_favicon.png
rename : mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_ic_menu_back.png => mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_ic_menu_back.png
rename : mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_ic_menu_forward.png => mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_ic_menu_forward.png
rename : mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_ic_menu_reload.png => mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_ic_menu_reload.png
rename : mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_menu.png => mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_menu.png
rename : mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_nav_back.png => mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_nav_back.png
rename : mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_tab_close.png => mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_tab_close.png
rename : mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_tab_close_active.png => mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_tab_close_active.png
rename : mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_tab_new_dark.png => mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_tab_new_dark.png
rename : mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_tabs_count.png => mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_tabs_count.png
rename : mobile/android/base/newtablet/res/drawable-large-xhdpi-v11/new_tablet_tabs_count_foreground.png => mobile/android/base/resources/drawable-large-xhdpi-v11/new_tablet_tabs_count_foreground.png
rename : mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_default_favicon.png => mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_default_favicon.png
rename : mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_ic_menu_back.png => mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_ic_menu_back.png
rename : mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_ic_menu_forward.png => mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_ic_menu_forward.png
rename : mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_ic_menu_reload.png => mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_ic_menu_reload.png
rename : mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_menu.png => mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_menu.png
rename : mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_nav_back.png => mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_nav_back.png
rename : mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_tab_close.png => mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_tab_close.png
rename : mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_tab_close_active.png => mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_tab_close_active.png
rename : mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_tabs_count.png => mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_tabs_count.png
rename : mobile/android/base/newtablet/res/drawable-large-xxhdpi-v11/new_tablet_tabs_count_foreground.png => mobile/android/base/resources/drawable-large-xxhdpi-v11/new_tablet_tabs_count_foreground.png
rename : mobile/android/base/newtablet/res/drawable-xlarge-hdpi-v11/new_tablet_ic_menu_bookmark_add.png => mobile/android/base/resources/drawable-xlarge-hdpi-v11/new_tablet_ic_menu_bookmark_add.png
rename : mobile/android/base/newtablet/res/drawable-xlarge-hdpi-v11/new_tablet_ic_menu_bookmark_remove.png => mobile/android/base/resources/drawable-xlarge-hdpi-v11/new_tablet_ic_menu_bookmark_remove.png
rename : mobile/android/base/newtablet/res/drawable-xlarge-mdpi-v11/new_tablet_ic_menu_bookmark_add.png => mobile/android/base/resources/drawable-xlarge-mdpi-v11/new_tablet_ic_menu_bookmark_add.png
rename : mobile/android/base/newtablet/res/drawable-xlarge-mdpi-v11/new_tablet_ic_menu_bookmark_remove.png => mobile/android/base/resources/drawable-xlarge-mdpi-v11/new_tablet_ic_menu_bookmark_remove.png
rename : mobile/android/base/newtablet/res/drawable-xlarge-xhdpi-v11/new_tablet_ic_menu_bookmark_add.png => mobile/android/base/resources/drawable-xlarge-xhdpi-v11/new_tablet_ic_menu_bookmark_add.png
rename : mobile/android/base/newtablet/res/drawable-xlarge-xhdpi-v11/new_tablet_ic_menu_bookmark_remove.png => mobile/android/base/resources/drawable-xlarge-xhdpi-v11/new_tablet_ic_menu_bookmark_remove.png
rename : mobile/android/base/newtablet/res/drawable-xlarge-xxhdpi-v11/new_tablet_ic_menu_bookmark_add.png => mobile/android/base/resources/drawable-xlarge-xxhdpi-v11/new_tablet_ic_menu_bookmark_add.png
rename : mobile/android/base/newtablet/res/drawable-xlarge-xxhdpi-v11/new_tablet_ic_menu_bookmark_remove.png => mobile/android/base/resources/drawable-xlarge-xxhdpi-v11/new_tablet_ic_menu_bookmark_remove.png
rename : mobile/android/base/newtablet/res/layout-large-v11/new_tablet_browser_toolbar.xml => mobile/android/base/resources/layout-large-v11/new_tablet_browser_toolbar.xml
rename : mobile/android/base/newtablet/res/layout-large-v11/new_tablet_tab_strip.xml => mobile/android/base/resources/layout-large-v11/new_tablet_tab_strip.xml
rename : mobile/android/base/newtablet/res/layout-large-v11/new_tablet_tabs_counter.xml => mobile/android/base/resources/layout-large-v11/new_tablet_tabs_counter.xml
rename : mobile/android/base/newtablet/res/layout-large-v11/new_tablet_tabs_panel_back_button.xml => mobile/android/base/resources/layout-large-v11/new_tablet_tabs_panel_back_button.xml
rename : mobile/android/base/newtablet/res/layout-large-v11/tab_strip.xml => mobile/android/base/resources/layout-large-v11/tab_strip.xml
rename : mobile/android/base/newtablet/res/layout-large-v11/tab_strip_item.xml => mobile/android/base/resources/layout-large-v11/tab_strip_item.xml
rename : mobile/android/base/newtablet/res/layout-large-v11/tab_strip_item_view.xml => mobile/android/base/resources/layout-large-v11/tab_strip_item_view.xml
extra : amend_source : 604733b38aa0e8d9f8b5334dfa99af9f1201a2ee
2014-12-22 14:13:26 -08:00
Mark Finkle
e77dbbc3e5 Bug 1078796 - Update the Matchstick casting code r=wesj 2014-12-22 15:42:11 -05:00
Mark Finkle
b52b5db415 Bug 1078796 - Remove special purpose Matchstick filtering code r=wesj 2014-12-22 15:42:04 -05:00
Richard Newman
d55f7227af Backed out changeset 93840f9b5af8 (bug 909434) for causing five new bugs. 2014-12-22 12:40:32 -08:00
Margaret Leibovic
2f802d5beb Bug 1113844 - Fix parameters in showInAboutDownloads call. r=mfinkle
--HG--
extra : rebase_source : 242b937e4722c4231eac183a3910f665f898c588
2014-12-22 15:07:24 -05:00
Margaret Leibovic
a55507efbe Bug 1114589 - Add compatibility layer for Uri.getQueryParameterNames. r=rnewman
--HG--
extra : rebase_source : 3b7d1fa11409cf3de9855df3a6575319b5a6f93c
2014-12-22 13:35:41 -05:00
Margaret Leibovic
8020afb31d Bug 1114600 - Get rid of unnecessary reader enabled flag in Java. r=rnewman
--HG--
extra : rebase_source : c24b01b19323840694ef472bf12b71abb552c33d
2014-12-20 19:45:13 -08:00
Carsten "Tomcat" Book
cc33239ad9 Backed out changeset 8e2bc21d3e69 (bug 1092006) for reftest failures 2014-12-22 17:17:59 +01:00
Neil Deakin
afbba9218f Bug 1066383, rework custom html menu item handling to support contextmenu attribute in separate process, r=janv,mconley,peterv 2014-12-16 11:21:11 -05:00
Nathan Toone
7278e78cc3 Bug 1091357 - Include the strings regardless of whether or not MOZ_ANDROID_SEARCH_ACTIVITY is set. r=nalexander
Bug 1080326 moved the search activity resources into the main Fennec resources. Those search activity resources require the corresponding strings; this patch makes them unconditionally available.
2014-12-03 18:29:00 +01:00
Manu Jain
57e70c019f Bug 1092471 - Username capitalised when entering in bank logon screen; r=jchen 2014-12-04 02:33:00 +01:00
Mike Taylor
e1c757e680 Bug 1092006 - Fix substitution variable name used in content.css. r=wesj 2014-12-16 13:00:00 +01:00
Phil Ringnalda
41b26b97c1 Merge f-t to m-c, a=merge 2014-12-20 12:18:28 -08:00
Richard Newman
70ba7b04b1 Bug 1093172 - Follow-up: include missing import. r=trivial 2014-12-20 07:34:07 -08:00
Geoff Brown
11fbd05af3 Bug 1113751 - Rename test functions in testBackButtonInEditMode; r=vivek 2014-12-19 20:43:40 -07:00
Federico Paolinelli
0d773ed1b2 Bug 909434 - Allow dragging the urlbar to open the tabs tray. r=wesj 2014-12-09 16:30:00 -08:00
Ryan VanderMeulen
5af2fd23a7 Merge m-c to fx-team. a=merge 2014-12-19 15:13:27 -05:00
Ryan VanderMeulen
55f768c199 Merge inbound to m-c. a=merge 2014-12-19 15:03:54 -05:00
Geoff Brown
5480fb5918 Bug 1107002 - Update check for home banner not visible; r=mcomella 2014-12-19 09:22:08 -07:00
Geoff Brown
8c9918d2b5 Bug 1085837 - Fix robocop testAppMenuPathways on Android 2.3; r=mcomella 2014-12-19 09:22:07 -07:00
Margaret Leibovic
7193685c91 Bug 1108564 - Move share_overlay_background.9.png to hdpi directory to avoid crashes on resource-constrained builds. r=rnewman
--HG--
rename : mobile/android/base/resources/drawable-xhdpi/share_overlay_background.9.png => mobile/android/base/resources/drawable-hdpi/share_overlay_background.9.png
extra : rebase_source : 55095639ff6df78723fe71dc564f2222807f3bd7
extra : amend_source : 0dcfdc3af41464438de382c57e5c195dae2fb21d
2014-12-18 14:25:44 -08:00
Richard Newman
ce6294c673 Bug 1113296 - Disable match case mode for find-in-page on non-Nightly builds. r=mfinkle 2014-12-18 15:27:31 -08:00
Margaret Leibovic
0fbd54f296 Bug 1105316 - Look in Gecko chrome registry for fallback locale in search activity. r=rnewman
--HG--
extra : rebase_source : 42e908cf3c6d08cb8a108d6f7b11b169ef3ab0dd
2014-12-09 12:45:13 -08:00
Margaret Leibovic
9cc78870b0 Bug 1112189 - Additional telemetry for tracking protection shield. r=mfinkle
--HG--
extra : rebase_source : eda2d69c36118cc93540ab0bed934d53c9de0c03
2014-12-17 17:30:38 -08:00
Margaret Leibovic
5d1809e8c7 Bug 1093172 - Add test to check default status of inserted items. r=rnewman 2014-12-08 10:44:32 -08:00
Margaret Leibovic
c4d427c2d6 Bug 1093172 - Add status when adding reading list item from Reader.js. r=rnewman 2014-12-08 10:44:26 -08:00
Margaret Leibovic
b5b34b7274 Bug 1093172 - Add CONTENT_STATUS column to reading list table. r=rnewman 2014-12-08 10:43:06 -08:00
Mark Capella
b590135d27 Bug 1112230 - Find in page: Case insensitivity button no response to tap, r=wesj 2014-12-20 00:50:11 -05:00
Mark Capella
99b606dac0 Bug 1103410 - Unhandled error for GeckoRequest FindInPage:Find, r=wesj 2014-12-20 00:50:11 -05:00
Ryan VanderMeulen
4415636429 Backed out 3 changesets (bug 1093172) for robocop failures.
Backed out changeset 8d1c3083f7e6 (bug 1093172)
Backed out changeset 4fa27d0105df (bug 1093172)
Backed out changeset c85c0a37dcb9 (bug 1093172)
2014-12-19 23:51:18 -05:00
Margaret Leibovic
e2c72f26b6 Bug 1093172 - Add test to check default status of inserted items. r=rnewman
--HG--
extra : rebase_source : bca2e7843c2f5cb1ef9fc32c8004c7115aa65872
2014-12-08 10:44:32 -08:00
Margaret Leibovic
7073e68a97 Bug 1093172 - Add status when adding reading list item from Reader.js. r=rnewman
--HG--
extra : rebase_source : ab1793ee80415c6e09028c757acd43d31426c2d4
2014-12-08 10:44:26 -08:00
Margaret Leibovic
1c4efd4617 Bug 1093172 - Add CONTENT_STATUS column to reading list table. r=rnewman
--HG--
extra : rebase_source : d875e124750e6d8edb3458336c6ed737aa2324aa
2014-12-08 10:43:06 -08:00
Francisco Jordano
0f4b103f22 Bug 1110310 - "Replace LightweightTheme member variable with getTheme() calls". r=michael.l.comella 2014-12-16 11:01:00 +01:00
vivek
092f4014ef Bug 1015516 - Save closedTabs when saving session to disk. r=bnicholson 2014-12-17 20:06:50 +02:00
Jalpreet Singh Nanda
ddd75750bf Bug 966654 - Close button tap target on snippet banner is too small. r=margaret 2014-12-15 23:45:26 +05:30
Ryan VanderMeulen
6c2791a445 Backed out changeset 66cc38d90f25 (bug 1112397) for making testSettingsMenuItems permafail on Android 4.0. 2014-12-17 14:34:21 -05:00
Michael Comella
f14fef5d8a Bug 1112397 - Go back in testSettingsMenuItems on small tablet. r=gbrown 2014-12-17 08:52:50 -08:00
Mark Finkle
e87d7cd662 Bug 1110607 - Enable tab mirroring by default on all channels r=blassey 2014-12-17 10:04:26 -05:00
Margaret Leibovic
3dbb00ba33 Bug 793920 - (Part 2) Split up Reader.js to create shared ReaderMode.jsm in /toolkit. r=bnicholson
--HG--
rename : mobile/android/chrome/content/Reader.js => toolkit/components/reader/ReaderMode.jsm
extra : rebase_source : 5f66c449c50135d53644ebc507357ab560938bc7
extra : histedit_source : 53ad05bc9a30977399627c13f07971d7f7250814
2014-12-12 13:47:07 -08:00
Margaret Leibovic
de5e9c40f7 Bug 793920 - (Part 1) Move majority of Android reader mode code to a shared place in /toolkit. r=Mossop,bnicholson
--HG--
rename : mobile/android/chrome/content/JSDOMParser.js => toolkit/components/reader/content/JSDOMParser.js
rename : mobile/android/chrome/content/Readability.js => toolkit/components/reader/content/Readability.js
rename : mobile/android/chrome/content/aboutReader.html => toolkit/components/reader/content/aboutReader.html
rename : mobile/android/chrome/content/aboutReader.js => toolkit/components/reader/content/aboutReader.js
rename : mobile/android/chrome/content/readerWorker.js => toolkit/components/reader/content/readerWorker.js
rename : mobile/android/locales/en-US/chrome/aboutReader.properties => toolkit/locales/en-US/chrome/global/aboutReader.properties
extra : rebase_source : f0b900c46bb5dc894303ddf3701be7b019b61ae0
extra : histedit_source : 7417d0e4032ed3a3b1ab83af8f7e8a92951fdead
2014-12-10 16:44:53 -08:00
Michael Comella
3590998fe3 Bug 1085837 - Open legacy "More" menu before asserting menu item is disabled; r=liuche 2014-10-31 17:08:30 -07:00
Geoff Brown
47b8d3e1e9 Bug 1107002 - Update robocop dismissEditingMode for tablets; r=mcomella 2014-12-19 09:22:07 -07:00
Geoff Brown
8bd4181821 Bug 1105522 - Copy Robocop exception handling into UITest; r=jmaher 2014-12-19 09:22:07 -07:00
Geoff Brown
fc37f6f019 Bug 1090927 - Rename private test... functions in testGeckoProfile; r=mfinkle 2014-12-19 09:22:07 -07:00
Margaret Leibovic
3e9248c4b3 Bug 1105792 - Simplify testHomeBanner to account for the fact that banner view is removed when banner is dismissed; r=gbrown 2014-12-09 17:58:45 -08:00
Geoff Brown
bfc1dc28ba Bug 1105792 - Avoid assertions in testHomeBanner; r=margaret 2014-12-19 09:22:06 -07:00
Geoff Brown
aa15f056c4 Bug 1105887 - Wait for panel in testAboutHomeVisibility; r=mcomella 2014-12-19 09:22:06 -07:00
Geoff Brown
18d594a471 Bug 1105795 - Avoid ClassCastException in testAboutHomeVisibility; r=mcomella 2014-12-19 09:22:06 -07:00
vivek
a6f00268e4 Bug 732752 - Restore a closed tab with previous session history r=bnicholson. 2014-12-06 13:33:34 -08:00
Jordan Lund
0f26945357 Bug 1073772 - Releng work for two ARMv7 APKs - nonuni mozconfig fix for api 11, r=rnewman 2014-12-18 20:58:50 -08:00
Margaret Leibovic
968c3084d0 Bug 1110461 - Disable estimated reading time in reading list. r=mcomella
--HG--
extra : rebase_source : 1585925328a6636e160333dc27722dd6d289fd3a
2014-12-11 13:44:49 -08:00
Brad Lassey
d81249fa81 bug 1088758 - Add the ability to mirror tabs from desktop to a second screen r=mconley, mfinkle 2014-12-15 18:52:55 -05:00
Wes Johnston
39dc927bd4 Bug 901360 - (Part 5) Don't allow pausing downloads without partial data. r=margaret
--HG--
extra : rebase_source : c5455e3d650711692af3f97d90dd002845dcc669
2014-12-08 11:26:36 -08:00
Wes Johnston
4775f1702f Bug 901360 - (Part 4) Fix clicking on notifications. r=margaret
--HG--
extra : rebase_source : 6bac7cd282d7ec795d91c0dbb685027890d6e840
2014-12-08 11:26:36 -08:00
Wes Johnston
a1ef6f3837 Bug 901360 - (Part 2) Fix PDF downloads. r=margaret
--HG--
extra : rebase_source : c0b856edd344292fc28384e18e1474cb7198b28a
2014-12-08 11:26:35 -08:00
James Gilbertson
692304178e Bug 901360 - (Part 1) Use Downloads.jsm for download notifications. r=wesj
--HG--
extra : rebase_source : a05527361fcde5d7fd7b77b3bcc46955750d19e2
2014-12-08 11:26:31 -08:00
wesj
8d9b270e38 Bug 1109198 - Turn on Downloads integration on release builds [r=mark.finkle] 2014-12-15 09:48:00 -08:00
Wes Johnston
523a4f5389 Bug 1109165 - "Remove lock screen widget" [r=mark.finkle] 2014-12-15 10:02:00 -08:00
Michael Comella
b377a94fea Bug 1105541 - Part 3: Change add tab button to a dark color on light themes on new tablet. r=mhaigh 2014-12-12 14:03:28 -08:00
Michael Comella
7eeef1b4ff Bug 1105541 - Part 2: Add alpha to pressed state of tabs with LWT on new tablet. r=mhaigh 2014-12-12 14:03:25 -08:00
Michael Comella
adffdb3622 Bug 1105541 - Part 1: Use a light text color for tab titles with a dark LWT on new tablet. r=mhaigh 2014-12-12 14:03:21 -08:00
Margaret Leibovic
c599adcd28 Bug 1107133 - Expose tracking protection in Fennec privacy preferences. r=liuche
--HG--
extra : rebase_source : c871a80ba90ed7f5b4d626d4d04f64a7e6e74a4c
2014-12-08 15:17:32 -08:00
Jalpreet Singh Nanda
f4d34d9163 Bug 1107253 - Move mBaseUrl and mRawBaseUrl from BaseTest into BaseRobocopTest. r=mcomella 2014-12-11 03:44:04 +05:30
Nivvedan S
62ebb2ebd7 Bug 1109233 - Replaced Assert.isTrue(false, ...) with Assert.fail(...) for easier readability; r=mcomella 2014-12-11 21:40:04 -08:00
Garvan Keeley
dc56c0508f Bug 1106584 - Part 2: for safety, make explicit prefs with context getter. r=vng
Any class that has access to a context should call Prefs.getInstance(Context) which is guaranteed to return a Prefs.
With no context, classes can call Prefs.getInstanceWithoutContext() but they must null-check the return, and handle accordingly.
Fortunately, the latter case happens in very few places, all of which require no special handling of this case.

This change:
- maintains context-less access to the Prefs
- classes internal to the service can safely call getInstanceWithoutContext(), as the service (or the MainApp in the stumbler case)
will have instantiated a Prefs so that getInstanceWithoutContext() will return a prefs
- protects against null Prefs if we have failed to consider a particular entry point to the code will require that Prefs was instatiated with a context.
2014-12-11 09:06:00 -08:00
Garvan Keeley
fa5d35976f Bug 1106584, Part 1: guard against null intent. r=vng 2014-12-09 11:48:00 -08:00
Wes Kocher
6d3a321489 Merge inbound to m-c a=merge 2014-12-11 16:50:45 -08:00
J. Ryan Stinnett
a0a3a60049 Bug 1059001 - Part 1b: Update openListener callsites. r=past 2014-12-10 20:55:51 -06:00
Chenxia Liu
e3d59c43c3 Bug 1093201 - Part 2: Tests. r=margaret 2014-12-10 15:43:13 -08:00
Chenxia Liu
dbce887c2a Bug 1093201 - Part 1: Passwords management UI. r=margaret 2014-12-10 15:43:13 -08:00
Michael Comella
de990a2943 Bug 1085771 - Part 4: Move color state selector to colors/. r=lucasr
--HG--
rename : mobile/android/base/newtablet/res/drawable-large-v11/new_tablet_tab_strip_item_bg.xml => mobile/android/base/newtablet/res/color-large-v11/new_tablet_tab_strip_item_bg.xml
2014-12-10 09:35:54 -08:00
Michael Comella
1801e8d094 Bug 1085771 - Part 3: Update LWT UI for new tablet browser toolbar. r=lucasr 2014-12-10 09:35:37 -08:00
Carsten "Tomcat" Book
3baa3d5133 merge fx-team to mozilla-central a=merge
--HG--
extra : amend_source : 3962a6a96e6eb782f640e1eb9495192ef82883b3
2014-12-10 11:55:54 +01:00
Chris Kitching
018d298faa Bug 1106593: Proguard third-party libraries that ship with Fennec. r=nalexander
This applies Proguard to third-party libraries such as the Android
support-v4 library and the Google Play Services libraries.
Previously, these were not Proguarded, bloating the Fennec APK.

Technically, this required a few work-arounds, including:

* stripping library debug information with a early Proguard
  invocation;
* altering the optimizations tried; and
* reducing the number of Proguard passes.

--HG--
rename : mobile/android/config/proguard.cfg => mobile/android/config/proguard/proguard.cfg
extra : rebase_source : 6d638695b6c8f759578aba5f1eda668fc9c28e9d
extra : amend_source : 96a475c0739c4b44a3df3fdfd2c59321836d9694
2014-12-05 11:50:48 -08:00
Michael Comella
a16cef4d14 Bug 1107698 - Part 2: Update alpha when updating the color in ResizeablePathDrawable. r=bnicholson 2014-12-09 15:57:54 -08:00
Lucas Rocha
54971e67a2 Bug 1109001 - Only set alpha on non-transparent colors in shaped drawable (r=mcomella) 2014-12-09 23:45:31 +00:00
Lucas Rocha
069fc9e932 Bug 1097318 - Restore tab strip to its original height (r=mfinkle) 2014-12-09 21:25:37 +00:00
Lucas Rocha
d302cbdbd9 Bug 1106118 - Replace getVerticalSpacing() call with a dimen resource (r=mfinkle) 2014-12-09 21:23:13 +00:00
Margaret Leibovic
2b5786f8bb Bug 681432 - Support all add-on types in the add-on manager. r=mfinkle
--HG--
extra : rebase_source : e5ca39397adf3364924c8b1b6ca9f53862cc7136
2014-12-08 13:47:30 -08:00
Margaret Leibovic
0677cb3a3d Bug 1106415 - Allow the add-on SDK to dynamically insert add-on options. r=mfinkle
--HG--
extra : rebase_source : fb958f6d6f77cd6bc2d356b6b76107fc653dff12
extra : amend_source : 67b932a1a42836cc824478ffe11f4b8f4da592a7
2014-12-08 11:24:13 -08:00
Ryan VanderMeulen
32f2a32730 Merge m-c to fx-team. a=merge
CLOSED TREE
2014-12-09 14:19:43 -05:00