Commit Graph

200691 Commits

Author SHA1 Message Date
Wes Kocher
63303a6c9b Merge fx-team to m-c a=merge 2014-08-22 16:17:12 -07:00
Nick Alexander
a51594a4be Bug 1026005 - Bustage follow-up: Include support library v4 in background JUnit 3 tests. r=bustage
CLOSED TREE
2014-08-22 11:40:16 -07:00
Wes Johnston
60db093ada Bug 1046537 - Better error handling from chromecast code. r=mfinkle 2014-08-22 11:20:02 -07:00
Nick Alexander
df6f6ffb85 Bug 1026005 - Create Loader for querying/updating Accounts status. r=mcomella
========

3cd96669bc
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Mon Aug 18 17:43:24 2014 -0700

    Bug 1026005 - Review comments.

========

5aefe1f716
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Mon Jun 16 11:16:16 2014 -0700

    Bug 1026005 - Part 2: Add AccountLoader.

========

61bc36bd7d
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Mon Jun 16 11:12:37 2014 -0700

    Bug 1026005 - Part 1: Add and broadcast ACCOUNT_STATE_CHANGED_ACTION.

========

9d80df0aa7
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Mon Aug 18 17:42:11 2014 -0700

    Bug 1026005 - Pre: Allow testing with |mvn integration-test|.

    This avoids errors like:

    W dalvikvm(24082)             Class resolved by unexpected DEX: Lorg/mozilla/gecko/fxa/AccountLoader;(0x42c13358):0x75440000 ref [Landroid/support/v4/content/AsyncTaskLoader;] Landroid/support/v4/content/AsyncTaskLoader;(0x42c13358):0x74a71000
    W dalvikvm(24082)             (Lorg/mozilla/gecko/fxa/AccountLoader; had used a different Landroid/support/v4/content/AsyncTaskLoader; during pre-verification)
    W dalvikvm(24082)             Unable to resolve superclass of Lorg/mozilla/gecko/fxa/AccountLoader; (247)
    W dalvikvm(24082)             Link of class 'Lorg/mozilla/gecko/fxa/AccountLoader;' failed
    E dalvikvm(24082)             Could not find class 'org.mozilla.gecko.fxa.AccountLoader', referenced from method org.mozilla.gecko.background.fxa.TestAccountLoader.testInitialLoad
    W dalvikvm(24082)             VFY: unable to resolve new-instance 1299 (Lorg/mozilla/gecko/fxa/AccountLoader;) in Lorg/mozilla/gecko/background/fxa/TestAccountLoader;
    D dalvikvm(24082)             VFY: replacing opcode 0x22 at 0x0005
    W dalvikvm(24082)             Class resolved by unexpected DEX: Lorg/mozilla/gecko/fxa/AccountLoader;(0x42c13358):0x75440000 ref [Landroid/support/v4/content/AsyncTaskLoader;] Landroid/support/v4/content/AsyncTaskLoader;(0x42c13358):0x74a71000
    W dalvikvm(24082)             (Lorg/mozilla/gecko/fxa/AccountLoader; had used a different Landroid/support/v4/content/AsyncTaskLoader; during pre-verification)
    W dalvikvm(24082)             Unable to resolve superclass of Lorg/mozilla/gecko/fxa/AccountLoader; (247)
    W dalvikvm(24082)             Link of class 'Lorg/mozilla/gecko/fxa/AccountLoader;' failed
    D dalvikvm(24082)             DexOpt: unable to opt direct call 0x1df8 at 0x07 in Lorg/mozilla/gecko/background/fxa/TestAccountLoader;.testInitialLoad
    I TestRunner(24082)           started: testInitialLoad(org.mozilla.gecko.background.fxa.TestAccountLoader)
    I TestRunner(24082)           failed: testInitialLoad(org.mozilla.gecko.background.fxa.TestAccountLoader)
    I TestRunner(24082)           ----- begin exception -----
    I TestRunner(24082)
    I TestRunner(24082)           java.lang.NoClassDefFoundError: org.mozilla.gecko.fxa.AccountLoader
    I TestRunner(24082)           	at org.mozilla.gecko.background.fxa.TestAccountLoader.testInitialLoad(TestAccountLoader.java:145)
    I TestRunner(24082)           	at java.lang.reflect.Method.invokeNative(Native Method)
    I TestRunner(24082)           	at java.lang.reflect.Method.invoke(Method.java:525)
    I TestRunner(24082)           	at android.test.InstrumentationTestCase.runMethod(InstrumentationTestCase.java:214)
    I TestRunner(24082)           	at android.test.InstrumentationTestCase.runTest(InstrumentationTestCase.java:199)
    I TestRunner(24082)           	at android.test.ActivityInstrumentationTestCase2.runTest(ActivityInstrumentationTestCase2.java:192)
    I TestRunner(24082)           	at junit.framework.TestCase.runBare(TestCase.java:134)
    I TestRunner(24082)           	at junit.framework.TestResult$1.protect(TestResult.java:115)
    I TestRunner(24082)           	at junit.framework.TestResult.runProtected(TestResult.java:133)
    I TestRunner(24082)           	at junit.framework.TestResult.run(TestResult.java:118)
    I TestRunner(24082)           	at junit.framework.TestCase.run(TestCase.java:124)
    I TestRunner(24082)           	at android.test.AndroidTestRunner.runTest(AndroidTestRunner.java:191)
    I TestRunner(24082)           	at android.test.AndroidTestRunner.runTest(AndroidTestRunner.java:176)
    I TestRunner(24082)           	at android.test.InstrumentationTestRunner.onStart(InstrumentationTestRunner.java:554)
    I TestRunner(24082)           	at android.app.Instrumentation$InstrumentationThread.run(Instrumentation.java:1738)
    I TestRunner(24082)           ----- end exception -----
    I TestRunner(24082)           finished: testInitialLoad(org.mozilla.gecko.background.fxa.TestAccountLoader)
2014-08-22 11:15:38 -07:00
Nick Alexander
8e348d97bb Bug 1056227 - Don't always go back to status after updating Firefox Account credentials. r=mcomella
========

1c4a5d5c13
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Wed Aug 20 10:53:40 2014 -0700

    Bug 1056227 - Don't always go back to status after updating Firefox Account credentials.

    This was a simple oversight.  With embedded links to update your
    credentials in Fennec's Remote Tabs interfaces, just returning to where
    you came from is the right thing to do.
2014-08-22 11:15:31 -07:00
Nick Alexander
4b65eb310a Bug 1056225 - Part 2: Lift onConfigurationChanged to HomeFragment. r=margaret
I took the most commented version.  There are two things to note here:

* Several panels did not define onConfigurationChanged.  It's not clear
  if these panels didn't need it (after some analysis?) or if they just
  didn't copy-paste thoroughly.  This version is always safe, if
  inefficient, and I've commented to say as much.

* The order of operations for the Bookmarks panel may be delicate.  I
  did not preserve the original order (save stack first, then detach and
  attach); it appears to not be necessary to save the stack first,
  because the configuration change is completed before the containing
  Activity is restarted (and the stack is restored).  I tested that the
  folder stack was preserved across device rotations locally.
2014-08-22 11:10:06 -07:00
Nick Alexander
7442afcedc Bug 1056225 - Part 1: Lift mUrlOpenListener to HomeFragment. r=margaret 2014-08-22 11:10:05 -07:00
Nigel Babu
470d8f98a7 Backed out changeset d53b90e407ce (bug 1042196) for bustage on localized builds 2014-08-22 13:36:17 +05:30
Wes Kocher
f1bff82d6f Merge inbound to m-c a=merge 2014-08-21 18:22:11 -07:00
Wes Kocher
c918e97aaa Merge b2g-inbound to m-c a=merge 2014-08-21 17:57:44 -07:00
Wes Kocher
34b2f35fc3 Merge fx-team to m-c a=merge 2014-08-21 17:44:40 -07:00
B2G Bumper Bot
a8b884c829 Bumping manifests a=b2g-bump 2014-08-21 15:26:21 -07:00
B2G Bumper Bot
44c72c7ec8 Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/670b42b547f8
Author: Francisco Jordano <fjordano@mozilla.com>
Desc: Bug 1042730 - Use better icons when bookmarking and searching places r=daleharvey
2014-08-21 15:20:30 -07:00
B2G Bumper Bot
fffd9fdab4 Bumping manifests a=b2g-bump 2014-08-21 15:11:24 -07:00
B2G Bumper Bot
e55586dea3 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/758bbdda6bb7
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #23128 from KevinGrandon/bug_1056469_rocketbar_use_template_literals

Bug 1056469 - [Rocketbar] Use template literals for app chrome

========

https://hg.mozilla.org/integration/gaia-central/rev/0cf4ee6bc207
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1056469 - [Rocketbar] Use template literals for app chrome r=kgrandon
2014-08-21 15:05:32 -07:00
B2G Bumper Bot
cc4bf13e36 Bumping manifests a=b2g-bump 2014-08-21 14:11:24 -07:00
B2G Bumper Bot
89d2e89776 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/32ac0bda8e19
Author: Ian Liu <iliu@mozilla.com>
Desc: Merge pull request #16981 from ian-liu/settings/bug943825_mount/unmount_sdcard

Bug 943825 - [Gaia] Mount/Unmount SD card, r=@alive, arthur

========

https://hg.mozilla.org/integration/gaia-central/rev/0ecca91e899c
Author: ian-liu <iliu@mozilla.com>
Desc: Bug 943825 - [Gaia] Mount/Unmount SD card
2014-08-21 14:05:32 -07:00
Bill McCloskey
1418f34a28 Bug 1008107 - Allow SandboxPrivate to be null in sandbox_finalize (r=bz) 2014-08-21 13:29:20 -07:00
B2G Bumper Bot
fc958f1ec2 Bumping manifests a=b2g-bump 2014-08-21 12:47:08 -07:00
B2G Bumper Bot
95a2e67e27 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/6e59fa03abdb
Author: Yura Zenevich <yura.zenevich@gmail.com>
Desc: Merge pull request #23046 from yzen/bug-1053193

Bug 1053193 - cropped beginning silence from a11y sound files. Updated t...

========

https://hg.mozilla.org/integration/gaia-central/rev/7356bc45a128
Author: Yura Zenevich <yzenevich@mozilla.com>
Desc: Bug 1053193 - cropped beginning silence from a11y sound files. Updated the way a11y sounds are played by the accessibility component.
2014-08-21 12:45:35 -07:00
Bernardo P. Rittmeyer
e876407c99 Bug 1057204 - Removed .lock file mistakenly included at the top-level directory from bug 1041845 patch, r=ttaubert 2014-08-21 21:30:00 +02:00
Gijs Kruitbosch
032d5a32be Bug 1004418 - annnnd disable on ASAN as well... 2014-08-22 19:01:32 +02:00
Gijs Kruitbosch
8d8de64f4b Bug 1004418 - followup, disable test on debug for timing out, rs=ttaubert over IRC
--HG--
extra : rebase_source : cf05defc0e67a82fa972e47dcf5391ad6723d536
2014-08-22 16:53:05 +02:00
Mike Conley
e798c00ddf Backing out 893fa8436b70 (bug 1041917) for multiple problems. 2014-08-21 15:12:22 -04:00
Wes Johnston
24a5dda875 Bug 1052387 - Don't save session history if clearing history on exit. r=bnicholson 2014-08-21 11:35:16 -07:00
Andrei Oprea
13baa87092 Bug 1045569 - Revoke the correct call url in loop desktop client, r=rgauthier@mozilla.com 2014-08-21 11:14:04 -07:00
B2G Bumper Bot
e0a3c0d58f Bumping manifests a=b2g-bump 2014-08-21 11:06:34 -07:00
B2G Bumper Bot
f6a9f74eb7 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/aa65c23392bf
Author: Zibi Braniecki <zbigniew.braniecki@gmail.com>
Desc: Merge pull request #22939 from zbraniecki/1053968-clean-mozl10n-api-in-sms

Bug 1053968 - Clean up mozL10n API use in SMS. r=azasypkin

========

https://hg.mozilla.org/integration/gaia-central/rev/17fd40f8cf03
Author: Zbigniew Braniecki <gandalf@mozilla.com>
Desc: Bug 1053968 - Clean up mozL10n API use in SMS
2014-08-21 11:00:29 -07:00
B2G Bumper Bot
6e7b446498 Bumping manifests a=b2g-bump 2014-08-21 10:21:34 -07:00
B2G Bumper Bot
e837f65733 Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/3ae4b06c6b01
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Merge pull request #23111 from eeejay/bug-1056364

Bug 1056364 - Check lockscreen state before hiding windows on visible-au... r=alive

========

https://hg.mozilla.org/integration/gaia-central/rev/829232e70b57
Author: Eitan Isaacson <eitan@monotonous.org>
Desc: Bug 1056364 - Check lockscreen state before hiding windows on visible-audio-channel-changed.
2014-08-21 10:15:35 -07:00
Wes Johnston
aea2f7a4af Bug 1056468 - Clear metadata when history entries are removed. r=lucasr 2014-08-21 10:03:44 -07:00
B2G Bumper Bot
0943316bc4 Bumping manifests a=b2g-bump 2014-08-21 09:52:27 -07:00
B2G Bumper Bot
82cbb517cb Bumping gaia.json for 1 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/19ff5c952f8b
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1019841 - [Gallery] Linter follow-up, update to use <gaia-header> r=kgrandon
2014-08-21 09:45:31 -07:00
Wes Johnston
ee1165ed18 Bug 1042196 - Provide an enable wifi button on error pages. r=mfinkle 2014-08-21 09:45:26 -07:00
B2G Bumper Bot
7785d8a906 Bumping manifests a=b2g-bump 2014-08-21 09:36:53 -07:00
B2G Bumper Bot
2ac577f57d Bumping gaia.json for 2 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/7ad9ed1cd610
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Merge pull request #23120 from KevinGrandon/bug_1053265_search_landscape_support

Bug 1053265 - [Search] Landscape support

========

https://hg.mozilla.org/integration/gaia-central/rev/3abfdf727dab
Author: Kevin Grandon <kevingrandon@yahoo.com>
Desc: Bug 1053265 - [Search] Landscape support r=etienne r=daleharvey
2014-08-21 09:30:31 -07:00
B2G Bumper Bot
aea8f0c2ce Bumping manifests a=b2g-bump 2014-08-21 09:17:36 -07:00
Lucas Rocha
7bbd1a4367 Bug 1056012 - Split ShapedButton into PhoneTabsButton and TabletTabsButton (r=mcomella) 2014-08-21 17:14:28 +01:00
Lucas Rocha
e847d2234b Bug 1055576 - Factor out code to draw tab curves (r=mcomella) 2014-08-21 17:14:28 +01:00
Lucas Rocha
c288e10874 Bug 1054371 - Part 4: Make all members of BackButton/ForwardButton final (r=mcomella) 2014-08-21 17:14:27 +01:00
Lucas Rocha
a62dbad7ef Bug 1054371 - Part 3: Ged rid of separate paint instance for private mode (r=mcomella) 2014-08-21 17:14:27 +01:00
Lucas Rocha
35cf360008 Bug 1054371 - Part 2: Only fetch border width once in back/forward buttons (r=mcomella) 2014-08-21 17:14:26 +01:00
Lucas Rocha
057578471b Bug 1054371 - Part 1: Use solid stroke in back/forward buttons (r=mcomella) 2014-08-21 17:14:26 +01:00
Lucas Rocha
87ece3d79a Bug 1056312 - Restore toolbar 9-patch images (r=margaret) 2014-08-21 17:14:25 +01:00
B2G Bumper Bot
62acb5e75e Bumping gaia.json for 5 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/314e4a119596
Author: Diego Marcos <diego.marcos@gmail.com>
Desc: Merge pull request #22603 from dmarcos/bug1019841

Bug 1019841 - [Gallery] Update to use <gaia-header>

========

https://hg.mozilla.org/integration/gaia-central/rev/523d4b157f73
Author: Wilson Page <wilsonpage@me.com>
Desc: Bug 1019841 - [Gallery] Update to use <gaia-header>

========

https://hg.mozilla.org/integration/gaia-central/rev/3afecf4621e5
Author: Douglas Sherk <github@sherk.me>
Desc: Merge pull request #22910 from DouglasSherk/1045499-dialer-call-log-2line

Bug 1045499 - Switch call log to a 2-line layout. r=Rik

========

https://hg.mozilla.org/integration/gaia-central/rev/6599008c2323
Author: DouglasSherk <github@sherk.me>
Desc: Bug 1045499 - Fix JSHint errors. r=Rik

========

https://hg.mozilla.org/integration/gaia-central/rev/6e195f192636
Author: DouglasSherk <github@sherk.me>
Desc: Bug 1045499 - Switch call log to a 2-line layout. r=Rik
2014-08-21 09:10:22 -07:00
Shane Caraveo
cb35c41b72 Bug 1047316 dont display panels using docshell swapping in panelviews, r=jaws 2014-08-21 07:44:17 -07:00
Shane Caraveo
9b3587d3ff Bug 1056415 fix updating the marks buttons during tabchange, r=jaws 2014-08-21 07:41:23 -07:00
B2G Bumper Bot
055a2ed997 Bumping manifests a=b2g-bump 2014-08-21 07:03:18 -07:00
B2G Bumper Bot
779c6c8db1 Bumping gaia.json for 4 gaia revision(s) a=gaia-bump
========

https://hg.mozilla.org/integration/gaia-central/rev/79b59aecef5c
Author: vingtetun <21@vingtetun.org>
Desc: Merge pull request #23152 from vingtetun/reduce.overpaint.system

Bug 1048009 - Reduce overall overpaint. r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/34668f2217ee
Author: Vivien Nicolas <vnicolas@mozilla.com>
Desc: Bug 1048009 - Reduce overall overpaint. r=etienne

========

https://hg.mozilla.org/integration/gaia-central/rev/6856d6861279
Author: viorelaioia <viorelaioia@gmail.com>
Desc: Merge pull request #23151 from bebef1987/xfail4

Bug 1056794 - Xfail test_everythingme_add_collection_save_bookmark

========

https://hg.mozilla.org/integration/gaia-central/rev/0f8be4e0a6db
Author: Bebe <bebe@mozilla.ro>
Desc: Bug 1056794 - Disable test_everythingme_add_collection_save_bookmark
2014-08-21 07:00:35 -07:00
B2G Bumper Bot
fb1e601f79 Bumping manifests a=b2g-bump 2014-08-21 06:32:25 -07:00