Commit Graph

6383 Commits

Author SHA1 Message Date
Brian Nicholson
dfc7896cba Bug 983714 - Fix DynamicToolbar VisibilityTransition flags. r=lucasr
--HG--
extra : rebase_source : e318a3d6587716b5a44094d3be03b3d335610495
2014-03-14 10:57:13 -07:00
Margaret Leibovic
90bedb8c0a Bug 965622 - String for dynanmic panel empty view text. r=lucasr 2014-03-14 11:49:05 -07:00
Margaret Leibovic
ee989016e8 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
aa8c8c9bd3 Bug 976232 - Disable home banner in guest mode. r=wesj 2014-03-14 11:41:46 -07:00
Sola Ogunsakin
93a0a6fc56 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
329f44908d merge fx-team to mozilla-central 2014-03-14 12:35:23 +01:00
Nick Alexander
2df97e60e4 Bug 974015 - Replace "Firefox online services" with "Firefox cloud services". r=rnewman 2014-03-13 22:31:55 -07:00
Nick Alexander
84254e1bf9 Bug 974942 - Don't share link{tos,privacy} strings. r=rnewman 2014-03-13 22:31:55 -07:00
Nick Alexander
abc9c865fa Bug 974133 - Replace "Firefox account" with "Firefox Account". r=rnewman 2014-03-13 22:31:54 -07:00
Nick Alexander
67e35078ef Bug 974129 - Part 2: use branding icon instead of fxaccount_icon. r=rnewman 2014-03-13 22:21:00 -07:00
Nick Alexander
15f8909f54 Bug 974129 - Part 1: update fxaccount_intro drawable. r=rnewman 2014-03-13 22:21:00 -07:00
Nick Alexander
62b2b2d7cb Bug 974124 - Update padding, margins, and color scheme in FxA setup. r=rnewman 2014-03-13 22:21:00 -07:00
Wes Kocher
7f98e4a5a3 Merge m-c to fx-team 2014-03-13 20:01:18 -07:00
Wes Kocher
2699402763 Merge fx-team to m-c 2014-03-13 19:09:07 -07:00
Nick Alexander
220e4b14a1 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
3dca6ed1e7 Bug 967022 - Fix Gingerbread progressbar animation bustage. r=rnewman
--HG--
extra : rebase_source : 1db653efb3d0656b9208ade6859f86fb10f1be3b
2014-03-13 17:06:29 -07:00
Nick Alexander
88410dfa28 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
caa28d2de5 Merge m-c to inbound despite the CLOSED TREE 2014-03-13 19:58:47 -07:00
Geoff Brown
5e2b296e25 Bug 983440 - Disable testInputConnection on Android 2.3 2014-03-13 16:59:01 -06:00
Brian Nicholson
1eb97bd369 Bug 981676 - Fix backout of bugs 980438/962103. r=mfinkle 2014-03-13 14:42:19 -07:00
Brian Nicholson
227a3af635 Bug 979166 - Refactor dynamic toolbar code. r=lucasr
--HG--
extra : rebase_source : 665621241d47985699a6994a8aea989ac29f9f7e
2014-03-13 12:29:39 -07:00
Myk Melez
533afe4db0 bug 970300 - singly-stringify JSON message; correct apkPackageName property name; r=mfinkle 2014-03-13 12:01:55 -07:00
Carsten "Tomcat" Book
210cd1a4c5 merge fx-team to mozilla-central 2014-03-13 12:52:51 +01:00
Wes Kocher
ed2f101c5e Merge m-c to fx-team 2014-03-12 21:23:37 -07:00
Wes Kocher
7312341e00 Merge fx-team to m-c 2014-03-12 20:01:45 -07:00
Wes Kocher
750ae8d03a Merge m-c to m-i 2014-03-12 21:21:07 -07:00
Geoff Brown
99c44e0bad Bug 966788 - Increase wait time for Gecko:Ready; r=mcomella 2014-03-12 17:44:54 -06:00
Michael Comella
6712a23792 Bug 959652: Use NativeCrypto.sha1. r=rnewman 2014-03-11 19:43:20 -07:00
Lucas Rocha
9fa56eee26 Bug 963817 - Wrap HomeStorage data insertion loop in a transaction (r=margaret) 2014-03-12 17:02:50 +00:00
Lucas Rocha
98f01b68cf Bug 969055 - Validate items being saved with HomeProvider API (r=margaret) 2014-03-12 16:37:02 +00:00
Chris Kitching
9f39bb3965 Bug 969417 - Cleanup naming conventions in favicon code. r=rnewman 2014-03-12 16:20:38 +00:00
Chris Kitching
cbd6b5d32a Bug 969417 - Reduce insanity in favicon cache concurrency. r=rnewman 2014-03-12 16:20:36 +00:00
Margaret Leibovic
43c8c5a29d Bug 976232 - Disable home banner in guest mode. r=wesj 2014-03-12 08:57:30 -07:00
Margaret Leibovic
74bc61e71f Bug 976308 - Remove search engine name from initial search suggestions prompt. r=liuche 2014-03-12 08:57:30 -07:00
Margaret Leibovic
d9cd3b607a Bug 982461 - Support launching an intent to the current application package. r=wesj 2014-03-12 08:57:29 -07:00
Nick Alexander
3c03fd89c9 Bug 974627 - Empty contentDescription throughout. r=rnewman 2014-03-10 21:35:32 -07:00
Nick Alexander
64a0ca57e1 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
73597cec4f 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
cdb00293f7 Bug 982138 - Ignore #* in aapt invocations in mobile/android/base. r=blassey 2014-03-12 17:22:27 -07:00
Myk Melez
e13a7fbcbd bug 982182 - fix regressions that hang checking for updates for webapps; r=mfinkle 2014-03-12 11:57:45 -07:00
Geoff Brown
904fde05b1 Bug 979612 - Fix testPictureLinkContextMenu on Android 2.3; r=margaret 2014-03-12 09:42:00 -06:00
Wes Johnston
e4b83e36cc Bug 968182 - Hide the Android menu before reshowing it with a submenu. r=lucasr 2014-03-11 23:01:22 -07:00
Phil Ringnalda
705f4106e6 Back out 9fe5610363b3 (bug 959652) for bustage 2014-03-11 21:53:43 -07:00
Michael Comella
8764c2cc6f Bug 959652: Use NativeCrypto.sha1. r=rnewman 2014-03-11 19:43:20 -07:00
Chenxia Liu
90d6aa8bae Bug 978825 - Add android:summary text to Customize > Search. r=sola 2014-03-11 18:59:37 -07:00
Chenxia Liu
f40cffecd3 Bug 970743 - Add android:summary text to Customize > Home. r=sola 2014-03-11 18:59:34 -07:00
Lucas Rocha
11952f1928 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
fa09f6da3c Bug 956360 - Use Arrays.asList when possible. r=jchen 2014-03-04 14:32:47 -03:00
Carsten "Tomcat" Book
99003657a9 Backed out changeset 922daaaeb05a (bug 974627) for permament android s4 test failure 2014-03-11 12:23:56 +01:00
Nick Alexander
d7f178526f Bug 974627 - Empty contentDescription throughout. r=rnewman 2014-03-10 21:35:32 -07:00