Commit Graph

12495 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
d34717a818 merge fx-team to mozilla-central 2014-03-13 12:52:51 +01:00
Wes Kocher
029a6912b6 Merge m-c to fx-team 2014-03-12 21:23:37 -07:00
Wes Kocher
4ec0bc82ff Merge fx-team to m-c 2014-03-12 20:01:45 -07:00
Wes Kocher
0a0d0ec03b Merge m-c to m-i 2014-03-12 21:21:07 -07:00
Geoff Brown
9057b2ea02 Bug 966788 - Increase wait time for Gecko:Ready; r=mcomella 2014-03-12 17:44:54 -06:00
Michael Comella
0d66c28321 Bug 959652: Use NativeCrypto.sha1. r=rnewman 2014-03-11 19:43:20 -07:00
Lucas Rocha
6ea7bb6e05 Bug 963817 - Wrap HomeStorage data insertion loop in a transaction (r=margaret) 2014-03-12 17:02:50 +00:00
Richard Newman
c546ece21d Bug 982191 - The resource://services-common/ alias is broken in Fennec. r=nalexander,lucasr 2014-03-12 09:52:50 -07:00
Richard Newman
88ff162ff8 Bug 945429 - Remove log output. r=trivial 2014-03-12 09:49:48 -07:00
Lucas Rocha
d2d33545cc Bug 969055 - Validate items being saved with HomeProvider API (r=margaret) 2014-03-12 16:37:02 +00:00
Chris Kitching
73c812f40f Bug 969417 - Cleanup naming conventions in favicon code. r=rnewman 2014-03-12 16:20:38 +00:00
Chris Kitching
6269828bc6 Bug 969417 - Reduce insanity in favicon cache concurrency. r=rnewman 2014-03-12 16:20:36 +00:00
Margaret Leibovic
ce76f17105 Bug 976232 - Disable home banner in guest mode. r=wesj 2014-03-12 08:57:30 -07:00
Margaret Leibovic
d7432105df Bug 979101 - Enable remote debugger by default on nightly builds. r=mfinkle 2014-03-12 08:57:30 -07:00
Margaret Leibovic
881bad74d7 Bug 976308 - Remove search engine name from initial search suggestions prompt. r=liuche 2014-03-12 08:57:30 -07:00
Margaret Leibovic
e3bd7a344e Bug 982461 - Support launching an intent to the current application package. r=wesj 2014-03-12 08:57:29 -07:00
Nick Alexander
afe2097583 Bug 974627 - Empty contentDescription throughout. r=rnewman 2014-03-10 21:35:32 -07:00
Nick Alexander
58d8245ff4 Bug 979537 - Make geckoview_resources.zip include res/values/strings.xml. r=trivial
The commit looks large, but it's trivial: just replacing $(android_res_files) with $(all_resources) in

+geckoview_resources.zip: $(all_resources) $(GLOBAL_DEPS)

It looks bigger because it needs to move below the definition of $(all_resources).
2014-03-12 17:22:27 -07:00
Nick Alexander
947f8f4ee9 Bug 979388 - Make aapt invocation rebuild R.java. r=glandium
This commit adds an empty recipe to dependencies of .aapt.deps, which
forces the appropriate gecko-R.jar rebuild.  This is because Make treats
targets with no recipe at all differently than targets with an empty
recipe, in a way that defeats our dependencies.

What appeared to be happening is the following:

Touch a resource.  On the next build, .aapt.deps is stale, so aapt is
invoked, which generates R.java, and we touch .aapt.deps.

Now R.java depends on .aapt.deps, but this does not appear to force Make
to consider targets that depend on R.java to be stale.  A target that
depends on R.java (such as gecko-R.jar) itself compares timestamps and
finds that gecko-R.jar is newer than R.java (from the previous build),
and this comparison appears to happen before aapt is invoked.  So even
though .aapt.deps is seen to be stale, and by transitivity R.java is
stale, this does not mark gecko-R.jar as stale.  The timestamp check
between R.java and gecko-R.jar appears to happen *before* aapt is
invoked.

On the second build following the update, the R.java generated in the
previous build is newer than gecko-R.jar, triggering the observed
rebuild of gecko-R.jar.
2014-03-12 17:22:27 -07:00
Nick Alexander
8d9f2b08c6 Bug 982138 - Ignore #* in aapt invocations in mobile/android/base. r=blassey 2014-03-12 17:22:27 -07:00
Myk Melez
cf0c6d5f85 bug 982182 - fix regressions that hang checking for updates for webapps; r=mfinkle 2014-03-12 11:57:45 -07:00
Myk Melez
fff999707e bug 982552 - use DEBUG variable to enable logging in debug build; r=mfinkle 2014-03-12 11:57:22 -07:00
Myk Melez
8fce8754bc bug 978836 - update URLs to production servers; r=mfinkle 2014-03-12 09:08:30 -07:00
Geoff Brown
ce2a83dd52 Bug 979612 - Fix testPictureLinkContextMenu on Android 2.3; r=margaret 2014-03-12 09:42:00 -06:00
Wes Johnston
fdd244be4a Bug 968182 - Hide the Android menu before reshowing it with a submenu. r=lucasr 2014-03-11 23:01:22 -07:00
Phil Ringnalda
150f4d599c Back out 9fe5610363b3 (bug 959652) for bustage 2014-03-11 21:53:43 -07:00
Michael Comella
8b88af61ae Bug 959652: Use NativeCrypto.sha1. r=rnewman 2014-03-11 19:43:20 -07:00
Chenxia Liu
b414674412 Bug 978825 - Add android:summary text to Customize > Search. r=sola 2014-03-11 18:59:37 -07:00
Chenxia Liu
b8615d5f11 Bug 970743 - Add android:summary text to Customize > Home. r=sola 2014-03-11 18:59:34 -07:00
Ryan VanderMeulen
3e8f19046e Merge m-c to fx-team. 2014-03-11 13:23:55 -07:00
Ryan VanderMeulen
1aad692a3f Merge fx-team to m-c. 2014-03-08 01:12:53 -08:00
Kartikaya Gupta
25986ec052 Bug 981728 - Fix missing close-paren. r=wesj 2014-03-11 08:07:23 -04:00
Lucas Rocha
c681979e9d Bug 981614 - Do a null check when handling toolbar focus change in HomePager (r=jdover) 2014-03-11 17:58:31 +00:00
Marcos Cezar
b1399961d1 Bug 956360 - Use Arrays.asList when possible. r=jchen 2014-03-04 14:32:47 -03:00
Carsten "Tomcat" Book
baa754509b Backed out changeset 922daaaeb05a (bug 974627) for permament android s4 test failure 2014-03-11 12:23:56 +01:00
Nick Alexander
8bb8a20f43 Bug 974627 - Empty contentDescription throughout. r=rnewman 2014-03-10 21:35:32 -07:00
Nick Alexander
f8696e1593 Bug 980478 - Generate assertions with no iat and exp: 9999999999999L. r=rnewman 2014-03-10 21:04:25 -07:00
Nick Alexander
c0e309ea5c Bug 915312 - Follow-up: Land background JUnit 3 tests. r=nalexander 2014-03-10 20:53:43 -07:00
Richard Newman
1cba8eb3c0 Bug 945429. r=wesj 2014-03-10 16:12:52 -07:00
Chenxia Liu
8c16249a71 Bug 977980 - Add "Remove" as an option for dynamic Home panels. r=margaret 2014-02-13 15:33:46 -08:00
Michael Comella
ad0ae1d33a Bug 976833 - Override JUnit methods in UITest. r=lucasr 2014-03-06 16:42:26 -08:00
Ryan VanderMeulen
1a40bbc7cf Merge fx-team to m-c. 2014-03-10 17:10:25 -04:00
Chenxia Liu
aecfef503f Bug 976925 - UI after adding a Home Panel from Settings. r=lucasr 2014-03-10 09:37:36 -07:00
Robert O'Callahan
f30bd3b5ac Bug 975931. Part 11: Make nsDOMWindowUtils::SetDisplayPortForElement take a priority parameter, and set that parameter to 1 in reftests to override automatic displayport selection. r=kats
--HG--
extra : rebase_source : 07dcbfb67cb2db0bbb26a959517bbbdebd84f10b
2014-03-08 22:25:15 +13:00
Josh Dover
1fc4414697 Bug 966047 - Hide banner when there are no panels enabled. r=lucasr 2014-02-24 17:05:52 -08:00
Eugen Sawin
af3bdbb80f Bug 981345 - Fix HelperApp callback regression. r=wesj 2014-03-10 03:06:53 +01:00
Phil Ringnalda
7e513c242e Merge f-t to m-c 2014-03-08 17:41:33 -08:00
Chenxia Liu
52b0828924 Bug 965606 - Part 2: Update tests for new string and nested preference panels. r=margaret 2014-03-07 15:28:56 -08:00
Chenxia Liu
1654eb58a4 Bug 965606 - Part 1: Give users the choice to only sync home panel data when on wifi. r=margaret 2014-03-07 15:28:51 -08:00
Chenxia Liu
bf75efda43 Bug 965606 - Part 0: Change home sync pref name, and type from boolean to ints. r=margaret 2014-03-07 15:28:48 -08:00