Commit Graph

5745 Commits

Author SHA1 Message Date
Ed Morley
0b1136e92f Merge latest green inbound changeset and mozilla-central 2014-01-07 16:21:27 +00:00
Nick Alexander
e40661b7ee Merge m-c to s-c 2014-01-08 10:06:43 -08:00
Nick Alexander
78568ed450 Bug 955808 - Follow-up: Fix bustage. r=me 2014-01-07 20:29:18 -08:00
Nick Alexander
0f43b8d63f Bug 955808 - Implement Android Firefox Account client that speaks "onepw" protocol. r=rnewman 2014-01-07 18:27:47 -08:00
Nick Alexander
5153580c03 Bug 956816 - Implement (de)serializing Android BrowserIDKeyPair instances. r=rnewman 2014-01-07 18:27:45 -08:00
Nick Alexander
9bc5ad14e9 Bug 956935 - Follow-up: Fix bustage. r=me 2014-01-07 18:07:44 -08:00
Richard Newman
d4d51fed98 Bug 956935 - Include supported Sync protocol versions in Android client records. r=nalexander
--HG--
extra : amend_source : 67f9f5156f6e7a39a056cd5ef145a4fd10ec0b74
2014-01-07 15:24:36 -08:00
Richard Newman
5a29e6c29b Bug 956443 - Include version in Android Sync client records. r=nalexander 2014-01-06 15:07:55 -08:00
Isura Edirisinghe
57afe3eeb8 Bug 943703 - Moved helper initialization to a separate static function. 2014-01-06 14:50:38 -08:00
Mark Finkle
1e60cbe811 Bug 955870 - Backout unwanted part of patch r=me 2014-01-04 09:51:58 -05:00
Richard Newman
fcd9c25641 Bug 953993. 2014-01-03 14:48:28 -08:00
Eduard Neculaesi
a38ae8a2bd Bug 923238: Cancel update download on notification swype; r=snorp 2014-01-03 18:58:59 +02:00
Ehsan Akhgari
37b2774903 Bug 956783 - Stop using NULL in Fennec's JNI code; r=jchen 2014-01-06 15:21:27 -05:00
Veeti Paananen
45623ec7cf Bug 952789 - Use a Holo progress bar in sync initialization on v11+. r=nalexander 2013-12-22 02:59:43 +02:00
Mark Finkle
646c00af5e Bug 955870 - Cache the array length in IsRecentlyVisitedURI r=blassey 2014-01-02 14:36:06 -05:00
Richard Newman
52886259c9 Bug 955805 - Normalize locale codes appropriately for each subsystem. r=mfinkle 2013-12-31 12:35:14 -08:00
Mark Finkle
11f1ef0ff9 Bug 952894 - Browser search and feed discovery tests r=rnewman 2013-12-28 22:15:09 -05:00
Mark Finkle
5f07023e42 Bug 952894 - Use existing triggers to clear open search engines state r=rnewman 2013-12-28 22:14:13 -05:00
Mark Finkle
bd543be5d3 Bug 938571 - Add discovery support for second-screen devices (test) r=rnewman 2013-12-27 17:25:45 -05:00
Richard Newman
75b8be13af Bug 952878 - Eliminate shadow layer. r=kats 2013-12-26 00:39:23 -08:00
Richard Newman
70b9f2a6ef Bug 952799 - GeckoAppShell.getProxyForURI can be expensive during a pageload. r=mfinkle 2013-12-23 11:09:25 -08:00
Wes Kocher
d2d2c65cbe Merge fx-team to m-c 2013-12-20 18:28:28 -08:00
Sriram Ramasubramanian
7b3965c550 Bug 940997: Show submenu indicator for MenuItemActionBar. [r=mfinkle] 2013-12-20 14:51:53 -08:00
Jim Chen
51b031ffd0 Bug 945521 - Make sure button text type is consistent with keyboard text type; r=mcomella 2013-12-20 17:48:59 -05:00
Tim Taubert
10b26b16ea merge m-c to elm 2013-12-20 15:05:28 +01:00
Carsten "Tomcat" Book
ac8e72b838 Backed out changeset b84baa03b9d1 (bug 868341) for mochitest -4 and bc testfailures 2013-12-20 12:42:16 +01:00
Tim Taubert
4be4a6b411 merge m-c to elm 2013-12-19 15:52:32 +01:00
Carsten "Tomcat" Book
86a8ff528e merge fx-team to mozilla-central 2013-12-19 10:33:37 +01:00
Wes Kocher
27882a0c96 Merge inbound to m-c 2013-12-18 20:49:25 -08:00
Nick Alexander
f3e1df9bbf Bug 951883 - Part 1: Revert name of BrowserProvider. r=me
--HG--
extra : rebase_source : 554a609e6b114e1ac490a4d0136cb1b9d74e68fa
2013-12-18 14:45:38 -08:00
Margaret Leibovic
d20f8b65c7 Bug 951605 - Fix identified/verified image reversal. r=mfinkle 2013-12-18 11:39:18 -08:00
Richard Newman
b7e3b5e1a2 Bug 938153 - Selectively display the globe favicon placeholder when favicon fetches take long enough to be noticeable. r=mfinkle 2013-12-18 11:37:41 -08:00
Sriram Ramasubramanian
4eacb610fb Bug 940997: Remove icons from main menu. [r=mfinkle] 2013-12-18 18:49:53 -08:00
Sriram Ramasubramanian
1afde7867d Bug 940997: Support showAsAction "ifRoom" in custom menu. [r=mfinkle] 2013-12-18 18:49:48 -08:00
Sriram Ramasubramanian
1e4e22d217 Bug 940997: Reorganize primary controls in main menu. [r=mfinkle] 2013-12-18 18:46:42 -08:00
Ryan VanderMeulen
f9c9cd95de Backed out changesets 72a80fc289f2, 30258cd308b5, and c572890f16a2 (bug 910189) for robocop orange. 2013-12-18 20:37:16 -05:00
Tim Taubert
f96735c7a9 merge m-c to elm 2013-12-18 17:54:23 +01:00
Margaret Leibovic
0e226a2407 Bug 950919 - (Part 3) Create utility StringUtils.getQueryParameter. r=mcomella 2013-12-17 22:43:31 -08:00
Margaret Leibovic
0081055c48 Bug 950919 - (Part 2) Get rid of "aboutHomePage" flag. r=mcomella 2013-12-17 22:43:31 -08:00
Margaret Leibovic
13b249a325 Bug 950919 - (Part 1) Get rid of loadHomePage method. r=mcomella 2013-12-17 22:43:30 -08:00
Richard Newman
a9b2628d78 Bug 947261 - Ensure that mActionItemBarPresenter is removed from the menu when cleared. r=sriram 2013-12-17 20:44:14 -08:00
Nick Alexander
c411aab8f5 Bug 899217 - Part 2: Connect about:accounts to FirefoxAccountsHelper. r=rnewman 2013-12-17 15:14:57 -08:00
Nick Alexander
e8c1441b27 Bug 918012 - Sync with FxAccount and token server. r=rnewman 2013-12-17 15:13:43 -08:00
Margaret Leibovic
aa7199b207 Bug 949181 - Update robocop tests to get rid of dependency on HomePager.Page. r=mcomella 2013-12-17 13:34:13 -08:00
Margaret Leibovic
805f5eb154 Bug 949181 - Get rid of the Page enum in HomePager. r=wesj 2013-12-17 13:34:10 -08:00
Nick Alexander
cd00e5e46f Merge m-c to elm 2013-12-17 13:31:03 -08:00
Wes Johnston
348ee881e7 Bug 947281 - Fix calcuations for how many actionbar items to show. r=sriram,margaret 2013-12-17 09:41:55 -08:00
Wes Kocher
933d7a440a Merge m-c to fx-team 2013-12-16 21:35:20 -08:00
Margaret Leibovic
8b8147ed57 Bug 949208 - Don't use reflection to get database name in robocop tests. r=wesj 2013-12-16 16:18:56 -08:00
Nick Alexander
3bf2796013 Merge m-c to elm 2013-12-16 09:13:10 -08:00
Nick Alexander
c61eeef9d2 Bug 949880 - Refactor Android Sync's SyncAdapter for FxAccount use. r=rnewman
--HG--
extra : rebase_source : 28937855c499bb621458b15424ac67378e43f9db
2013-12-15 15:53:59 -08:00
Nick Alexander
19db3a26ae Bug 923950 - Fix Android single locale repacks. r=glandium
There are two parts to this.  The first is to add AndroidManifest.xml
as a dependency to the "no dependencies" ap_ built during packaging.
The aapt call requires it.  So "no dependencies" is more accurately
"no *resource* dependencies".

The second is to avoid including the Android res/ directory in the
language repack step.  What happens is that the l10n.py script sees
the Android res/ files left in the dist/ directory after unpacking and
expects to find them in the objdir.  They're not there, so the script
fails.  To avoid this, we delete them after unpacking.  See the
comments in packager.mk describing this process.

--HG--
extra : rebase_source : 35c3c125dddcd575c1a5e8ad58f9aa13ff2db4c3
2013-12-14 15:36:17 -08:00
Ryan VanderMeulen
c173096f45 Merge inbound to m-c. 2013-12-16 16:58:27 -05:00
Kartikaya Gupta
831e00fbf5 Bug 949132 - Use the FrameMetrics flag on the layers update to update APZC scroll offset instead of tracking it in widget code. r=Cwiiis 2013-12-16 12:04:46 -05:00
Nick Alexander
51c2e9cbfe Merge m-c to elm
--HG--
rename : mobile/android/base/resources/drawable-mdpi/crash_reporter.png => mobile/android/base/crashreporter/res/drawable-mdpi/crash_reporter.png
rename : mobile/android/base/resources/layout/crash_reporter.xml => mobile/android/base/crashreporter/res/layout/crash_reporter.xml
rename : mobile/android/branding/aurora/content/fennec_72x72.png => mobile/android/branding/aurora/res/drawable-hdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_48x48.png => mobile/android/branding/aurora/res/drawable-mdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_96x96.png => mobile/android/branding/aurora/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_144x144.png => mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_72x72.png => mobile/android/branding/beta/res/drawable-hdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_48x48.png => mobile/android/branding/beta/res/drawable-mdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_96x96.png => mobile/android/branding/beta/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_144x144.png => mobile/android/branding/beta/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_72x72.png => mobile/android/branding/nightly/res/drawable-hdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_48x48.png => mobile/android/branding/nightly/res/drawable-mdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_96x96.png => mobile/android/branding/nightly/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_144x144.png => mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_72x72.png => mobile/android/branding/official/res/drawable-hdpi/icon.png
rename : mobile/android/branding/official/content/fennec_48x48.png => mobile/android/branding/official/res/drawable-mdpi/icon.png
rename : mobile/android/branding/official/content/fennec_96x96.png => mobile/android/branding/official/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_144x144.png => mobile/android/branding/official/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_72x72.png => mobile/android/branding/unofficial/res/drawable-hdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_48x48.png => mobile/android/branding/unofficial/res/drawable-mdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_96x96.png => mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_144x144.png => mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png
2013-12-12 08:21:15 -08:00
Benoit Jacob
993600d299 Bug 950203 - Correctly handle EGL_NO_SURFACE result from eglCreateWindowSurface - r=kats 2013-12-18 15:49:11 -05:00
Carsten "Tomcat" Book
9a8b0c002e merge fx-team to mozilla-central 2013-12-12 13:28:08 +01:00
Brad Lassey
1d3ea22488 bug 868341 - pinch to zoom jumps all over page randomly r=mfinkle,kats 2013-12-12 01:43:44 -05:00
Chenxia Liu
8561a1e301 Bug 910189: Part 3 - Restore default search engines (no dialog). r=margaret 2013-12-20 10:35:48 -08:00
Chenxia Liu
123800a73f Bug 910189: Part 2 - Enable removing of default engines. r=margaret 2013-12-20 10:35:10 -08:00
Chenxia Liu
41bf24c887 Bug 910189: Part 1 - Add "restore defaults" hooks into settings. r=margaret
--HG--
rename : mobile/android/base/resources/xml/preferences_search.xml => mobile/android/base/resources/xml-v11/preferences_search.xml
2013-12-20 10:35:10 -08:00
Brad Lassey
14764a85a4 bug 868341 - pinch to zoom jumps all over page randomly r=mfinkle,kats 2013-12-12 01:43:44 -05:00
Wes Kocher
fd7afdc87f Merge m-c to fx-team 2013-12-19 19:53:30 -08:00
Michael Comella
3941474d7c Bug 946656 - Correct regex that determines a loading page in WaitHelper. r=margaret 2013-12-19 19:49:02 -08:00
Wes Kocher
f8ab24ed0d Merge fx-team to m-c 2013-12-19 19:09:04 -08:00
Margaret Leibovic
f00554bdfa Bug 862805 - API to allow add-ons to register custom lists on about:home. r=wesj 2013-12-19 14:51:10 -08:00
Margaret Leibovic
5c02e88abb Bug 941318 - Tests for HomeListsProvider. r=wesj 2013-12-19 14:51:09 -08:00
Margaret Leibovic
a7d8706c72 Bug 941318 - Create content provider to store home lists data. r=wesj 2013-12-19 14:51:09 -08:00
Chenxia Liu
892809e3fa Bug 910189: Part 3 - Restore default search engines (no dialog). r=margaret 2013-12-18 15:21:14 -08:00
Chenxia Liu
ce9dce990b Bug 910189: Part 2 - Enable removing of default engines. r=margaret 2013-12-18 15:21:14 -08:00
Chenxia Liu
5422a0417c Bug 910189: Part 1 - Add "restore defaults" hooks into settings. r=margaret
--HG--
rename : mobile/android/base/resources/xml/preferences_search.xml => mobile/android/base/resources/xml-v11/preferences_search.xml
2013-12-18 15:21:14 -08:00
Brad Lassey
e35d4527cf bug 944104 - support creating a GeckoView programmatically, follow up to have just one LayerView constructor r=mfinkle 2013-12-11 21:03:56 -05:00
Lucas Rocha
03f47d073e Bug 945212 - Encapsulate identity data/security mode behind a type-safe API (r=margaret) 2013-12-12 00:28:15 +00:00
Lucas Rocha
f9cbf23895 Bug 943915 - Encapsulate button click listener in SiteIdentityPopup (r=wesj) 2013-12-12 00:28:14 +00:00
Lucas Rocha
dac6b31421 Bug 943915 - Change SiteIdentityPopup's API to be package-scoped (r=wesj) 2013-12-12 00:28:14 +00:00
Lucas Rocha
a080391f5b Bug 943915 - Encapsulate SiteIdentityPopup into BrowserToolbar (r=wesj) 2013-12-12 00:28:14 +00:00
Lucas Rocha
8944238fc5 Bug 943915 - Remove 'a' prefix from arguments in ArrowPopup/SiteIdentityPopup (r=wesj) 2013-12-12 00:28:14 +00:00
Lucas Rocha
ebb6ea8721 Bug 943915 - Add ArrowPopup constructor without anchor view argument (r=wesj) 2013-12-12 00:28:14 +00:00
Lucas Rocha
26762edcd2 Bug 943915 - Move SiteIdentityPopup to the toolbar package (r=wesj)
--HG--
rename : mobile/android/base/SiteIdentityPopup.java => mobile/android/base/toolbar/SiteIdentityPopup.java
2013-12-12 00:28:14 +00:00
Lucas Rocha
942d7bb2ac Bug 943915 - Small cleanup on the use of Resources in ArrowPopup (r=wesj) 2013-12-12 00:28:13 +00:00
Lucas Rocha
afb973f9c7 Bug 943915 - Move DoorHanger to the widget package (r=wesj)
--HG--
rename : mobile/android/base/DoorHanger.java => mobile/android/base/widget/DoorHanger.java
2013-12-12 00:28:13 +00:00
Lucas Rocha
dc6a70e75b Bug 943915 - Make DoorHanger's API public (r=wesj) 2013-12-12 00:28:13 +00:00
Michael Comella
1b0fadd1d4 Bug 947550 - Use Robotium side swipe methods. r=margaret 2013-12-11 14:31:55 -08:00
Nick Alexander
4eb068477b Merge m-c to elm 2013-12-11 14:08:02 -08:00
Nick Alexander
6fade1ad27 Bug 934646 - Part 3: Declare Android resource directories relative to $SRCDIR. r=glandium,gps,mfinkle
--HG--
rename : mobile/android/base/resources/drawable-mdpi/crash_reporter.png => mobile/android/base/crashreporter/res/drawable-mdpi/crash_reporter.png
rename : mobile/android/base/resources/layout/crash_reporter.xml => mobile/android/base/crashreporter/res/layout/crash_reporter.xml
rename : mobile/android/branding/aurora/content/fennec_72x72.png => mobile/android/branding/aurora/res/drawable-hdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_48x48.png => mobile/android/branding/aurora/res/drawable-mdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_96x96.png => mobile/android/branding/aurora/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/aurora/content/fennec_144x144.png => mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_72x72.png => mobile/android/branding/beta/res/drawable-hdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_48x48.png => mobile/android/branding/beta/res/drawable-mdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_96x96.png => mobile/android/branding/beta/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/beta/content/fennec_144x144.png => mobile/android/branding/beta/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_72x72.png => mobile/android/branding/nightly/res/drawable-hdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_48x48.png => mobile/android/branding/nightly/res/drawable-mdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_96x96.png => mobile/android/branding/nightly/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/nightly/content/fennec_144x144.png => mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_72x72.png => mobile/android/branding/official/res/drawable-hdpi/icon.png
rename : mobile/android/branding/official/content/fennec_48x48.png => mobile/android/branding/official/res/drawable-mdpi/icon.png
rename : mobile/android/branding/official/content/fennec_96x96.png => mobile/android/branding/official/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/official/content/fennec_144x144.png => mobile/android/branding/official/res/drawable-xxhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_72x72.png => mobile/android/branding/unofficial/res/drawable-hdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_48x48.png => mobile/android/branding/unofficial/res/drawable-mdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_96x96.png => mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png
rename : mobile/android/branding/unofficial/content/fennec_144x144.png => mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png
extra : rebase_source : f6ec8a38594e70520b10202c735dc019f8c856fd
2013-12-11 21:20:07 -08:00
Nick Alexander
e3dc10d7c3 Bug 934646 - Part 2: Replace hard-coded Android resource ID. r=mfinkle
--HG--
extra : rebase_source : f37370654b9bb59573c4703c5f097ff792b3f037
2013-12-11 21:16:55 -08:00
Nick Alexander
e634dd0b92 Bug 934646 - Part 1: Delete unused resources. r=mfinkle
--HG--
extra : rebase_source : 0cb4e5f30e54971b912706f5eaba8c8284b5a6ec
2013-12-11 21:16:54 -08:00
Ryan VanderMeulen
ec34e0fb19 Merge inbound to m-c. 2013-12-11 13:32:11 -05:00
Nick Alexander
17885804f2 Merge m-c to elm 2013-12-11 10:25:40 -08:00
Ryan VanderMeulen
789c341d29 Backed out changeset 0aeb846dc2e7 (bug 846340) for causing frequent testMasterPassword failures (bug 915449). 2013-12-11 08:51:02 -05:00
Carsten "Tomcat" Book
a7a7bbcfe5 merge fx-team to mozilla-central 2013-12-11 10:15:44 +01:00
Geoff Brown
e5708621ad Bug 948591 - Disable testClearPrivateData on Android x86 for too many intermittent failures 2013-12-10 19:34:58 -07:00
Geoff Brown
4db5bb07b0 Bug 907768 - Disable testSearchSuggestions on Android x86 for too many intermittent failures 2013-12-10 19:34:56 -07:00
Wes Kocher
d3ea48a878 Merge inbound to m-c 2013-12-10 16:42:47 -08:00
Wes Johnston
9da681c2b2 Bug 948157 - Use custom style for native action bar. r=sriram 2013-12-10 10:51:23 -08:00
Wes Johnston
381eadd30d Bug 947793 - Change clipboard manager hasText implementation to directly query the android clipboardservice. r=jchen 2013-12-10 10:46:13 -08:00
Richard Newman
fb6845b990 Bug 932092 - Part 2: support natively sending UI telemetry events from Java. r=mfinkle 2013-12-10 10:41:34 -08:00
Ryan VanderMeulen
6fb3114a62 Merge m-c to inbound. 2013-12-10 15:48:16 -05:00
Michael Comella
7a2f204cff Bug 947527 - Correct waitForPageIndex output per device. r=margaret 2013-12-09 17:52:36 -08:00
Stefan Sobering
f45491b9cd Bug 947610 - Fix spelling error in "remember password" string. r=mcomella 2013-12-10 10:29:38 -05:00