Richard Newman
d187c2df0b
Bug 969672 - Handle declined engines on Android. r=nalexander
2014-03-14 19:14:34 -07:00
Brad Lassey
a94b5a597b
Bug 983439 - Ignore mercurial merge conflict files in resources. r=nalexander
...
DONTBUILD
--HG--
extra : amend_source : 32264340bdabf2c66e71967e1f33158b9a5f5cde
2014-03-14 15:19:57 -07:00
Wes Johnston
771132da31
Bug 942270 - Add strings for context menu quickshare. r=mfinkle
2014-03-14 14:41:22 -07:00
Wes Johnston
5ee2b12ac7
Bug 942270 - Allow ActionViews in prompts. r=bnicholson
2014-03-14 14:41:20 -07:00
Wes Johnston
fda36db32f
Bug 942270 - Add intents to PromptListItems. r=bnicholson
2014-03-14 14:41:10 -07:00
Brian Nicholson
2147b9eb9b
Bug 983714 - Fix DynamicToolbar VisibilityTransition flags. r=lucasr
...
--HG--
extra : rebase_source : e318a3d6587716b5a44094d3be03b3d335610495
2014-03-14 10:57:13 -07:00
Wes Kocher
4fe0f80d08
Backed out changeset e7f7cc81c103 (bug 943262) for breaking Android S4 tests
2014-03-14 13:47:43 -07:00
Margaret Leibovic
c52e43433b
Bug 965622 - String for dynanmic panel empty view text. r=lucasr
2014-03-14 11:49:05 -07:00
Margaret Leibovic
1718215200
Bug 943262 - Use CharsetMenu.jsm instead of charsetTitles.properties for Character Encoding menu items. r=bnicholson
2014-03-14 11:41:47 -07:00
Margaret Leibovic
a9933dccf8
Bug 968640 - Lazy init HomeBanner using ViewStub. r=lucasr
...
--HG--
rename : mobile/android/base/resources/layout/home_banner.xml => mobile/android/base/resources/layout/home_banner_content.xml
2014-03-14 11:41:46 -07:00
Margaret Leibovic
f18cfdd4bf
Bug 976232 - Disable home banner in guest mode. r=wesj
2014-03-14 11:41:46 -07:00
David Rajchenbach-Teller
f239dd5dfa
Bug 961665 - Native implementation of OS.File.read, native bits. r=froydnj, r=bz, r=paolo
2014-03-14 10:13:26 -04:00
Sola Ogunsakin
37b3b73842
Bug 959297 - Get description and approx. reading time for reading list items. r=liuche, r=lucasr, r=margaret, r=rnewman
2014-03-12 14:53:25 -07:00
Carsten "Tomcat" Book
3c43258d50
merge fx-team to mozilla-central
2014-03-14 12:35:23 +01:00
Nick Alexander
4b632cb8dc
Bug 974015 - Replace "Firefox online services" with "Firefox cloud services". r=rnewman
2014-03-13 22:31:55 -07:00
Nick Alexander
857bfb9edb
Bug 974942 - Don't share link{tos,privacy} strings. r=rnewman
2014-03-13 22:31:55 -07:00
Nick Alexander
7ad54c64ba
Bug 974133 - Replace "Firefox account" with "Firefox Account". r=rnewman
2014-03-13 22:31:54 -07:00
Nick Alexander
a04e56d0d2
Bug 974129 - Part 2: use branding icon instead of fxaccount_icon. r=rnewman
2014-03-13 22:21:00 -07:00
Nick Alexander
e7ca01ceaf
Bug 974129 - Part 1: update fxaccount_intro drawable. r=rnewman
2014-03-13 22:21:00 -07:00
Nick Alexander
ccb50d9b6b
Bug 974124 - Update padding, margins, and color scheme in FxA setup. r=rnewman
2014-03-13 22:21:00 -07:00
Wes Kocher
99beccd7cb
Merge m-c to fx-team
2014-03-13 20:01:18 -07:00
Wes Kocher
c15c6c9b48
Merge fx-team to m-c
2014-03-13 19:09:07 -07:00
Nick Alexander
9ef788dd99
Bug 983350 - Include User-Agent header for FxAccount and TokenServer requests. r=rnewman
...
--HG--
extra : rebase_source : cb622c61646be2752e4900fd6e480874e9ba5406
2014-03-13 17:13:58 -07:00
Nick Alexander
1c79307779
Bug 967022 - Fix Gingerbread progressbar animation bustage. r=rnewman
...
--HG--
extra : rebase_source : 1db653efb3d0656b9208ade6859f86fb10f1be3b
2014-03-13 17:06:29 -07:00
Nick Alexander
a185fd8134
Bug 978944 - Use Android native code pbkdf2sha256 in FxAccounts. r=rnewman,mcomella
...
--HG--
extra : rebase_source : 73cc0d3b480246f64a07388caafda56465039bda
2014-03-13 17:04:45 -07:00
Wes Kocher
53b7c0d896
Merge m-c to inbound despite the CLOSED TREE
2014-03-13 19:58:47 -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
Richard Newman
75846416f7
Bug 982191 - The resource://services-common/ alias is broken in Fennec. r=nalexander,lucasr
2014-03-12 09:52:50 -07:00
Richard Newman
684cd20a21
Bug 945429 - Remove log output. r=trivial
2014-03-12 09:49:48 -07: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
412f8103fe
Bug 979101 - Enable remote debugger by default on nightly builds. r=mfinkle
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
