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
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
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
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
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
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
Chenxia Liu
aecfef503f
Bug 976925 - UI after adding a Home Panel from Settings. r=lucasr
2014-03-10 09:37:36 -07:00
Josh Dover
1fc4414697
Bug 966047 - Hide banner when there are no panels enabled. r=lucasr
2014-02-24 17:05:52 -08: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
Margaret Leibovic
0ba3702041
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
9340c5e3cb
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
fb14cfd655
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
6f36203ce2
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
8251570776
Backed out changeset 749fb9b52dd7 (bug 976833) for robocop failures on all platforms.
...
CLOSED TREE
2014-03-07 13:37:27 -05:00
Brian Nicholson
316891bb1b
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
aac13e9cd1
Bug 967742 - Consolidate API to edit HomeConfig state (r=margaret)
2014-03-07 17:15:31 +00:00
Brian Nicholson
011e23061a
Bug 980438 - Make progress bar thinner and darker. r=lucsar
2014-03-07 09:03:42 -08:00
Michael Comella
9138d9db48
Bug 976833 - Override JUnit methods in UITest. r=lucasr
2014-03-07 08:52:55 -08:00
Wes Johnston
ea8906afbc
Bug 960146. r=kats
2014-03-07 08:32:22 -08:00
Wes Kocher
d3d8e5c1b7
Merge m-c to inbound
2014-03-07 17:39:52 -08:00
Geoff Brown
b62934170a
Bug 945395 - Disable testSessionOOMSave on Android 2.3
2014-03-07 17:24:40 -07:00
Geoff Brown
a6c529d0f9
Bug 981173 - Wait for Gecko:Ready in testReadingListProvider; r=sola
2014-03-07 17:24:40 -07:00
Chris Lord
93b2803217
Bug 960146. r=kats,wesj
2014-02-20 09:36:48 -05:00
Chenxia Liu
0562cf517c
Bug 973039 - Display message in HomePanelPicker when no Home panels are available for install. r=margaret
2014-02-13 11:46:48 -08:00
Michael Comella
c522b37410
Bug 976775 - Rename AssertionHelper assertions to fAssert*. r=lucasr
2014-03-06 15:50:52 -08:00
Wes Johnston
813a5a6742
Bug 942611 - Fix missing parameter qualifier. r=rewman CLOSED TREE
2014-03-06 12:57:42 -08:00
Wes Johnston
3e39c7a326
Bug 942611 - Delete old temp files onPause. r=rnewman
2014-03-06 12:23:54 -08:00
Wes Johnston
0a4cbfd9e5
Bug 942611 - Delete temp files when tabs are closed. r=rewman
2014-03-06 12:23:53 -08:00
Wes Johnston
ac6930af6b
Bug 942611 - Store temp files in Android's cache dir. r=rewman
2014-03-06 12:23:52 -08:00
Michael Comella
ff16f92fd3
Bug 915312 - Part 4: Test native crypto. r=rnewman,nalexander
2014-03-06 12:10:54 -08:00
Michael Comella
66ca6de297
Bug 915312 - Part 3: Add NativeCrypto Java interface. r=nalexander
2014-03-06 12:10:54 -08:00
Margaret Leibovic
bd2470a3f6
Bug 965822 - Add null check to HomeListView.setOnItemClickListener. r=lucasr
2014-03-06 09:25:02 -08:00
Brian Nicholson
c117dc481c
Backout d8018c23945a for NPE failures
2014-03-05 15:35:40 -08:00
Brian Nicholson
0733c05983
Bug 979166 - Refactor dynamic toolbar code. r=lucasr
...
--HG--
extra : rebase_source : 9080c2ba012e608134f084cb5186195446ecad85
2014-03-05 11:07:04 -08:00
Ryan VanderMeulen
bf8677e172
Merge m-c to fx-team.
2014-03-05 16:06:46 -05:00
Ryan VanderMeulen
24057b1ac1
Merge b2g-inbound to m-c.
2014-03-05 16:01:53 -05:00
Nick Alexander
774881c0de
Bug 978587 - Make GeckoView package org.mozilla.gecko; don't include org.mozilla.gecko.R. r=blassey
...
This builds a new Java JAR containing only org.mozilla.gecko.R. This
new JAR file is included in Fennec, but not included in
geckoview_library. (Usually ant, gradle, or Eclipse arranges to produce
org.mozilla.gecko.R but not include it in the classes.jar output as part
of a library project. This mimics that.)
Changing the GeckoView package to org.mozilla.gecko declares to
consuming applications that they should produce org.mozilla.gecko.R,
replacing what was removed above (but with correct resource IDs).
2014-03-05 08:57:09 -08:00
Jim Chen
509a8a56c8
Bug 975436 - Catch ClassCastException in ANRReporter. r=blassey
2014-03-05 09:05:21 -05:00
Christopher Su
f200495f75
Bug 943629 - Remove unnecessary comment in Tabs. r=mcomella
2014-03-05 09:05:07 -05:00
Carsten "Tomcat" Book
1096a4e1d3
merge mozilla-inbound to mozilla-central
2014-03-05 13:04:39 +01:00
Richard Newman
eea1085ad4
Bug 966143 - Don't attempt to process a malformed password record. r=nalexander
2014-03-04 14:38:11 -08:00
Brian Nicholson
27a8872b57
Bug 976006 - Update bookmark star when page is saved. r=wesj
2014-03-04 13:00:00 -08:00
Brian Nicholson
fe8983494f
Bug 962103 - Make progress bar overlap content. r=lucasr
2014-03-04 12:57:23 -08:00
Richard Newman
26b96c3a40
Bug 961238 - Follow-up: eliminate BrowserContract dependency on DBUtils. r=trivial, DONTBUILD
2014-03-04 12:18:26 -08:00
Chenxia Liu
a82e0e66bd
Bug 942878 - Part 2: Add panel to settings. r=lucasr
2014-03-04 10:31:38 -08:00
Chenxia Liu
f74c00144d
Bug 942878 - Part 1: Expose public method for adding panels to HomeConfig. r=lucasr
2014-03-04 10:31:38 -08:00
Chenxia Liu
7372b0819f
Bug 942878 - Part 0: Add final modifier to GeckoPreferences. r=lucasr
2014-03-04 10:31:37 -08:00
Lucas Rocha
1e54d4ddf4
Bug 975841 - Bootstrap schema upgrade path in HomeProvide.jsm (r=margaret)
2014-03-04 16:57:43 +00:00
Lucas Rocha
16c687aee6
Backed out changeset 70bccf82bbfa (forgot to add reviewer)
2014-03-04 16:54:32 +00:00
Lucas Rocha
79303570de
Bug 975841 - Bootstrap schema upgrade path in HomeProvide.jsm
2014-03-04 16:52:13 +00:00
Wes Johnston
b203bc6384
Bug 967254 - Delay Webapp Uninstall code till delayed startup. r=rnewman
2014-03-04 08:35:39 -08:00
Wes Johnston
1aa3bc5d5b
Bug 974289 - Fixup test for FilePicker results. r=lucasr
2014-03-04 08:29:26 -08:00
Josh Dover
3fdd0bd9a1
Bug 978741 - Fix tab strip on tablets. r=margaret
2014-03-03 13:23:38 -08:00
Sola Ogunsakin
eff6c416c8
Bug 959290 - Test for ReadingListProvider. r=mcomella
2014-03-03 14:37:13 -08:00
Sola Ogunsakin
9a823d286e
Bug 959290 - Make ContentProvider for Reading List. r=lucasr
2014-03-03 15:34:57 -08:00
Wes Kocher
f21338a89e
Merge m-c to fx-team
2014-03-03 20:39:02 -08:00
Wes Kocher
8d4c76f215
Merge inbound to m-c
2014-03-03 20:25:51 -08:00
Brian Nicholson
3570152784
Bug 979038 - Disable testAboutHomePageNavigation. r=mcomella
2014-03-03 19:43:56 -08:00
Brian Nicholson
d42f1f43f3
Bug 977669 - Rename save subscribe ID. r=mfinkle
2014-03-03 19:41:37 -08:00
Richard Newman
cb8f846fac
Bug 707123 - Part 1: refactor GeckoProfileDirectories out of GeckoProfile. r=nalexander
2014-03-03 15:27:42 -08:00
Nick Alexander
3c513a93ce
Bug 977358 - Replace status activity header with 'Signed in as'. r=rnewman
2014-03-03 15:20:20 -08:00
Nick Alexander
ab430ae56e
Bug 972051 - Dismiss 'Tap to sign in' notification when a sync succeeds. r=rnewman
2014-03-03 15:20:19 -08:00
Nick Alexander
268834ff74
Bug 977336 - Support action bar 'up' for FxAccountStatusActivity. r=rnewman
2014-03-03 15:20:19 -08:00
Nick Alexander
95f95fcaf1
Bug 974134 - Improve FxAccountStatusActivity layout. r=rnewman
2014-03-03 15:20:19 -08:00
Brad Lassey
bd2b95251d
Bug 962606 - Suggestions are present for password field, switch to use text transforms to reveal text. r=nalexander
2014-03-03 15:20:18 -08:00
Ryan VanderMeulen
02dbe5998e
Backed out changeset 7e424486f60e (bug 950417) for adding new attack surface.
2014-03-03 17:48:12 -05:00
Ryan VanderMeulen
ee46e14cf6
Merge m-c to inbound.
2014-03-03 17:23:35 -05:00
Ed Morley
5ff4c55018
Backed out changeset 1eebddd614eb (bug 962103) for causing bug 947550
...
--HG--
extra : rebase_source : 809b725149264001d341469ebae420aa19911af4
2014-03-03 17:01:01 +00:00
Ed Morley
dbe5856d2c
Merge mozilla-central and fx-team
2014-03-03 14:53:17 +00:00
Ed Morley
8362582b2a
Merge latest green inbound changeset and mozilla-central
2014-03-03 14:44:44 +00:00
Lucas Rocha
f7e14b1d7c
Bug 971214 - Use setBackgroundDrawable() in BasicColorPicker (r=wesj)
2014-03-03 14:16:58 +00:00
Margaret Leibovic
cd4684579d
Bug 977155 - (Part 2) Rename HomeBanner setEnabled to setActive. r=bnicholson
2014-02-28 17:26:54 -08:00
Margaret Leibovic
4b866008e2
Bug 977155 - Don't animate HomeBanner when it's not visible. r=bnicholson
2014-02-28 17:26:51 -08:00
Brian Nicholson
c473029d0c
Backout ab25dcdc319b (bug 960146) for touch event regressions
2014-02-28 13:26:08 -08:00