========
https://hg.mozilla.org/integration/gaia-central/rev/2b76279a1d07
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #23214 from davidflanagan/bug1051172-v2.1
Merge pull request #23118 from davidflanagan/bug1051172-v2.0
========
https://hg.mozilla.org/integration/gaia-central/rev/bb8982676d78
Author: David Flanagan <dflanagan@mozilla.com>
Desc: Merge pull request #23118 from davidflanagan/bug1051172-v2.0
Bug 1051172: a stoprecording event hack so the camera can stop recording more quickly on app transitions. r=kgrandon,justindarc a=2.0+(cherry picked from commit 4ea69f01f52f472331d12b001ec1e37631bff575)
Conflicts:
apps/camera/index.html
apps/camera/js/app.js
apps/camera/js/config/require.js
apps/camera/js/controllers/camera.js
apps/camera/test/unit/setup.js
apps/system/js/app_window_manager.js
remove unused listenForAttentionScreen function
========
https://hg.mozilla.org/integration/gaia-central/rev/2e11af032c27
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Merge pull request #23167 from mikehenrty/bug-1041903-dialer-theme-revisit
Bug 1041903 - Fix theme color for dialer again
========
https://hg.mozilla.org/integration/gaia-central/rev/c397543db97c
Author: Michael Henretty <michael.henretty@gmail.com>
Desc: Bug 1041903 - Fix theme color for dialer again
========
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)
========
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.
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.
