Commit Graph

15358 Commits

Author SHA1 Message Date
Chris Kitching
b7810c68f0 Bug 947018: Unbreak testBrowserProvider. r=trivial 2014-12-03 11:39:40 -08:00
Chris Kitching
135eab36b5 Bug 947018: Delete large amounts of database migration code. r=wesj 2014-09-08 06:43:20 -07:00
Carsten "Tomcat" Book
d4b9453ca0 Merge mozilla-central to fx-team 2014-12-02 12:07:01 +01:00
Kartikaya Gupta
342459e5c6 Bug 1106255 - Enable the meta-viewport support on Fennec to fix font inflation. r=dvander 2014-12-01 13:55:59 -05:00
J. Ryan Stinnett
55c34b5fd0 Bug 1058997 - Part 3b: Update non-trivial security prompts. r=past 2014-12-01 22:55:56 -08:00
Nick Alexander
8dd72589d3 Bug 1080242 - Surface 'Account locked' status. r=rnewman
--HG--
extra : rebase_source : 56a7d340960673d6244ae796755935d89885e986
2014-11-25 17:43:04 -08:00
Nick Alexander
ca8d04ceed Bug 1098667 - Part 2: Add "Finish migrating" view to Remote Tabs home panel. r=rnewman
--HG--
extra : rebase_source : f917eda2af5601c154fbd406db9c4d2b83899001
2014-11-25 17:04:55 -08:00
Nick Alexander
87e402478e Bug 1098667 - Part 1: Import from android-sync. r=rnewman
--HG--
extra : rebase_source : afa367b0bb0002a6cfda4a1531bc7c47a5f0effa
extra : source : 705b1be87804d5e3427eb433f6445ef055857a89
2014-11-25 16:18:53 -08:00
Richard Newman
2514ee07ae Bug 1105590 - Wait for distribution intent to arrive. r=mfinkle 2014-11-28 12:30:38 -08:00
Phil Ringnalda
2bbd5309a6 Merge m-c to f-t 2014-11-28 12:00:57 -08:00
Kev Needham
e89fac4575 Bug 1103216: update Google parameters, r=gavin, f=mfinkle, test changes r=felipe
--HG--
extra : transplant_source : %12%07%00%00%E1kA%0E%0B%24%0A%89%94%9C%17%B5EE%1E%B9
2014-11-24 11:11:44 -08:00
ffxbld
e3413f5d4f Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release 2014-11-28 10:54:49 -05:00
Ben Hearsum
f307340eaa Backout bad version bumps IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release 2014-11-28 10:51:29 -05:00
ffxbld
d253b33d7e Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release 2014-11-28 10:39:09 -05:00
ffxbld
85ae6fdacd Update configs. IGNORE BROKEN CHANGESETS CLOSED TREE NO BUG a=release ba=release 2014-11-28 10:33:05 -05:00
Lucas Rocha
c9f2c55e6e Bug 1098433 - Improve tabs panel grid padding on large tablets (r=mcomella) 2014-11-28 16:04:19 +00:00
Seth Fowler
d40a7245bb Bug 1104622 (Part 1) - Remove DiscardTracker. r=tn 2014-11-27 19:55:57 -08:00
Lucas Rocha
b6053743ce Bug 1100894 - Don't smooth scroll when restoring tabs on startup (r=mcomella) 2014-11-27 17:13:03 +00:00
Lucas Rocha
3582f3dcd9 Bug 1055604 - Add animation to reveal tabs on startup (r=mcomella) 2014-11-27 17:13:03 +00:00
Lucas Rocha
fb1fdfba92 Bug 1100897 - Avoid duplicate RESTORED tab event on startup (r=mhaigh) 2014-11-27 17:13:02 +00:00
Martyn Haigh
170cbd7bff Bug 1097121 - Animate items being removed from the tabs panel grid (r=lucasr) 2014-11-27 16:37:42 +00:00
Lucas Rocha
f106d6f5c9 Bug 1073125 - Run trimage on all new_tablet image assets (r=mcomella) 2014-11-27 13:58:20 +00:00
Ryan VanderMeulen
d8461340ac Merge fx-team to m-c. a=merge 2014-11-26 21:08:54 -05:00
Margaret Leibovic
d4ad2f1ecb Bug 1095643 - Always show site identity info. r=mcomella 2014-11-26 15:58:07 -08:00
Margaret Leibovic
6f738b4721 Bug 1102275 - Use layout params height instead of the dismiss view's calculated height when resetting the original height. r=bnicholson 2014-11-26 15:57:25 -08:00
Lucas Rocha
6ea9853ef0 Bug 1090364 - Add fading edge to tab strip (r=mcomella) 2014-11-26 19:45:48 +00:00
Margaret Leibovic
02f71b76dd Bug 1102537 - Remove "which is run by *unknown*" block from non-EV site identity message. r=mcomella 2014-11-26 10:57:09 -08:00
Margaret Leibovic
b88fdb93ba Bug 1095640 - Update UX for site identity popup to handle tracking blocking. r=mfinkle 2014-11-26 10:57:07 -08:00
Mark Finkle
92a997a893 Bug 1105284 - Update the CDN location for OTA distributions r=rnewman 2014-11-26 11:37:07 -05:00
Mike Hommey
4d72015cfa Bug 1094565 - Update sccache to e68dfc2. r=mshal 2014-11-26 16:04:25 +09:00
Daniel Holbert
8b2fb3bb07 Bug 1093316 part 1: Backout changeset aece7f9f944c (i.e. backout bug 1032922 part 2), to reflect CSSWG removing "flex-basis: main-size" from the flexbox spec. 2014-11-25 11:28:15 -08:00
Nick Alexander
0962f34f87 Bug 1102488 - Part 3: Output preprocessed files into generated/preprocessed. r=rnewman
(Pushing to a CLOSED TREE because this is Android only.)

The preprocessed files, all of which are constant exports, are exposed
in the new constants JAR.

--HG--
extra : source : 05cf424592e66f30c9a6c92f07bb5d9cdf1595a6
extra : amend_source : fda465d3aa6ed282bfa2b9542358ffd1cf2d1177
2014-11-20 14:25:52 -08:00
Nick Alexander
2f0ceadeca Bug 1102488 - Part 2: Don't preprocess GeckoLoader. r=rnewman
I replaced the compile-time ANDROID_PACKAGE_NAME with the run-time
context.getPackageName() for two reasons:

1) I claim this is more correct.  It's hard to imagine Fennec working
with ANDROID_PACKAGE_NAME != context.getPackageName(), but right here
we should use the run-time, not the build-time state.

2) GeckoLoader is part of GeckoView, and as such it shouldn't assume
anything about the package it's running as.

GeckoView consumers may ship for multiple architectures, so we
shouldn't assume anything about the build-time architecture, but the
reference to MOZ_CPU_ABI is purely diagnostic.  There are substantive
changes to make here; we'll cross that bridge some other time.

--HG--
extra : source : 48fc328377d41596900fa924b21378ba65a0df1f
2014-11-20 14:39:10 -08:00
Nick Alexander
5d43e7f247 Bug 1102488 - Part 1: Factor out constants JAR. r=rnewman
The constants JAR contains AppConstants and SysInfo.  SysInfo depended
on HardwareUtils for one function, which can (should?) be in SysInfo
anyway, so I moved it.

Both SysInfo and AppConstants should be available to Robocop tests,
but they are compiled too early to access RobocopTarget.  Since
nothing in GeckoView should know about GeckoView, I moved the
annotation to the Fennec-level proguard.cfg.

--HG--
extra : source : d2c14599cbab6c476465a6ba142c7c2501895cb3
2014-11-24 15:37:30 -08:00
Nick Alexander
ee0c6abe57 Bug 1102488 - Part 0: Make FxAccountConstants independent of Logger. r=rnewman
--HG--
extra : source : 8d1d39582e497c2c47400740304bdc98f0aef0a7
2014-11-20 15:07:35 -08:00
Nick Alexander
852a106c42 Bug 1102488 - Pre: Remove unused cruft. r=rnewman
I am thrilled that we no longer generate any Java files with "package
@ANDROID_PACKAGE_NAME@;".  Progress, a little at a time!

--HG--
extra : source : fa85f8d8b182fad743556a012a982daad121f0b1
2014-11-20 14:05:57 -08:00
Nick Alexander
dd3a9be3c2 Bug 1102339 - Don't generate widget/Themed*.java. r=rnewman
This lands the widget/Themed*.java sources into the tree and provides
a simple script for regenerating them in the source tree.  Use it
like:

<edit mobile/android/base/widget/ThemedView.java.frag>
$ ./mach python mobile/android/base/widget/generate_themed_views.py
$ hg diff
... changes to Themed*java

--HG--
extra : source : 4bcc69eb4a27db09b2423c52c22a0c07baffd7d0
2014-11-21 11:04:58 -08:00
Carsten "Tomcat" Book
4c9e3ef230 Backed out changeset 3c91378ef39b (bug 1102339) for suspicion of breaking non-Android builds on a CLOSED TREE 2014-11-25 08:43:36 +01:00
Carsten "Tomcat" Book
d3352efd24 Backed out changeset 5be12b2b704f (bug 1102488) 2014-11-25 08:42:58 +01:00
Carsten "Tomcat" Book
e6b8e2e9a1 Backed out changeset e3a52be782f7 (bug 1102488) 2014-11-25 08:42:57 +01:00
Carsten "Tomcat" Book
83d74e0363 Backed out changeset ae7b2705bfa7 (bug 1102488) 2014-11-25 08:42:55 +01:00
Carsten "Tomcat" Book
8f370481ce Backed out changeset 51e6a0c2187b (bug 1102488) 2014-11-25 08:42:54 +01:00
Carsten "Tomcat" Book
0bb3a967c9 Backed out changeset f264f1d096a1 (bug 1102488) 2014-11-25 08:42:50 +01:00
Richard Newman
1c2fb6a55c Bug 1101527 - Don't set locales after Gecko startup. r=nchen,bnicholson 2014-11-24 22:16:26 -08:00
Nick Alexander
8e81b7d007 Bug 1102488 - Part 3: Output preprocessed files into generated/preprocessed. r=rnewman
The preprocessed files, all of which are constant exports, are exposed
in the new constants JAR.

--HG--
extra : rebase_source : f82988bd98e2390889057982d322add509b2d1c9
extra : source : 05cf424592e66f30c9a6c92f07bb5d9cdf1595a6
2014-11-20 14:25:52 -08:00
Nick Alexander
e8f33cb1e8 Bug 1102488 - Part 2: Don't preprocess GeckoLoader. r=rnewman
I replaced the compile-time ANDROID_PACKAGE_NAME with the run-time
context.getPackageName() for two reasons:

1) I claim this is more correct.  It's hard to imagine Fennec working
with ANDROID_PACKAGE_NAME != context.getPackageName(), but right here
we should use the run-time, not the build-time state.

2) GeckoLoader is part of GeckoView, and as such it shouldn't assume
anything about the package it's running as.

GeckoView consumers may ship for multiple architectures, so we
shouldn't assume anything about the build-time architecture, but the
reference to MOZ_CPU_ABI is purely diagnostic.  There are substantive
changes to make here; we'll cross that bridge some other time.

--HG--
extra : rebase_source : 65b374746f1630fd7c7c201a50bc2ff9dd29090d
extra : source : 48fc328377d41596900fa924b21378ba65a0df1f
2014-11-20 14:39:10 -08:00
Nick Alexander
c0d969b9e7 Bug 1102488 - Part 1: Factor out constants JAR. r=rnewman
The constants JAR contains AppConstants and SysInfo.  SysInfo depended
on HardwareUtils for one function, which can (should?) be in SysInfo
anyway, so I moved it.

Both SysInfo and AppConstants should be available to Robocop tests,
but they are compiled too early to access RobocopTarget.  Since
nothing in GeckoView should know about GeckoView, I moved the
annotation to the Fennec-level proguard.cfg.

--HG--
extra : rebase_source : cdba5f056a41ec28f190dd7ebf82213a358cb3a8
extra : source : d2c14599cbab6c476465a6ba142c7c2501895cb3
2014-11-24 15:37:30 -08:00
Nick Alexander
e69d5e234f Bug 1102488 - Part 0: Make FxAccountConstants independent of Logger. r=rnewman
--HG--
extra : rebase_source : 5f85ea54b5afa611868c856a1027461d6c711b5f
extra : source : 8d1d39582e497c2c47400740304bdc98f0aef0a7
2014-11-20 15:07:35 -08:00
Nick Alexander
ad9821f977 Bug 1102488 - Pre: Remove unused cruft. r=rnewman
I am thrilled that we no longer generate any Java files with "package
@ANDROID_PACKAGE_NAME@;".  Progress, a little at a time!

--HG--
extra : rebase_source : f5211b309488adbab3ad47e63f1a3920093a85d8
extra : source : fa85f8d8b182fad743556a012a982daad121f0b1
2014-11-20 14:05:57 -08:00
Nick Alexander
4d3964dda8 Bug 1102339 - Don't generate widget/Themed*.java. r=rnewman
This lands the widget/Themed*.java sources into the tree and provides
a simple script for regenerating them in the source tree.  Use it
like:

<edit mobile/android/base/widget/ThemedView.java.frag>
$ ./mach python mobile/android/base/widget/generate_themed_views.py
$ hg diff
... changes to Themed*java

--HG--
extra : rebase_source : c32966b91ac0c1c5719532e3b558c123c3d02c7e
extra : source : 4bcc69eb4a27db09b2423c52c22a0c07baffd7d0
2014-11-21 11:04:58 -08:00