Граф коммитов

16671 Коммитов

Автор SHA1 Сообщение Дата
Ryan VanderMeulen b3caa9d676 Merge fx-team to m-c. a=merge 2015-06-04 09:24:15 -04:00
Michael Comella 709461b539 Bug 1170884 - Use fully qualified android.R.*. r?nalexander
--HG--
extra : commitid : 9i43WGzFYQC
extra : rebase_source : dc7c94bd70bbe5671c851d3d20d695d8a0ff91b0
2015-06-02 18:21:38 -07:00
Michael Comella c2cb17e8bd Bug 1170884 - Call super from sub-class. r?nalexander
--HG--
extra : commitid : 9kAIEk2zBZI
extra : rebase_source : 58f5481dc0c2b5243680a23b9aceade9f5bae2f9
2015-06-02 18:19:23 -07:00
Michael Comella 2f9cdc52ae Bug 1170285 - Add lint.xml config file to base sub-project. r?nalexander
While it might seem like a good idea to disable all of the checks we don't
currently pass, Intellij uses the same lint configuration file as the
command-line invocation and so we'll be more likely to write in new errors by
disabling some checks.

--HG--
extra : commitid : 23gdgWSBmyt
extra : source : 7bd754d48b86b5104bc44067886af81c9315a3b6
2015-06-03 21:12:00 -07:00
Ryan VanderMeulen 3f344dd200 Merge m-c to fx-team. a=merge 2015-06-03 16:06:53 -04:00
Ryan VanderMeulen 2b848889f8 Merge inbound to m-c. a=merge 2015-06-03 15:55:09 -04:00
Ryan VanderMeulen 60a5912cdf Merge b2g-inbound to m-c. a=merge 2015-06-03 15:50:54 -04:00
"Chris AtLee" 20d207a6a3 Bug 1171040: Enable MOZ_AUTOMATION_UPLOAD_SYMBOLS for android nightly builds r=ted a=RyanVM
--HG--
extra : amend_source : 681921575b721ee7b1148472d386f669d8f7627d
2015-06-03 11:45:10 -04:00
Michael Comella a028b2a171 Bug 1170289 - Set default search engine favicon to magnifying glass. r?Margaret
This doesn't work for the Settings screen (bug 1170346).

--HG--
extra : commitid : 4Nfxo9FZGRp
extra : rebase_source : 0246d346d8ba5c21624d9bbfa26f14d6c30d37fd
2015-06-01 15:33:11 -07:00
Michael Comella 48cbb5d34a Bug 1170289 - Use ImageView in the search engine bar. r?Margaret
--HG--
extra : commitid : 9rVBKmrEgRW
extra : rebase_source : 41fe934b76765adb1343b42eb933d5098b439ca7
2015-06-01 14:18:36 -07:00
Michael Comella 0db8477d19 Bug 1170289 - Backout Bug 1166868 (changeset b73de443b580 & fefa03e0fb9d). r?Margaret
These patches added complexity that we're removing by implementing this bug.

--HG--
extra : commitid : LqUrYf52Qbo
extra : rebase_source : 3ef8e5fc5059c6aa6d28d2fc5a2cca2381904986
2015-06-01 14:16:55 -07:00
Nick Alexander 97786c5695 Bug 1169476 -- Implement |mach robocop --serve|. r=gbrown
This adds a flag to |mach robocop| that does everything to run a
Robocop test except launch the actual test.  Instead of launching the
test, it starts the mochi.test server and launches Fennec with a test
profile; then it sits and waits forever.

This allows regular Java IDEs (IntelliJ, but previously Eclipse) to
run Robocop tests like regular instrumentation tests, "injecting" them
into the prepared testing environment.  It's quite nice!

--HG--
extra : rebase_source : a5ab08222110a20291aebe70ef1fda0d340dbe7d
extra : source : e91ac9a35f86928fcd519911476ee7d68d06f921
2015-05-29 17:18:07 -07:00
James Willcox 1da727fb41 Bug 1165460 - Prefer GCC 4.9 for Fennec builds r=glandium 2015-06-03 10:26:17 -05:00
James Willcox 67934908db Bug 1165460 - Build Fennec using NDK r10e r=coop 2015-06-03 10:26:17 -05:00
James Willcox 1ce3362cf0 Bug 1141693 - Build and use a PIE plugin-container on Android 5.0+. Based on a patch by Mike Hommey. r=me,glandium 2015-06-03 10:26:16 -05:00
Allison Naaktgeboren dd5bb481cf Bug 1065004 - Provide an option to always open tabs in Private Browsing, amendment.r=liuche 2015-06-02 14:37:20 -07:00
Chenxia Liu baa049f3de Bug 1147064 - Undeleted Layout inflation line. r=me
--HG--
extra : rebase_source : 4d688f667f5c4c8f9024581e75c68f105d3efd47
2015-06-02 13:37:40 -07:00
Chenxia Liu 3e3053e5f8 Bug 1147064 - Clean up misc styling from feedback. r=margaret
--HG--
extra : rebase_source : 6870de7210326a16b5cb84b250686fc612ef88c7
2015-05-22 17:23:56 -07:00
Chenxia Liu 49c60847cc Bug 1147064 - Handle callback ids for Login doorhanger dialogs. r=margaret
--HG--
extra : rebase_source : f46658e7964eaa8439375e455f8c2e51b254c580
2015-05-22 16:04:25 -07:00
Chenxia Liu 7e9f5ee98a Bug 1147064 - Add colored buttons. r=margaret
--HG--
rename : mobile/android/base/resources/drawable/action_bar_button.xml => mobile/android/base/resources/drawable/action_bar_button_negative.xml
rename : mobile/android/base/resources/drawable/action_bar_button.xml => mobile/android/base/resources/drawable/action_bar_button_positive.xml
extra : rebase_source : 08e43c3b74635ca769eacda59e282d898b6f60c2
2015-05-21 16:27:38 -07:00
Ryan VanderMeulen 67ab30de60 Merge m-c to inbound. a=merge 2015-06-03 16:02:11 -04:00
Eitan Isaacson 2d65260813 Bug 879791 - Don't send touchscreen hover events to gecko when accessibility is disabled. r=kats 2015-06-03 13:00:34 -07:00
Liang-Heng Chen 7397b7309f Bug 1115480 - Part 1: Implement XPCOM module for mDNSProvider. r=mcmanus 2015-05-20 23:06:00 -04:00
Chenxia Liu 95171a3069 Bug 1147064 - Add positive/negative to buttons. r=margaret
--HG--
extra : rebase_source : 4b94763957288a5f7dca559d6ad8cd798033125b
2015-05-18 17:40:30 -07:00
Chenxia Liu 3cf5991a56 Bug 1147064 - Make negative/positive button order consistent. r=margaret
--HG--
extra : rebase_source : f08c887231cbbba5492c520f4c4bdced6f5306a2
2015-04-09 16:04:21 -07:00
Chenxia Liu 4d6cdda90b Bug 1147064 - Remove extra layer of layout for overdraw. r=margaret
--HG--
extra : rebase_source : 2a607fd18a293104c5b4a4f30f9cf5adff48dbe9
2015-05-15 15:47:26 -07:00
Chenxia Liu 61e89877b0 Bug 1147064 - Abstract out shared doorhanger layout. r=margaret
--HG--
rename : mobile/android/base/resources/layout/doorhanger.xml => mobile/android/base/resources/layout/default_doorhanger.xml
extra : rebase_source : 3d2547b501a7f69cef6585549d97f85e36bb444d
2015-05-27 15:48:17 -07:00
Nick Alexander 380f58055f Bug 1170332 - Fix |mach robocop SINGLE_TEST|. r=ahal,gbrown
This patch declares robocop.ini an instrumentation manifest.  It's not
currently possible to declare tests that don't correspond to files, so
we include the .java extension.  (This could be revisited.)

In |mach robocop|, we use the generic test resolving infrastructure to
select the 'instrumentation'/'robocop' flavor/subsuite tests.  In
|runtestsremote.py|, we fall back to robocop.ini, as we always have.

--HG--
extra : rebase_source : b84246ab327c7ec576d82cc4b516e729978600c7
extra : histedit_source : 9b23a6f66e6422e5f334f31cea2a21036be45543
2015-06-01 14:45:48 -07:00
Carsten "Tomcat" Book aa8d92d1f3 merge mozilla-inbound to mozilla-central a=merge 2015-06-02 13:11:05 +02:00
Phil Ringnalda 9e83975a1c Back out 7 changesets (bug 1147064) for NullPointerExceptions
Backed out changeset 1e9ce9823fd0 (bug 1147064)
Backed out changeset 17d997c1e1dc (bug 1147064)
Backed out changeset cb76155407ab (bug 1147064)
Backed out changeset 3194afdcbb92 (bug 1147064)
Backed out changeset 87af8d27e784 (bug 1147064)
Backed out changeset fd6e15eb81c3 (bug 1147064)
Backed out changeset 1175733ce0bb (bug 1147064)
2015-06-01 21:40:01 -07:00
Chenxia Liu 1777c77eb9 Bug 1147064 - Clean up misc styling from feedback. r=margaret
--HG--
extra : rebase_source : 1ed91a5eb9363d6b74d282f20d8c1027bbf1d826
2015-05-22 17:23:56 -07:00
Chenxia Liu fca65dd78a Bug 1147064 - Handle callback ids for Login doorhanger dialogs. r=margaret
--HG--
extra : rebase_source : 00b1700f83df1c895624fcd37bb8d5265667a34e
2015-05-22 16:04:25 -07:00
Chenxia Liu 1c22922d11 Bug 1147064 - Add colored buttons. r=margaret
--HG--
rename : mobile/android/base/resources/drawable/action_bar_button.xml => mobile/android/base/resources/drawable/action_bar_button_negative.xml
rename : mobile/android/base/resources/drawable/action_bar_button.xml => mobile/android/base/resources/drawable/action_bar_button_positive.xml
extra : rebase_source : 97993af4535466dab48aeeffcc16d7b03ba9d475
2015-05-21 16:27:38 -07:00
Chenxia Liu dd1651bdcf Bug 1147064 - Add positive/negative to buttons. r=margaret
--HG--
extra : rebase_source : 23f2ad93fd34773c307774de20a74d5f953cc1cb
2015-05-18 17:40:30 -07:00
Ted Mielczarek 180da81c71 bug 1162060 - add Socorro auth token to Android and B2G mozconfigs. r=mshal
--HG--
extra : rebase_source : 45ee7f81b60e7e0148ce1ee941614df5c445f04a
2015-05-28 07:14:49 -04:00
Carsten "Tomcat" Book a723ed3ad7 Backed out changeset e91ac9a35f86 (bug 1169476) for android rc2 crashes 2015-06-01 09:38:42 +02:00
Carsten "Tomcat" Book d0850d8e88 Backed out changeset 4fd1a129d197 (bug 1169476) 2015-06-01 09:37:46 +02:00
Nick Alexander 00b7126412 Bug 1169476 - Add missing import. r=bustage 2015-05-29 17:18:07 -07:00
Nick Alexander f242708503 Bug 1169476 -- Implement |mach robocop --serve|. r=gbrown
This adds a flag to |mach robocop| that does everything to run a
Robocop test except launch the actual test.  Instead of launching the
test, it starts the mochi.test server and launches Fennec with a test
profile; then it sits and waits forever.

This allows regular Java IDEs (IntelliJ, but previously Eclipse) to
run Robocop tests like regular instrumentation tests, "injecting" them
into the prepared testing environment.  It's quite nice!

--HG--
extra : rebase_source : 15e9e8d5c311312e2eb317936e5d154237c1f9a3
extra : histedit_source : 050ac958ae8580f45e5011a0d353bf13e65d5ff3
2015-05-25 14:27:21 -07:00
Richard Newman d1cbd8b4e6 Bug 1169393 - Move Adjust-related stuff to AdjustConstants. r=nalexander 2015-05-29 15:52:42 -07:00
Ryan VanderMeulen 012e20629b Merge inbound to m-c. a=merge 2015-05-29 16:58:30 -04:00
Randall Barker a0e0215561 Bug 1159830 - Autophone - webappstartup should not use console.log to output WEBAPP STARTUP COMPLETE. r=snorp, r=froydnj 2015-05-29 09:58:04 -04:00
Ryan VanderMeulen 2e35b1209f Merge inbound to m-c. a=merge 2015-05-29 09:32:46 -04:00
Ryan VanderMeulen 7e7f8b187e Merge fx-team to m-c. a=merge 2015-05-29 09:20:52 -04:00
Andrew Osmond 52c7f139a7 Bug 1169342 - Remove nsIDOMDeviceStorage. Cleanup nsDOMDeviceStorage event wrappers. r=dhylands 2015-05-28 18:53:16 -04:00
Richard Newman 94b4232195 Bug 1061273 - Pre: add 20+ to Versions. DONTBUILD 2015-05-28 15:22:08 -07:00
Nick Alexander c5c780a826 No bug - Don't let Gradle incrementally dex. r=me
DONTBUILD NPOTB

Unfortunately, Gradle just can't handle incremental dexing in our
multi-project and parallel configuration.  I see the dreaded
"com.android.dex.DexException: Multiple dex files define ..." error
frequently.

I'm using a downloaded Robotium package instead of the in-tree JAR
file as well, 'cuz it seems to be related.

--HG--
extra : rebase_source : d95c0844082a6deb48966496cb90824f70f6c49d
extra : histedit_source : 2f3d231d9b7139880a924089ab0d523e5e31e6b6
2015-05-24 19:51:22 -07:00
Dipti Nirmale d90ddbc18f Bug 1116668 - Don't do file access on every call to getGuestProfile. r=rnewman 2015-05-28 09:17:35 -07:00
Ryan VanderMeulen 59f347edf4 Backed out changesets 07cc8095956b and f591bbfa5dbf (bug 1159753) for Android debug mochitest crashes.
CLOSED TREE
2015-05-28 09:20:19 -04:00
Martyn Haigh 37de01dfa1 Bug 1159753 - Remove unused import (r=self)
--HG--
extra : amend_source : b50bab2d7c19808eaadb02edf6782c4cc141afba
2015-05-28 10:18:05 +01:00