Commit Graph

6367 Commits

Author SHA1 Message Date
Wes Kocher
53b7c0d896 Merge m-c to inbound despite the CLOSED TREE 2014-03-13 19:58:47 -07:00
Wes Kocher
c15c6c9b48 Merge fx-team to m-c 2014-03-13 19:09:07 -07:00
Geoff Brown
25da3175dc Bug 983440 - Disable testInputConnection on Android 2.3 2014-03-13 16:59:01 -06:00
Brian Nicholson
0546683495 Bug 981676 - Fix backout of bugs 980438/962103. r=mfinkle 2014-03-13 14:42:19 -07:00
Brian Nicholson
e172cd6e2d Bug 979166 - Refactor dynamic toolbar code. r=lucasr
--HG--
extra : rebase_source : 665621241d47985699a6994a8aea989ac29f9f7e
2014-03-13 12:29:39 -07:00
Myk Melez
2b0848ec69 bug 970300 - singly-stringify JSON message; correct apkPackageName property name; r=mfinkle 2014-03-13 12:01:55 -07:00
Carsten "Tomcat" Book
0b804927d7 merge fx-team to mozilla-central 2014-03-13 12:52:51 +01:00
Wes Kocher
93661497bd Merge m-c to fx-team 2014-03-12 21:23:37 -07:00
Wes Kocher
c317000cea Merge fx-team to m-c 2014-03-12 20:01:45 -07:00
Wes Kocher
a15b6e2f00 Merge m-c to m-i 2014-03-12 21:21:07 -07:00
Geoff Brown
ce7ca57333 Bug 966788 - Increase wait time for Gecko:Ready; r=mcomella 2014-03-12 17:44:54 -06:00
Michael Comella
35f2b81da7 Bug 959652: Use NativeCrypto.sha1. r=rnewman 2014-03-11 19:43:20 -07:00
Lucas Rocha
c31092879c Bug 963817 - Wrap HomeStorage data insertion loop in a transaction (r=margaret) 2014-03-12 17:02:50 +00:00
Lucas Rocha
5c4f78a4b3 Bug 969055 - Validate items being saved with HomeProvider API (r=margaret) 2014-03-12 16:37:02 +00:00
Chris Kitching
f04ac8d0be Bug 969417 - Cleanup naming conventions in favicon code. r=rnewman 2014-03-12 16:20:38 +00:00
Chris Kitching
c1031fa21d Bug 969417 - Reduce insanity in favicon cache concurrency. r=rnewman 2014-03-12 16:20:36 +00:00
Margaret Leibovic
84d368e508 Bug 976232 - Disable home banner in guest mode. r=wesj 2014-03-12 08:57:30 -07:00
Margaret Leibovic
44400adb7f Bug 976308 - Remove search engine name from initial search suggestions prompt. r=liuche 2014-03-12 08:57:30 -07:00
Margaret Leibovic
7f5ad9821b Bug 982461 - Support launching an intent to the current application package. r=wesj 2014-03-12 08:57:29 -07:00
Nick Alexander
d225664e41 Bug 974627 - Empty contentDescription throughout. r=rnewman 2014-03-10 21:35:32 -07:00
Nick Alexander
2a693e3f20 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
28663ebee3 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
fbd080396b Bug 982138 - Ignore #* in aapt invocations in mobile/android/base. r=blassey 2014-03-12 17:22:27 -07:00
Myk Melez
ff45f79479 bug 982182 - fix regressions that hang checking for updates for webapps; r=mfinkle 2014-03-12 11:57:45 -07:00
Geoff Brown
ddd528ae7b Bug 979612 - Fix testPictureLinkContextMenu on Android 2.3; r=margaret 2014-03-12 09:42:00 -06:00
Wes Johnston
4bac935c13 Bug 968182 - Hide the Android menu before reshowing it with a submenu. r=lucasr 2014-03-11 23:01:22 -07:00
Phil Ringnalda
e2781e6a10 Back out 9fe5610363b3 (bug 959652) for bustage 2014-03-11 21:53:43 -07:00
Michael Comella
707bc99a8a Bug 959652: Use NativeCrypto.sha1. r=rnewman 2014-03-11 19:43:20 -07:00
Chenxia Liu
844c16ae38 Bug 978825 - Add android:summary text to Customize > Search. r=sola 2014-03-11 18:59:37 -07:00
Chenxia Liu
4fbdf37462 Bug 970743 - Add android:summary text to Customize > Home. r=sola 2014-03-11 18:59:34 -07:00
Lucas Rocha
bfab5d4467 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
2bd31ee6d0 Bug 956360 - Use Arrays.asList when possible. r=jchen 2014-03-04 14:32:47 -03:00
Carsten "Tomcat" Book
78ca955c60 Backed out changeset 922daaaeb05a (bug 974627) for permament android s4 test failure 2014-03-11 12:23:56 +01:00
Nick Alexander
779536081c Bug 974627 - Empty contentDescription throughout. r=rnewman 2014-03-10 21:35:32 -07:00
Nick Alexander
0952880137 Bug 980478 - Generate assertions with no iat and exp: 9999999999999L. r=rnewman 2014-03-10 21:04:25 -07:00
Chenxia Liu
40f9a95f82 Bug 977980 - Add "Remove" as an option for dynamic Home panels. r=margaret 2014-02-13 15:33:46 -08:00
Michael Comella
84db67d001 Bug 976833 - Override JUnit methods in UITest. r=lucasr 2014-03-06 16:42:26 -08:00
Chenxia Liu
a8ce1fcb55 Bug 976925 - UI after adding a Home Panel from Settings. r=lucasr 2014-03-10 09:37:36 -07:00
Josh Dover
9a954e8950 Bug 966047 - Hide banner when there are no panels enabled. r=lucasr 2014-02-24 17:05:52 -08:00
Phil Ringnalda
29c6781b1d Merge f-t to m-c 2014-03-08 17:41:33 -08:00
Chenxia Liu
e25c1e0bfa 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
5d411bd290 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
Margaret Leibovic
f2bd7a57c1 Bug 975469 - Remove sync promo banner from rotation after it has been tapped. r=bnicholson 2014-03-07 11:23:27 -08:00
Margaret Leibovic
d6625e0444 Bug 975239 - (Part 4) Don't show the banner again for the rest of the app lifetime after the user taps the close button. r=bnicholson 2014-03-07 11:23:27 -08:00
Margaret Leibovic
687be40d19 Bug 975239 - (Part 3) Refactor HomeBanner.handleMessage to handle being called multiple times. r=bnicholson 2014-03-07 11:23:27 -08:00
Margaret Leibovic
a23eb66424 Bug 975239 - (Part 2) Request a home banner message when the HomePager loads. r=bnicholson 2014-03-07 11:23:27 -08:00
Ryan VanderMeulen
eacebe7794 Backed out changeset 749fb9b52dd7 (bug 976833) for robocop failures on all platforms.
CLOSED TREE
2014-03-07 13:37:27 -05:00
Brian Nicholson
388bc5f140 Bug 976426 - Update progress on LOCATION_CHANGE and LOADED only if tab is loading. r=lucasr 2014-03-07 09:54:52 -08:00
Lucas Rocha
b1450f701e Bug 967742 - Consolidate API to edit HomeConfig state (r=margaret) 2014-03-07 17:15:31 +00:00
Brian Nicholson
f9b8beb9cd Bug 980438 - Make progress bar thinner and darker. r=lucsar 2014-03-07 09:03:42 -08:00