Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-05 08:35:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
447,466 Commits 615 Branches 98 Tags 5.9 GiB
e7680671fe
Commit Graph

18132 Commits

Author SHA1 Message Date
Stanislas Dolcini
e7680671fe Bug 1147197 - Fix Indentation in LoginManagerPrompter.js r=margaret 
--HG--
extra : commitid : LmRXEOAUbW6
extra : rebase_source : e3ecd1892de691201f3f9aec083a04200d6f124d
 2015-10-28 11:53:46 -04:00
Carsten "Tomcat" Book
3ec5c00413 merge mozilla-inbound to mozilla-central a=merge 2015-10-28 10:43:33 +01:00
Nick Alexander
3323ad2cde Bug 1207708 - Part 2: Build against play-services-{basement,base,gcm} if MOZ_ANDROID_GCM. r=sebastian 
Since MOZ_NATIVE_DEVICES builds against play-services-{basement,base,cast},
some ad-hoc de-duplication is necessary.

--HG--
extra : commitid : 2jNIgZpLUq2
extra : source : 0957d3435ac22765d7868cb3c7db1e0787836bc3
 2015-10-27 17:41:49 -07:00
Nick Alexander
28cbcc16f5 Bug 1207708 - Part 1: Add MOZ_ANDROID_GCM{_SENDERID} build flags. r=sebastian 
These flags are not intended to be feature specific.  On day one, we
intend to support a single GCM-backed feature -- Push Notifications --
but the set of GCM-consuming features is potentially large (e.g.,
possibly Firefox Sync tickles and Send Tab to Device alerts).  Such
features can and will have their own build flags.

Note that GCM sender IDs are not sensitive -- see link in code
comment.  Since this is something custom branding will almost always
want to set, I don't want to bury the default value in confvars.sh.

--HG--
extra : commitid : HBHDBk2tC6S
extra : source : d4e39587c87c16564eeac6d1f8568814b63e5325
 2015-10-27 17:42:35 -07:00
Michael Comella
560b98df94 Bug 1213490 - review: Move BrowserApp.getOtherSyncClientCount -> TabsAccessor.getRemoteClientCount. r=me 
--HG--
extra : commitid : Ao8erEHjceB
extra : rebase_source : ef834e244bd8a43e77a3712dfbc0bd1b7e265b25
 2015-10-27 17:08:28 -07:00
Michael Comella
81acbb1252 Bug 1213490 - Handle shareplane when device list cannot be shown. r=nalexander 
The handled cases are:
  * The user is not signed in (sync setup is shown)
  * The user is signed in but has no other synced devices (toast is shown)

--HG--
extra : commitid : LsCwJgg4Zkn
extra : rebase_source : a5551ecbe992968eaf7055c9444f4c49ce5e95c0
 2015-10-27 16:59:39 -07:00
Michael Comella
8a576124d4 Bug 1213490 - Move send to device handling code to a separate method. r=nalexander 
This makes space to do more in the upcoming patches.

--HG--
extra : commitid : 4zbRVGonbfQ
extra : rebase_source : 50ad23724b31df3338ac36c3d178976cddb2047e
 2015-10-19 16:22:37 -04:00
Nick Alexander
b44ed5f63d Bug 1191068 - Support "Choose what to Sync" in Fennec web sign in. r=vivek 
The set operation is:

* known engines are enabled by default;
* unchecked engines from fxa-content-server are disabled;
* the "forms" engine is special: it's always the same as "history".

--HG--
extra : commitid : Lbu8A5CH8R9
extra : rebase_source : 74e921492787f69fb36cd5c5e9da61dfd1e2ffc5
 2015-10-26 16:37:48 -07:00
Nick Alexander
57cb37d888 Bug 1216100 - Handle "fxaccounts:sync_preferences" message in FxA WebChannel. r=vivek 
The only wrinkle is that we don't always have an Activity context, so
we always start a new task.  We might want to revisit that decision.

--HG--
extra : commitid : Liun7Xv30B5
extra : rebase_source : c5afc439ba4fe818e4fda15b2756f510cb76d639
 2015-10-26 16:31:19 -07:00
Nick Alexander
4d32b6bb24 Bug 1218935 - Normalize background JUnit3 source layout. r=me,rnewman 
--HG--
rename : mobile/android/tests/background/junit3/src/common/TestAndroidLogWriters.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/common/TestAndroidLogWriters.java
rename : mobile/android/tests/background/junit3/src/common/TestBrowserContractHelpers.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/common/TestBrowserContractHelpers.java
rename : mobile/android/tests/background/junit3/src/common/TestDateUtils.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/common/TestDateUtils.java
rename : mobile/android/tests/background/junit3/src/common/TestUtils.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/common/TestUtils.java
rename : mobile/android/tests/background/junit3/src/common/TestWaitHelper.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/common/TestWaitHelper.java
rename : mobile/android/tests/background/junit3/src/db/AndroidBrowserRepositoryTestCase.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/AndroidBrowserRepositoryTestCase.java
rename : mobile/android/tests/background/junit3/src/db/TestAndroidBrowserBookmarksRepository.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestAndroidBrowserBookmarksRepository.java
rename : mobile/android/tests/background/junit3/src/db/TestAndroidBrowserHistoryDataExtender.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestAndroidBrowserHistoryDataExtender.java
rename : mobile/android/tests/background/junit3/src/db/TestAndroidBrowserHistoryRepository.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestAndroidBrowserHistoryRepository.java
rename : mobile/android/tests/background/junit3/src/db/TestBookmarks.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestBookmarks.java
rename : mobile/android/tests/background/junit3/src/db/TestCachedSQLiteOpenHelper.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestCachedSQLiteOpenHelper.java
rename : mobile/android/tests/background/junit3/src/db/TestClientsDatabase.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestClientsDatabase.java
rename : mobile/android/tests/background/junit3/src/db/TestClientsDatabaseAccessor.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestClientsDatabaseAccessor.java
rename : mobile/android/tests/background/junit3/src/db/TestFennecTabsRepositorySession.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestFennecTabsRepositorySession.java
rename : mobile/android/tests/background/junit3/src/db/TestFennecTabsStorage.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestFennecTabsStorage.java
rename : mobile/android/tests/background/junit3/src/db/TestFormHistoryRepositorySession.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestFormHistoryRepositorySession.java
rename : mobile/android/tests/background/junit3/src/db/TestPasswordsRepository.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/db/TestPasswordsRepository.java
rename : mobile/android/tests/background/junit3/src/fxa/TestAccountLoader.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/fxa/TestAccountLoader.java
rename : mobile/android/tests/background/junit3/src/fxa/TestBrowserIDKeyPairGeneration.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/fxa/TestBrowserIDKeyPairGeneration.java
rename : mobile/android/tests/background/junit3/src/fxa/TestFirefoxAccounts.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/fxa/TestFirefoxAccounts.java
rename : mobile/android/tests/background/junit3/src/fxa/authenticator/TestAccountPickler.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/fxa/authenticator/TestAccountPickler.java
rename : mobile/android/tests/background/junit3/src/healthreport/MockDatabaseEnvironment.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/MockDatabaseEnvironment.java
rename : mobile/android/tests/background/junit3/src/healthreport/MockHealthReportDatabaseStorage.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/MockHealthReportDatabaseStorage.java
rename : mobile/android/tests/background/junit3/src/healthreport/MockHealthReportSQLiteOpenHelper.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/MockHealthReportSQLiteOpenHelper.java
rename : mobile/android/tests/background/junit3/src/healthreport/MockProfileInformationCache.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/MockProfileInformationCache.java
rename : mobile/android/tests/background/junit3/src/healthreport/TestEnvironmentBuilder.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/TestEnvironmentBuilder.java
rename : mobile/android/tests/background/junit3/src/healthreport/TestEnvironmentV1HashAppender.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/TestEnvironmentV1HashAppender.java
rename : mobile/android/tests/background/junit3/src/healthreport/TestHealthReportBroadcastService.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/TestHealthReportBroadcastService.java
rename : mobile/android/tests/background/junit3/src/healthreport/TestHealthReportDatabaseStorage.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/TestHealthReportDatabaseStorage.java
rename : mobile/android/tests/background/junit3/src/healthreport/TestHealthReportGenerator.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/TestHealthReportGenerator.java
rename : mobile/android/tests/background/junit3/src/healthreport/TestHealthReportProvider.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/TestHealthReportProvider.java
rename : mobile/android/tests/background/junit3/src/healthreport/TestHealthReportSQLiteOpenHelper.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/TestHealthReportSQLiteOpenHelper.java
rename : mobile/android/tests/background/junit3/src/healthreport/TestProfileInformationCache.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/TestProfileInformationCache.java
rename : mobile/android/tests/background/junit3/src/healthreport/prune/TestHealthReportPruneService.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/prune/TestHealthReportPruneService.java
rename : mobile/android/tests/background/junit3/src/healthreport/prune/TestPrunePolicyDatabaseStorage.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/prune/TestPrunePolicyDatabaseStorage.java
rename : mobile/android/tests/background/junit3/src/healthreport/upload/TestAndroidSubmissionClient.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/upload/TestAndroidSubmissionClient.java
rename : mobile/android/tests/background/junit3/src/healthreport/upload/TestHealthReportUploadService.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/healthreport/upload/TestHealthReportUploadService.java
rename : mobile/android/tests/background/junit3/src/helpers/AndroidSyncTestCase.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/helpers/AndroidSyncTestCase.java
rename : mobile/android/tests/background/junit3/src/helpers/BackgroundServiceTestCase.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/helpers/BackgroundServiceTestCase.java
rename : mobile/android/tests/background/junit3/src/helpers/DBHelpers.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/helpers/DBHelpers.java
rename : mobile/android/tests/background/junit3/src/helpers/DBProviderTestCase.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/helpers/DBProviderTestCase.java
rename : mobile/android/tests/background/junit3/src/helpers/FakeProfileTestCase.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/helpers/FakeProfileTestCase.java
rename : mobile/android/tests/background/junit3/src/nativecode/test/TestNativeCrypto.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/nativecode/test/TestNativeCrypto.java
rename : mobile/android/tests/background/junit3/src/sync/AndroidSyncTestCaseWithAccounts.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/AndroidSyncTestCaseWithAccounts.java
rename : mobile/android/tests/background/junit3/src/sync/TestAccountPickler.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestAccountPickler.java
rename : mobile/android/tests/background/junit3/src/sync/TestClientsStage.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestClientsStage.java
rename : mobile/android/tests/background/junit3/src/sync/TestConfigurationMigrator.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestConfigurationMigrator.java
rename : mobile/android/tests/background/junit3/src/sync/TestResetting.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestResetting.java
rename : mobile/android/tests/background/junit3/src/sync/TestSendTabData.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestSendTabData.java
rename : mobile/android/tests/background/junit3/src/sync/TestStoreTracking.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestStoreTracking.java
rename : mobile/android/tests/background/junit3/src/sync/TestSyncAccounts.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestSyncAccounts.java
rename : mobile/android/tests/background/junit3/src/sync/TestSyncAuthenticatorService.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestSyncAuthenticatorService.java
rename : mobile/android/tests/background/junit3/src/sync/TestSyncConfiguration.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestSyncConfiguration.java
rename : mobile/android/tests/background/junit3/src/sync/TestTabsRecord.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestTabsRecord.java
rename : mobile/android/tests/background/junit3/src/sync/TestUpgradeRequired.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestUpgradeRequired.java
rename : mobile/android/tests/background/junit3/src/sync/TestWebURLFinder.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/TestWebURLFinder.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/BookmarkHelpers.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/BookmarkHelpers.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/DefaultBeginDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/DefaultBeginDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/DefaultCleanDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/DefaultCleanDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/DefaultDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/DefaultDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/DefaultFetchDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/DefaultFetchDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/DefaultFinishDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/DefaultFinishDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/DefaultGuidsSinceDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/DefaultGuidsSinceDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/DefaultSessionCreationDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/DefaultSessionCreationDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/DefaultStoreDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/DefaultStoreDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectBeginDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectBeginDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectBeginFailDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectBeginFailDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectFetchDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectFetchDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectFetchSinceDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectFetchSinceDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectFinishDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectFinishDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectFinishFailDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectFinishFailDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectGuidsSinceDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectGuidsSinceDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectInvalidRequestFetchDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectInvalidRequestFetchDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectInvalidTypeStoreDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectInvalidTypeStoreDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectManyStoredDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectManyStoredDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectNoGUIDsSinceDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectNoGUIDsSinceDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectNoStoreDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectNoStoreDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectStoreCompletedDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectStoreCompletedDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/ExpectStoredDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/ExpectStoredDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/HistoryHelpers.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/HistoryHelpers.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/PasswordHelpers.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/PasswordHelpers.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/SessionTestHelper.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/SessionTestHelper.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/SimpleSuccessBeginDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/SimpleSuccessBeginDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/SimpleSuccessCreationDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/SimpleSuccessCreationDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/SimpleSuccessFetchDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/SimpleSuccessFetchDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/SimpleSuccessFinishDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/SimpleSuccessFinishDelegate.java
rename : mobile/android/tests/background/junit3/src/sync/helpers/SimpleSuccessStoreDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/sync/helpers/SimpleSuccessStoreDelegate.java
rename : mobile/android/tests/background/junit3/src/telemetry/TestTelemetryRecorder.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/telemetry/TestTelemetryRecorder.java
rename : mobile/android/tests/background/junit3/src/testhelpers/BaseMockServerSyncStage.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/BaseMockServerSyncStage.java
rename : mobile/android/tests/background/junit3/src/testhelpers/CommandHelpers.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/CommandHelpers.java
rename : mobile/android/tests/background/junit3/src/testhelpers/DefaultGlobalSessionCallback.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/DefaultGlobalSessionCallback.java
rename : mobile/android/tests/background/junit3/src/testhelpers/JPakeNumGeneratorFixed.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/JPakeNumGeneratorFixed.java
rename : mobile/android/tests/background/junit3/src/testhelpers/MockAbstractNonRepositorySyncStage.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/MockAbstractNonRepositorySyncStage.java
rename : mobile/android/tests/background/junit3/src/testhelpers/MockClientsDataDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/MockClientsDataDelegate.java
rename : mobile/android/tests/background/junit3/src/testhelpers/MockClientsDatabaseAccessor.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/MockClientsDatabaseAccessor.java
rename : mobile/android/tests/background/junit3/src/testhelpers/MockGlobalSession.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/MockGlobalSession.java
rename : mobile/android/tests/background/junit3/src/testhelpers/MockPrefsGlobalSession.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/MockPrefsGlobalSession.java
rename : mobile/android/tests/background/junit3/src/testhelpers/MockRecord.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/MockRecord.java
rename : mobile/android/tests/background/junit3/src/testhelpers/MockServerSyncStage.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/MockServerSyncStage.java
rename : mobile/android/tests/background/junit3/src/testhelpers/MockSharedPreferences.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/MockSharedPreferences.java
rename : mobile/android/tests/background/junit3/src/testhelpers/StubDelegate.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/StubDelegate.java
rename : mobile/android/tests/background/junit3/src/testhelpers/WBORepository.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/WBORepository.java
rename : mobile/android/tests/background/junit3/src/testhelpers/WaitHelper.java => mobile/android/tests/background/junit3/src/org/mozilla/gecko/background/testhelpers/WaitHelper.java
extra : commitid : HLpjxXquxY
extra : rebase_source : c4ba4971dd4f610cf4a2df424d0fbd287f10dee7
extra : amend_source : 3ac37b3c35540e6907c2f4cf32b0263446a658d4
 2015-10-27 11:56:06 -07:00
Nick Alexander
7b5dfcd4d1 Bug 1025128 - Part 2: Fix JUnit 3 tests. r=me,vivek 
--HG--
extra : commitid : FHOzIDvX3tz
extra : rebase_source : b3bcaacd3eaf40e6596705cb3666bbaf1436526b
 2015-10-27 14:28:20 -07:00
vivek
e8eb8bee2f Bug 1025128 - Part 1: Regularize tabs and clients tables. r=nalexander 
This patch bumps the browser.db version to 25 and makes
tabs.client_guid a foreign key to client.guid.  It also replaces the
non-standard "rowid" with "_id".

Together, these disambiguate client_guid and guid and fix non-local
client deletion.

--HG--
extra : commitid : 5dSVFfdTJRK
extra : rebase_source : e72fe51e1afd1a94bbc96efcfaa3a302de468043
 2015-10-27 14:44:23 -07:00
Carsten "Tomcat" Book
5e5bd5d9da Backed out changeset 077054793949 (bug 1215147) for android test failures on a CLOSED TREE 2015-10-27 12:22:04 +01:00
Carsten "Tomcat" Book
8fe71db627 Merge mozilla-central to fx-team 2015-10-27 10:59:26 +01:00
Carsten "Tomcat" Book
6dfc4c0fb5 merge mozilla-inbound to mozilla-central a=merge 2015-10-27 10:55:48 +01:00
Carsten "Tomcat" Book
f1af003ae4 merge fx-team to mozilla-central a=merge 2015-10-27 10:52:31 +01:00
Xidorn Quan
9c39f97e15 Bug 962249 part 1 - Add Element.scroll{Top,Left}Min (chrome-only) and convert most of scrollLeftMax uses and part of scrollTopMax uses to combinations with the new properties. r=roc,bz 
--HG--
extra : source : 06ea81fe3f64c072d100e42b76678eaa9fb7448c
 2015-10-27 13:38:02 +09:00
Wes Kocher
167aaf2232 Merge m-c to fx-team, a=merge 
--HG--
extra : commitid : JnFqljHzGAU
 2015-10-26 14:39:31 -07:00
Wes Kocher
fcb34ba269 Merge inbound to m-c a=merge 
--HG--
extra : commitid : DkWocljGLGg
 2015-10-26 14:32:00 -07:00
Fabrice Desré
d2037b7e65 Bug 1216834 - Don't override android wallpaper at first run r=sgiles 2015-10-26 09:42:30 -07:00
Richard Newman
ab009aee26 Bug 1218410 - Bump b2gdroid to Android API 14+. r=fabrice. b2gdroid-only on a CLOSED TREE 
--HG--
extra : commitid : La6hYf46BOX
 2015-10-26 08:15:07 -07:00
Michael Comella
6f4aff3f97 Bug 1140210 - Rename MenuItemActionView styles to new name. r=liuche 
--HG--
extra : commitid : 2C9M4zQfpaJ
extra : rebase_source : 1a87cd9c6f28080e10debaf41ef99a34f4c2f44a
 2015-10-15 14:55:28 -07:00
Michael Comella
01e90d794a Bug 1140210 - menu_item_action_view -> menu_item_switcher_layout. r=liuche 
--HG--
rename : mobile/android/base/resources/layout/menu_item_action_view.xml => mobile/android/base/resources/layout/menu_item_switcher_layout.xml
extra : commitid : 3kPAXZAbO6n
extra : rebase_source : 456d7fb795a2fcafca0e9396b607df204eb41f3a
 2015-10-15 14:51:26 -07:00
Michael Comella
bb76d0c878 Bug 1140210 - Add class comment to MenuItemSwitcherLayout. r=liuche 
--HG--
extra : commitid : Ber6FCYbhO0
extra : rebase_source : 5c8bf9197bce937fe51bd9a0bde4ee4a005c4755
 2015-10-15 14:48:37 -07:00
Michael Comella
185c646823 Bug 1140210 - MenuItemActionView -> MenuItemSwitcherLayout. r=liuche 
--HG--
rename : mobile/android/base/menu/MenuItemActionView.java => mobile/android/base/menu/MenuItemSwitcherLayout.java
extra : commitid : ChqibE1sVfI
extra : rebase_source : ce5200e57aff013d3fa5cc481969398ab5905c18
 2015-10-15 14:48:06 -07:00
Michael Comella
15d941b12e Bug 1213486 - Resize shareplane in top level menu. r=liuche 
The menu code is hard to change (I filed bug 1216328) so I opted
to save time by adjusting the padding in the image with an inset
drawable. It'd be better to adjust it statically in the menu code.

--HG--
extra : commitid : D47jDAhHbJV
extra : rebase_source : 9025c9a6e6e7b0010f2f2f3c6311786bc8b2d9ab
 2015-10-19 16:17:04 -04:00
Nick Alexander
9e28b205b5 Bug 1214366 - Part 4: Add mochitest-chrome test. r=rnewman 
--HG--
extra : commitid : 6NRhtrq6R55
extra : rebase_source : a6383d0a0566172f91f734cbeb7fae8c0086a924
 2015-10-23 10:09:44 -07:00
Nick Alexander
8b9481fa99 Bug 1214366 - Part 3: Use getLastVisited equivalent in PushService.jsm. r=kitcambridge,rnewman 
--HG--
extra : commitid : 7BJvkjwmp6t
extra : rebase_source : b856fccd39ddf3cf8692b45b6b2d77e6c229f51a
 2015-10-23 10:07:05 -07:00
Nick Alexander
43901100df Bug 1214366 - Part 2: Add getLastVisited equivalent to Fennec. r=rnewman 
The approach is the same as that used on Desktop.  The function name
calls out the "prePath" and "milliseconds" since the first is likely
to be overlooked by Fennec consumers, and the second is notably
different than Desktop (where the database timestamps are microseconds).

--HG--
extra : commitid : 2A7Eux7zPkE
extra : rebase_source : 1ae224da0e2a7836bda84a4371e89afa84f2bf2a
 2015-10-23 10:06:26 -07:00
vivek
f959a4d1ef Bug 1218129: Added instanceof check before call to QueryInterface r=margaret 
Thanks for that trick @mfinkle

--HG--
extra : commitid : CpaSIg8eK3G
extra : rebase_source : fd1969c0c513b3a930984f380bf3bfe981a7e429
 2015-10-26 19:40:39 +02:00
Michael Comella
3cf4ca52de Bug 1215353 - Move TabReceivedBroadcastReceiver notifications to IntentService. r=nalexander 
--HG--
rename : mobile/android/base/sync/TabReceivedBroadcastReceiver.java => mobile/android/base/sync/TabReceivedService.java
extra : commitid : BiorrdiQT71
extra : rebase_source : aa51743b45fd9cfaa9b837a2ffbab8e8d6beef14
 2015-10-21 14:19:49 -04:00
Jonathan Almeida [:jonalmeida]
6814c7b02b Bug 1217232 - Hide placeholder svg path in context menu when unblocking image r=mfinkle 
--HG--
extra : transplant_source : %C7%C0gr%03%85%F8%1B%A4%88%21G%92%21%8B%C9%3Bs%DB%1B
 2015-10-23 17:32:39 -04:00
Michael Comella
c12448a7c8 Bug 1216503 - Have GeckoPrefs inherit from Gecko on 5+. r=sebastian 
Before we inherited from GeckoBase, which did not have the colorAccent
attribute.

--HG--
extra : commitid : LK0WCHwaH6x
extra : rebase_source : caeaf49dd9f7e6f05e3b8cfede997eeb2a75a805
 2015-10-20 15:38:39 -04:00
Wes Kocher
e01755351b Merge m-c to fx-team, a=merge 
--HG--
extra : commitid : 5iarrH8FlDy
 2015-10-23 15:52:55 -07:00
Wes Kocher
efe440fad9 Merge b2ginbound to central, a=merge 
--HG--
extra : commitid : LUnL6HF99Z8
 2015-10-23 15:46:08 -07:00
Nick Alexander
89efe3149f Bug 1192064 - Determine |mach artifact| job from mozconfig. r=me 
--HG--
extra : commitid : 9sMUojGWpD7
extra : rebase_source : 7bdbf52d91cfa93e0bf58759f6e2de7545051662
extra : histedit_source : 7da99868e3f6079f6318f20460cfa78555a83d2f
 2015-10-23 15:02:02 -07:00
Nick Alexander
bf604f1900 Bug 1192064 - Add 'android-x86' job to |mach artifact|. r=jonalmeida 
--HG--
extra : commitid : 9WM7rT9goKZ
extra : rebase_source : 84c411a8ec4cd299b9b7e3ea009e05117728c57b
extra : histedit_source : c2356540e15927e362c6f1e0fba8ddd9b047cc31
 2015-10-23 12:55:16 -07:00
Fabrice Desré
8aa454d54c Bug 1207421 - Find a way to access the gaia task switcher r=reuben 2015-10-23 08:57:55 -07:00
Sebastian Kaspari
fd13c2e2bc Bug 1202753 - Tabs tray (Grid): Scroll to selected tab if it is not visible. r=margaret 
--HG--
extra : commitid : Cm97FTi6pCd
extra : rebase_source : 94961d50ccf77ccfcb884df4f41ab1e970630224
extra : amend_source : eccc38963aa0244ed05eb11481fe06b603d837f8
 2015-10-23 12:57:17 +02:00
J. Ryan Stinnett
64bf2d6b32 Bug 1217687 - Revert back to including /devtools via toolkit. r=glandium 2015-10-23 06:04:45 -05:00
Carsten "Tomcat" Book
c138c48fd1 Merge m-c to fx-team 2015-10-23 11:51:27 +02:00
Sebastian Kaspari
686c33075c Bug 1217003 - Tabs tray (List): Remove unused landscape layout. r=margaret 
--HG--
extra : commitid : KX50oJO0G31
extra : rebase_source : e48251654a81fe6f26804ad4474201b62735112c
 2015-10-23 10:26:03 +02:00
Sebastian Kaspari
88dea54640 Bug 1217003 - Tabs tray (List): Use ImageView without background for close button. r=margaret 
This creates feature parity with the tab view of the grid tabs tray.

Previously the ImageButton created an unpleasant effect when the List row was pressed (due to
duplicateParentState). Rather than losing the selection state by removing duplicateParentState,
this patch will effectively remove the focus state from the close button. This ressembles the
behavior of the close button in the grid version of the tabs tray.

--HG--
extra : commitid : Boe3L8qOvJ1
extra : rebase_source : 008d7532becde2afa272449074d80aec74d50f17
 2015-10-22 12:41:04 +02:00
Sebastian Kaspari
6a4c749dd9 Bug 1217003 - Tabs tray (List): Use different text color and close button style if tab is selected. r=margaret 
This will create feature parity with the look & feel of tabs in the grid view.

--HG--
extra : commitid : 3eOQy5B93tt
extra : rebase_source : b2079bb0cf7fbba0b82010c22b59b58e8dbd9905
 2015-10-22 12:30:54 +02:00
Sebastian Kaspari
028de34297 Bug 1217003 - Tabs tray (List): Add drawable padding for audio indicator. r=margaret 
This patch is using the same value we use in the tabs tray grid (tabs_layout_item_view.xml).

--HG--
extra : commitid : I4YLFKAccy1
extra : rebase_source : 21cee94b2ca474228437368ea9219f26670080a7
 2015-10-22 12:13:37 +02:00
Sebastian Kaspari
5ae5fd8948 Bug 1217003 - Tabs tray (List): Vertically center tab title. r=margaret 
--HG--
extra : commitid : 26D4aT3derL
extra : rebase_source : 56b2a11b4c149bdad1416b22c4642510cf879c88
 2015-10-22 12:07:32 +02:00
Sebastian Kaspari
abf9f9b6bb Bug 1215950 - GeckoInputConnection: Run re-focus workaround on the UI thread. r=jchen 
--HG--
extra : commitid : Kr4SMp8ijae
extra : rebase_source : 165537cde92b5d5f81cf6b4c4aab9a5cbe48b00a
 2015-10-23 10:05:40 +02:00
Nick Alexander
e4602fd4e7 Bug 1215604 - Use <intent-filter> indirection to allow native and web Sync Get Started activities. r=margaret 
--HG--
extra : commitid : EahFUJCcVIC
extra : rebase_source : fab0ebf7728d14a9dd577bdbec64216a8f7b08a7
extra : histedit_source : 8957846ba850fcae9dc4237e6c863ff5f7673a5d
 2015-10-21 15:32:42 -07:00
Wes Kocher
9c5b4f52e1 Backed out changeset a6eb8032ebf6 (bug 1217416) for b2gdroid build bustage 
--HG--
extra : commitid : H0QJaiNw5dg
 2015-10-23 14:25:49 -07:00
Sebastian Kaspari
b4ba229f35 Bug 1208863 - CropImageView: Reset matrix before reusing it. r=margaret 
--HG--
extra : commitid : 7g65WiZDyqH
extra : rebase_source : 1f605a3705a6130588ad65c81d842bead04ee3b0
 2015-10-23 19:52:34 +02:00