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

71 Коммитов

Автор SHA1 Сообщение Дата
Nick Alexander 0a9a9e30db Bug 1069648 - Add instrumentation manifests to moz.build. r=ted
These manifests are special in that they don't package their test files
into the test package.  Each test listed in an instrumentation manifest
serves as an identifier rather than a file.

--HG--
extra : rebase_source : 0321528a2dc380e57b824746efbcf61d295204a9
2014-09-26 11:44:58 -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
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
Richard Newman 87da4b8c44 Bug 1045085 - Remove main Product Announcements code. r=mcomella 2014-07-31 11:24:02 -07:00
Nick Alexander 6fa6af293a Bug 1033481 - Use a .mozbuild file rather than a .mk in m/a/tests/background/junit3. r=rnewman
--HG--
rename : mobile/android/tests/background/junit3/android-services.mozbuild => mobile/android/tests/background/junit3/background_junit3_sources.mozbuild
2014-07-07 21:49:34 -07:00
Nick Alexander f718c2014c Bug 1019793 - Avoid UnsupportedOperationException in TestHealthReportPruneService. r=mcomella
========

ce21e7f19a
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Wed Jun 4 14:15:09 2014 -0700

    Bug 1019793 - Always upload in TestHealthReportUploadService.

========

e4c7393c6f
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Jun 3 15:47:33 2014 -0700

    Bug 1019793 - Don't create storage in TestHealthReportPruneService.

    Creating real storage requires a valid Context, and in this test, we
    only have MockContext.
2014-06-21 15:42:44 -07:00
Nick Alexander 1cc245ea64 Bug 993134 - Make TestAccountPickler tolerate multiple accounts. r=mcomella
========

872d926e32
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Wed Jun 4 14:21:17 2014 -0700

    Bug 993134 - Part 5: Work around Android intermittent issue.

========

c76bb53901
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Jun 3 17:02:15 2014 -0700

    Bug 993134 - Part 4: Make fxa.TestAccountPickler robust.

    This tested extracting data from an AndroidFxAccount before, and another
    after, backed by different Android Accounts.  Unfortunately, one Account
    replaced the other, but had the same name, leading to a race
    condition (between reading and deleting the first account).  To address
    this, we extract all the data before deleting, and then compare it to
    the data from the newly pickled account.

========

bd32978f7b
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Jun 3 15:34:09 2014 -0700

    Bug 993134 - Part 3: Use AndroidSyncTestCaseWithAccounts to make fxa.TestAccountPickler when accounts exist.

========

ec7d910187
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Jun 3 15:33:29 2014 -0700

    Bug 993134 - Part 2: Extract AndroidSyncTestCaseWithAccounts.

========

6563ad7bd8
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Jun 3 15:30:15 2014 -0700

    Bug 993134 - Part 1: Make getApplicationContext return getTargetContext.

    I was finding that repeated instrumentation-test runs were returning a
    null application context, indicating a race between test start-up and
    target instantiation.  This works well for me on two test devices.
2014-06-21 15:42:38 -07:00
Nick Alexander fd0bc71e4a Bug 993136 - Fix TestSyncConfiguration. r=mcomella
========

306fb330a9
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Jun 3 15:29:55 2014 -0700

    Bug 993136 - Fix TestSyncConfiguration.
2014-06-21 15:42:31 -07:00
Hathibelagal A bc2a0aa8c3 Bug 1027831 - Switch from deprecated FILL_PARENT to MATCH_PARENT in Java and XML. r=bnicholson 2014-06-20 09:21:31 -07:00
Richard Newman 73d5c81fca Bug 1025937 - Silently drop null intents in background IntentServices. r=mcomella 2014-06-16 16:18:59 -07:00
Nick Alexander 943b7aee84 Bug 1021055 - Add Sync client device type to Fennec's tabs provider. r=rnewman
This is the expedient thing to do.  The right thing to do is to
deprecate Sync's clients database in favour of Fennec's clients table,
but that's a good chunk of work for a small gain.
2014-06-11 14:20:24 -07:00
Nick Alexander 7b560b6fda Bug 788688 - Allow setting client's device name in FxAccountStatusActivity. r=rnewman
========

8c7b253142
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Jun 3 15:48:40 2014 -0700

    Bug 788688 - Review comment: Include timestamp in setClientName.

========

b53b9092c2
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Thu May 29 16:05:25 2014 -0700

    Bug 788688 - Post: PII client data to ease debugging.

========

fd59f3c984
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Wed Jun 4 15:01:12 2014 -0700

    Bug 788688 - Part 4: Work around Android DialogPreference caching bug.

========

87d10bc16a
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Thu May 29 14:44:24 2014 -0700

    Bug 788688 - Part 3: Add "Device name" pref to Status activity.

    In the edge case where what the user has entered (empty text) and what
    is persisted (default client name) differ, Android does not update the
    contents of the dialog's EditText correctly.  Removing and re-creating
    all preferences is the only way I found to work around this; that's in
    the next commit.

========

7af72f6c2f
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Thu May 29 16:05:59 2014 -0700

    Bug 788688 - Part 2: Upload clients and tabs records when client name changes.

========

0e99eae1b5
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Thu May 29 15:28:36 2014 -0700

    Bug 788688 - Part 1: Add setClientName with timestamp to ClientsDataDelegate.

========

1999e263db
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Thu May 29 14:10:40 2014 -0700

    Bug 788688 - Pre: Clean some imports.
2014-06-04 16:37:25 -07:00
Richard Newman 279e4a4c1c Bug 965371 - Follow-up: test and misc fixes. r=me 2014-05-09 21:25:51 -07:00
Richard Newman 9cf7154a60 Bug 965371 - Part 1: introduce v3 environment format. r=mcomella 2014-05-09 19:19:13 -07:00
Nick Alexander 441af56ac8 Bug 995157 - Specify default profile when syncing tabs and remote clients. r=rnewman
========

7fd50fef23
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Fri Apr 18 13:11:34 2014 -0700

    Bug 995157 - Part 2: Specify default profile when syncing tabs and remote clients.

========

79da665d74
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Fri Apr 18 15:22:02 2014 -0700

    Bug 995157 - Part 1: Use FORM_HISTORY_AUTHORITY_URI.
2014-04-20 14:42:45 -07:00
Nick Alexander 086431af3b Bug 996749 - Kill PrefsSource. r=rnewman
========

6ced7b05cd
Author: Nick Alexander <nalexander@mozilla.com>
    Bug 996749 - Part 3: Finally kill PrefsSource.

========

b37547fbd8
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Tue Apr 15 10:47:11 2014 -0700

    Bug 996749 - Part 2: Remove storageEndpoint from FxAccountGlobalSession constructor.

    This is just a separation of concerns: let's inject our dependency as
    configured as possible.

========

42e8fe761f
Author: Nick Alexander <nalexander@mozilla.com>
Date:   Mon Apr 14 12:30:21 2014 -0700

    Bug 996749 - Part 1: Remove debugAssertion.

    This is no longer valuable, since we're not getting timestamp HAWK
    errors from the server.
2014-04-15 10:59:00 -07:00
Nick Alexander 57c47e042f Bug 966104 - Add Sync status listener to Android FxA activities. r=rnewman 2014-04-04 16:24:00 -07:00
Nick Alexander 99da817f3a Bug 990680 - Remove extras from GlobalSession constructor. r=rnewman 2014-04-01 15:31:28 -07:00
Brad Lassey eade3f50ca bug 979438 - Unify android target SDK versions r=nalexander
--HG--
rename : embedding/android/geckoview_example/AndroidManifest.xml => embedding/android/geckoview_example/AndroidManifest.xml.in
rename : mobile/android/geckoview_library/AndroidManifest.xml => mobile/android/geckoview_library/AndroidManifest.xml.in
rename : mobile/android/geckoview_library/project.properties => mobile/android/geckoview_library/project.properties.in
2014-03-25 23:27:16 -04:00
Nick Alexander 0108f912d1 Bug 983856 - Message when syncing is disabled by Android. r=rnewman 2014-03-26 22:11:05 -07:00
Michael Comella dd0219ba2f Bug 957894: Update account pickling code for Firefox Accounts. r=nalexander 2014-03-26 11:31:43 -07:00
Richard Newman 2b90cbe7ec Bug 969672 - Handle declined engines on Android. r=nalexander 2014-03-14 19:14:34 -07:00
Michael Comella 6712a23792 Bug 959652: Use NativeCrypto.sha1. r=rnewman 2014-03-11 19:43:20 -07:00
Nick Alexander 4c6468408f Bug 915312 - Follow-up: Land background JUnit 3 tests. r=nalexander 2014-03-10 20:53:43 -07:00
Michael Comella 372f083b66 Bug 915312 - Part 3: Add NativeCrypto Java interface. r=nalexander 2014-03-06 12:10:54 -08:00
Nick Alexander 089da55967 Bug 978587 - Pre: Make geckoview_library and BackgroundInstrumentationTests target android-16. r=blassey
This agrees with Fennec (and BrowserInstrumentationTests).
2014-03-05 08:57:09 -08:00
Nick Alexander 2dfe401600 Bug 979064 - Declare JUnit 3 instrumentation test applications debuggable. r=rnewman
I also took the opportunity to move a constant into
AndroidManifest.xml.in; it removes a layer of indirection when trying to
determine what Android package gets built.
2014-03-04 09:34:35 -08:00
Brad Lassey d35a2e6fef Bug 962606 - Suggestions are present for password field, switch to use text transforms to reveal text. r=nalexander 2014-03-03 15:20:18 -08:00
Nick Alexander c77f1718b5 Bug 903528 - Follow-up: Fix build dependencies. a=bustage
The issue is that the preprocessed files need to be referenced as
$(CURDIR)/file to have Make handle the dependencies correctly.  To
allow this, this patch adds ANDROID_MANIFEST_FILE (defaulting to
AndroidManifest.xml) and uses it in the appropriate places.
2014-02-24 23:18:47 -08:00
Nick Alexander dcbbaec14a Bug 903528 - Follow-up: Fix AndroidEclipse project files. r=me 2014-02-24 21:26:41 -08:00
Nick Alexander 478d42ae14 Bug 903528 - Part 1: Rename background.apk to background-junit3.apk. r=rnewman
This is a cautionary move: when uploaded to infrastructure,
background.apk will not look so bad; but browser.apk is likely to
confuse folks. (These files will be in the same directory as
fennec-*apk, and sort earlier than that file.)

I considered including "tests" in the name, but decided not to make a
long name even longer.

This also renames the Android package. This is purely cosmetic, since
the package has no consumers (infrastructure, mach, etc). But this looks
nicer in IDEs: the generated classes fit into the class hierarchy.
2014-02-24 18:24:45 -08:00
Ryan VanderMeulen ef7d356d30 Merge inbound to m-c. 2014-02-14 08:54:12 -05:00
Nick Alexander 4e0e33eada Bug 853045 - Part 4: Add Android Eclipse projects to moz.build files. r=gps 2014-02-13 22:19:50 -08:00
Nick Alexander be5ccb2308 Bug 853045 - Pre: Remove outdated test files. r=me 2014-02-13 22:19:49 -08:00
Richard Newman c22b8f5467 Bug 958900 - Backoff handling and periodic syncing for FxAccountSyncAdapter. r=nalexander 2014-02-13 19:46:23 -08:00
Michael Comella 0cb1a1d839 Bug 961526 - Part 1: Fix SQLiteConstraintException in FHR. r=rnewman,mcomella 2014-02-04 15:10:55 -08:00
Nick Alexander aaed842cf8 No bug: Android Sync test-only warning fixes. r=rnewman DONTBUILD 2014-01-24 16:59:13 -08:00
Richard Newman 0085f18d1b Bug 963336 - Extract SyncConfiguration computation from GlobalSession. r=nalexander 2014-01-23 16:48:53 -08:00
Nick Alexander e0478d222e Bug 956844 - Part 1: update Android FxSyncAdapter to use new onepw protocol login flow. r=rnewman 2014-01-16 18:35:08 -08:00
Wesley Johnston 1941a80d90 Bug 957131 - Synced bookmarks appear in guest mode but not in default profile. r=rnewman 2014-01-14 21:45:59 -08:00
Nick Alexander 6fe49b17db Bug 956816 - Implement (de)serializing Android BrowserIDKeyPair instances. r=rnewman 2014-01-07 18:27:45 -08:00
Nick Alexander 8eb86798e0 Bug 918012 - Sync with FxAccount and token server. r=rnewman 2013-12-17 15:13:43 -08:00
Nick Alexander 163b1929e5 Merge m-c to elm 2013-12-16 09:13:10 -08:00
Nick Alexander 67783ac649 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 03c9e15f08 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
Nick Alexander 3520f2dfa1 Merge m-c to elm 2013-12-11 14:08:02 -08:00
Nick Alexander 7760713d9e 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 c01daad066 Merge b-i to elm
--HG--
rename : b2g/chrome/content/forms.js => dom/inputmethod/forms.js
2013-11-13 15:16:51 -08:00
Nick Alexander 341cdd3040 Bug 922147 - Abstract password out of Android Sync auth flow. r=rnewman 2013-11-13 15:11:16 -08:00
Nick Alexander e16fe14d12 Merge m-c to elm 2013-11-04 21:25:12 -08:00