Commit Graph

10170 Commits

Author SHA1 Message Date
Ryan VanderMeulen
62ac641707 Merge inbound to m-c. a=merge 2014-08-26 15:55:57 -04:00
Jim Chen
0b8d35ee8c Bug 1058127 - Properly implement removeSpan synchronization; r=cpeterson 2014-08-26 11:50:19 -04:00
Amogh Pradeep
1cca7287da Bug 1057789 - Code Cleanup GeckoScreenOrientation.java. r=margaret 2014-08-24 06:15:46 +05:30
Amogh Pradeep
8d159fb2c8 Bug 1057787 - Code Cleanup FilePicker.java. r=margeret 2014-08-24 06:07:19 +05:30
Ramasamy Gopalan
0edae11c38 Bug 1055315 - Add telemetry probe when changing default search service; r=margaret. 2014-08-25 16:57:47 -07:00
Margaret Leibovic
7badeb8b90 Bug 1055771 - Reset search suggestions when activity is launched from a new intent. r=wesj 2014-08-25 16:57:44 -07:00
Wes Johnston
4c716f1ca5 Bug 1055212 - Use Cu.import everywhere we import pageActions.jsm r=margaret 2014-08-25 16:19:32 -07:00
Wes Johnston
0e1907f34b Bug 1053889 - Handle null devices returned from Chromecast code. r=mfinkle 2014-08-25 16:19:29 -07:00
Wes Johnston
2db10f462c Bug 1057866 - Handle null callbacks in ChromeCast code. r=mfinkle 2014-08-25 16:19:27 -07:00
Wes Johnston
4ab5278cbd Bug 1042196 - Provide a wifi button on error pages. r=mfinkle 2014-08-25 16:19:25 -07:00
Wes Johnston
43e2232e2c Bug 1048545 - Don't open a new tab when tapping the Firefox icon in the widget. r=margaret 2014-08-25 16:19:22 -07:00
Wes Johnston
b3e646a763 Bug 1045274 - Basic tests for GeckoProfile. r=rnewman 2014-08-25 16:19:16 -07:00
Chenxia Liu
2b66e091b0 Bug 1058100 - Load Sync snippets on first run. r=margaret 2014-08-25 15:31:49 -07:00
Margaret Leibovic
dbabc09768 Bug 1054303 - Use open search plugins for search engines. r=bnicholson 2014-08-25 15:28:11 -07:00
Margaret Leibovic
30931aeb6a Bug 996753 - Telemetry probes for changing settings and hitting back. r=liuche 2014-08-25 15:28:10 -07:00
Margaret Leibovic
42184a6334 Bug 996753 - Telemetry probes for settings pages. r=liuche 2014-08-25 15:28:10 -07:00
Ryan VanderMeulen
ff3f93c106 Merge m-c to fx-team. a=merge 2014-08-25 16:27:23 -04:00
Ryan VanderMeulen
65ac61e6af Merge m-c to b2g-inbound. a=merge
CLOSED TREE
2014-08-25 13:07:41 -04:00
Ryan VanderMeulen
81342753e0 Merge inbound to m-c. a=merge
CLOSED TREE
2014-08-25 11:49:37 -04:00
Amogh Pradeep
8ce89fdae0 Bug 1057780 - Code Cleanup ChromeCast.java. r=mfinkle 2014-08-24 04:19:21 +05:30
Amogh Pradeep
f2efb640a7 Bug 1057792 - Code Cleanup IntentHelper.java. r=mfinkle 2014-08-24 06:20:58 +05:30
Wes Johnston
d2c853240d Bug 1046885 - Disable installing webapps in guest mode profiles. r=myk 2014-08-25 12:55:18 -07:00
Kartikaya Gupta
e39bc5b439 Bug 1057709 - Remove unused telemetry histograms. r=mfinkle 2014-08-24 01:24:39 -04:00
Zafar Ahmed Ansari
4d6f59820c Bug 1038880 - Ensure we use a non-NaN lower bound when clamping the max-scale. r=kats 2014-08-24 06:59:47 +05:30
Chris Kitching
b37f6afd24 Bug 1057086: Improve type safety in UIAsyncTask r=nalexander
--HG--
rename : mobile/android/base/util/UiAsyncTask.java => mobile/android/base/util/UIAsyncTask.java
2014-08-20 08:50:58 -07:00
Wes Kocher
ab9325b9fb Merge m-c to fx-team a=merge 2014-08-22 17:10:53 -07:00
Wes Kocher
6a171a09b7 Merge fx-team to m-c a=merge 2014-08-22 16:17:12 -07:00
Nick Alexander
f92c349a34 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
9bc2753e4f Bug 1046537 - Better error handling from chromecast code. r=mfinkle 2014-08-22 11:20:02 -07:00
Nick Alexander
2f89b3cf6d 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
d0462e9d68 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
da294de55b 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
7b23628793 Bug 1056225 - Part 1: Lift mUrlOpenListener to HomeFragment. r=margaret 2014-08-22 11:10:05 -07:00
Nigel Babu
7f489336f2 Backed out changeset d53b90e407ce (bug 1042196) for bustage on localized builds 2014-08-22 13:36:17 +05:30
Wes Kocher
b82f058ff2 Merge fx-team to m-c a=merge 2014-08-21 17:44:40 -07:00
Wes Johnston
d04881178e Bug 1052387 - Don't save session history if clearing history on exit. r=bnicholson 2014-08-21 11:35:16 -07:00
Wes Johnston
2282b2d613 Bug 1056468 - Clear metadata when history entries are removed. r=lucasr 2014-08-21 10:03:44 -07:00
Wes Johnston
e47ba45aed Bug 1042196 - Provide an enable wifi button on error pages. r=mfinkle 2014-08-21 09:45:26 -07:00
Lucas Rocha
3e56ba06c0 Bug 1056012 - Split ShapedButton into PhoneTabsButton and TabletTabsButton (r=mcomella) 2014-08-21 17:14:28 +01:00
Lucas Rocha
b13dcb2928 Bug 1055576 - Factor out code to draw tab curves (r=mcomella) 2014-08-21 17:14:28 +01:00
Lucas Rocha
d5681dbc07 Bug 1054371 - Part 4: Make all members of BackButton/ForwardButton final (r=mcomella) 2014-08-21 17:14:27 +01:00
Lucas Rocha
7af8e018d7 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
8a29630664 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
a81952916f Bug 1054371 - Part 1: Use solid stroke in back/forward buttons (r=mcomella) 2014-08-21 17:14:26 +01:00
Lucas Rocha
43f59b6ba5 Bug 1056312 - Restore toolbar 9-patch images (r=margaret) 2014-08-21 17:14:25 +01:00
Ed Morley
3c2d001512 Merge latest green fx-team changeset and mozilla-central; a=merge 2014-08-21 14:00:54 +01:00
Ed Morley
7412a6ccf2 Merge latest green inbound changeset and mozilla-central; a=merge 2014-08-21 13:22:44 +01:00
Ed Morley
da454dd438 Backed out changeset b17854552298 (bug 1042252) for intermittent test failures 2014-08-21 11:19:24 +01:00
Mark Finkle
7abe500e25 Bug 1048387 r=snorp 2014-08-21 00:38:17 -04:00
Chenxia Liu
41bdc5d9ec Bug 1030935 - Measure default application setting in telemetry r=nalexander 2014-08-21 00:36:14 -04:00