56e157765f
Merge fx-team to m-c on a CLOSED TREE.
2013-11-14 22:19:19 -05:00
267728c4c6
Bug 936593 - Allow overriding active button colors. r=mfinkle
2013-11-12 16:23:52 -08:00
6d0b415bd5
Bug 936008 - Unregister tabs listener in LayerView. r=kats
2013-11-11 13:56:47 -08:00
2c54507ff7
Bug 924693 - Add payment callbacks earlier in startup. r=mfinkle
2013-11-11 13:56:10 -08:00
92244f5510
Merge m-c to fx-team.
2013-11-11 16:03:46 -05:00
4343609ebb
Backed out changesets 5fdcf5a9697f, da1a4740a722, and f16921967806 (bug 935628) for robocop failures.
...
CLOSED TREE
2013-11-11 15:56:27 -05:00
ac6b377e78
Merge inbound to m-c.
2013-11-11 15:41:03 -05:00
37f29611d1
Bug 915897 - Disable testShareLink due to intermittent failures.
2013-11-11 12:25:42 -05:00
030eea98bd
Bug 934345 - Move NotificationHelper initialization to GeckoApp since it was being initialized twice when more than one process were active. r=wesj
2013-11-11 11:17:02 -05:00
7419652e74
Bug 934900 - Ensure back/forward are not re-enabled while in editing mode (r=sriram)
2013-11-11 18:43:40 +00:00
0b54712661
Bug 936522 - Move preference-related to the preferences package (r=liuche)
...
--HG--
rename : mobile/android/base/AlignRightLinkPreference.java => mobile/android/base/preferences/AlignRightLinkPreference.java
rename : mobile/android/base/AndroidImport.java => mobile/android/base/preferences/AndroidImport.java
rename : mobile/android/base/AndroidImportPreference.java => mobile/android/base/preferences/AndroidImportPreference.java
rename : mobile/android/base/FontSizePreference.java => mobile/android/base/preferences/FontSizePreference.java
rename : mobile/android/base/GeckoPreferenceFragment.java => mobile/android/base/preferences/GeckoPreferenceFragment.java
rename : mobile/android/base/GeckoPreferences.java => mobile/android/base/preferences/GeckoPreferences.java
rename : mobile/android/base/LinkPreference.java => mobile/android/base/preferences/LinkPreference.java
rename : mobile/android/base/MultiChoicePreference.java => mobile/android/base/preferences/MultiChoicePreference.java
rename : mobile/android/base/PrivateDataPreference.java => mobile/android/base/preferences/PrivateDataPreference.java
rename : mobile/android/base/SyncPreference.java => mobile/android/base/preferences/SyncPreference.java
2013-11-11 18:41:16 +00:00
d2cef0903c
Bug 936519 - Move general-purpose views to the widget package (r=mfinkle)
...
--HG--
rename : mobile/android/base/AllCapsTextView.java => mobile/android/base/widget/AllCapsTextView.java
rename : mobile/android/base/AnimatedHeightLayout.java => mobile/android/base/widget/AnimatedHeightLayout.java
rename : mobile/android/base/CheckableLinearLayout.java => mobile/android/base/widget/CheckableLinearLayout.java
rename : mobile/android/base/ClickableWhenDisabledEditText.java => mobile/android/base/widget/ClickableWhenDisabledEditText.java
rename : mobile/android/base/FlowLayout.java => mobile/android/base/widget/FlowLayout.java
2013-11-11 18:41:12 +00:00
30e5813e65
Bug 935628 - Only show right edge in toolbar when necessary (r=sriram)
2013-11-11 18:33:55 +00:00
7e5972dae7
Bug 935628 - Remove BrowserToolbarBackground from toolbar (r=sriram)
2013-11-11 18:33:49 +00:00
2ef8a630f9
Bug 935628 - Animate toolbar with translation instead of scroll (r=sriram)
2013-11-11 18:33:45 +00:00
4c5da5d643
No bug - Alphabetize robocop.ini. DONTBUILD
2013-11-11 10:51:32 -05:00
7aa01d109d
Bug 913254 - Disable testReaderMode due to intermittent failures.
2013-11-11 10:36:19 -05:00
5ffb918919
Bug 936226 - Disable frequent robocop failures on Android x86; r=dminor
2013-11-11 07:54:12 -07:00
355dc507c8
Bug 915350 - Disable testBookmark due to intermittent failures.
2013-11-11 08:34:54 -05:00
1a75e4e0f0
Bug 935543 - Remove unused members in BrowserToolbar (r=wesj)
2013-11-11 16:54:19 +00:00
e26ab6e0a3
Bug 935526 - Remove redudant uses of 'this' in PageActionLayout (r=wesj)
2013-11-11 16:54:10 +00:00
ae6f76e443
Merge mozilla-central to mozilla-inbound
2013-11-09 12:25:41 +01:00
a2d60c49f1
Bug 846569 - Don't scroll tabs tray when a tab is closed. r=lucasr
2013-11-08 13:35:44 -08:00
84c92aeac4
Bug 935414 - Limit number of constraint terms in filter query. r=lucasr
2013-11-08 13:35:41 -08:00
b3c70f5640
Bug 935527 - Make all inner views private in BrowserToolbar (r=margaret)
2013-11-08 15:11:43 +00:00
4487cdf0f2
Bug 935527 - Add getter for DoorHanger anchor view (r=margaret)
2013-11-08 15:11:42 +00:00
5b154f5287
Bug 935534 - Use simpler element form for CustomEditText (r=sriram)
2013-11-08 15:07:30 +00:00
868884b663
Bug 935534 - Use UrlBar.ImageButton.Unused on Back/Fwd phone buttons (r=sriram)
2013-11-08 15:07:29 +00:00
a6859c76ca
Bug 935523 - Make BrowserApp's mBrowserToolbar non-static and private (r=sriram)
2013-11-08 15:04:19 +00:00
c3c0dcea4b
Bug 935523 - Remove setShadowVisibility() as it's not needed anymore (r=sriram)
2013-11-08 15:04:18 +00:00
c945885b04
Merge mozilla-central to fx-team
2013-11-08 16:02:49 +01:00
0268f43863
Bug 935530 - Fix subtle misalignment of stop button (r=sriram)
2013-11-08 14:47:41 +00:00
b7effd61f4
Merge fx-team to m-c
2013-11-07 17:33:06 -08:00
4a207df851
Bug 905703 - Remove preprocessing from robocop harness and tests. r=nalexander
...
--HG--
rename : build/mobile/robocop/Actions.java.in => build/mobile/robocop/Actions.java
rename : build/mobile/robocop/Assert.java.in => build/mobile/robocop/Assert.java
rename : build/mobile/robocop/Driver.java.in => build/mobile/robocop/Driver.java
rename : build/mobile/robocop/Element.java.in => build/mobile/robocop/Element.java
rename : build/mobile/robocop/FennecInstrumentationTestRunner.java.in => build/mobile/robocop/FennecInstrumentationTestRunner.java
rename : build/mobile/robocop/FennecMochitestAssert.java.in => build/mobile/robocop/FennecMochitestAssert.java
rename : build/mobile/robocop/FennecNativeActions.java.in => build/mobile/robocop/FennecNativeActions.java
rename : build/mobile/robocop/FennecNativeDriver.java.in => build/mobile/robocop/FennecNativeDriver.java
rename : build/mobile/robocop/FennecNativeElement.java.in => build/mobile/robocop/FennecNativeElement.java
rename : build/mobile/robocop/FennecTalosAssert.java.in => build/mobile/robocop/FennecTalosAssert.java
rename : build/mobile/robocop/PaintedSurface.java.in => build/mobile/robocop/PaintedSurface.java
rename : build/mobile/robocop/RoboCopException.java.in => build/mobile/robocop/RoboCopException.java
rename : build/mobile/robocop/RobocopUtils.java.in => build/mobile/robocop/RobocopUtils.java
rename : mobile/android/base/tests/AboutHomeTest.java.in => mobile/android/base/tests/AboutHomeTest.java
rename : mobile/android/base/tests/BaseTest.java.in => mobile/android/base/tests/BaseTest.java
rename : mobile/android/base/tests/ContentContextMenuTest.java.in => mobile/android/base/tests/ContentContextMenuTest.java
rename : mobile/android/base/tests/ContentProviderTest.java.in => mobile/android/base/tests/ContentProviderTest.java
rename : mobile/android/base/tests/DatabaseHelper.java.in => mobile/android/base/tests/DatabaseHelper.java
rename : mobile/android/base/tests/JavascriptTest.java.in => mobile/android/base/tests/JavascriptTest.java
rename : mobile/android/base/tests/MotionEventHelper.java.in => mobile/android/base/tests/MotionEventHelper.java
rename : mobile/android/base/tests/MotionEventReplayer.java.in => mobile/android/base/tests/MotionEventReplayer.java
rename : mobile/android/base/tests/PixelTest.java.in => mobile/android/base/tests/PixelTest.java
rename : mobile/android/base/tests/StringHelper.java.in => mobile/android/base/tests/StringHelper.java
rename : mobile/android/base/tests/testAboutPage.java.in => mobile/android/base/tests/testAboutPage.java
rename : mobile/android/base/tests/testAddSearchEngine.java.in => mobile/android/base/tests/testAddSearchEngine.java
rename : mobile/android/base/tests/testAddonManager.java.in => mobile/android/base/tests/testAddonManager.java
rename : mobile/android/base/tests/testAwesomebar.java.in => mobile/android/base/tests/testAwesomebar.java
rename : mobile/android/base/tests/testAwesomebarSwipes.java.in => mobile/android/base/tests/testAwesomebarSwipes.java
rename : mobile/android/base/tests/testAxisLocking.java.in => mobile/android/base/tests/testAxisLocking.java
rename : mobile/android/base/tests/testBookmark.java.in => mobile/android/base/tests/testBookmark.java
rename : mobile/android/base/tests/testBookmarkFolders.java.in => mobile/android/base/tests/testBookmarkFolders.java
rename : mobile/android/base/tests/testBookmarkKeyword.java.in => mobile/android/base/tests/testBookmarkKeyword.java
rename : mobile/android/base/tests/testBookmarklets.java.in => mobile/android/base/tests/testBookmarklets.java
rename : mobile/android/base/tests/testBookmarksPage.java.in => mobile/android/base/tests/testBookmarksPage.java
rename : mobile/android/base/tests/testBrowserProvider.java.in => mobile/android/base/tests/testBrowserProvider.java
rename : mobile/android/base/tests/testBrowserProviderPerf.java.in => mobile/android/base/tests/testBrowserProviderPerf.java
rename : mobile/android/base/tests/testBrowserSearchVisibility.java.in => mobile/android/base/tests/testBrowserSearchVisibility.java
rename : mobile/android/base/tests/testCheck.java.in => mobile/android/base/tests/testCheck.java
rename : mobile/android/base/tests/testCheck2.java.in => mobile/android/base/tests/testCheck2.java
rename : mobile/android/base/tests/testClearPrivateData.java.in => mobile/android/base/tests/testClearPrivateData.java
rename : mobile/android/base/tests/testDeviceSearchEngine.java.in => mobile/android/base/tests/testDeviceSearchEngine.java
rename : mobile/android/base/tests/testDistribution.java.in => mobile/android/base/tests/testDistribution.java
rename : mobile/android/base/tests/testDoorHanger.java.in => mobile/android/base/tests/testDoorHanger.java
rename : mobile/android/base/tests/testFindInPage.java.in => mobile/android/base/tests/testFindInPage.java
rename : mobile/android/base/tests/testFlingCorrectness.java.in => mobile/android/base/tests/testFlingCorrectness.java
rename : mobile/android/base/tests/testFormHistory.java.in => mobile/android/base/tests/testFormHistory.java
rename : mobile/android/base/tests/testGetUserMedia.java.in => mobile/android/base/tests/testGetUserMedia.java
rename : mobile/android/base/tests/testHistory.java.in => mobile/android/base/tests/testHistory.java
rename : mobile/android/base/tests/testHomeBanner.java.in => mobile/android/base/tests/testHomeBanner.java
rename : mobile/android/base/tests/testImportFromAndroid.java.in => mobile/android/base/tests/testImportFromAndroid.java
rename : mobile/android/base/tests/testInputUrlBar.java.in => mobile/android/base/tests/testInputUrlBar.java
rename : mobile/android/base/tests/testJNI.java.in => mobile/android/base/tests/testJNI.java
rename : mobile/android/base/tests/testJarReader.java.in => mobile/android/base/tests/testJarReader.java
rename : mobile/android/base/tests/testLinkContextMenu.java.in => mobile/android/base/tests/testLinkContextMenu.java
rename : mobile/android/base/tests/testLoad.java.in => mobile/android/base/tests/testLoad.java
rename : mobile/android/base/tests/testMailToContextMenu.java.in => mobile/android/base/tests/testMailToContextMenu.java
rename : mobile/android/base/tests/testMasterPassword.java.in => mobile/android/base/tests/testMasterPassword.java
rename : mobile/android/base/tests/testNewTab.java.in => mobile/android/base/tests/testNewTab.java
rename : mobile/android/base/tests/testOrderedBroadcast.java.in => mobile/android/base/tests/testOrderedBroadcast.java
rename : mobile/android/base/tests/testOverscroll.java.in => mobile/android/base/tests/testOverscroll.java
rename : mobile/android/base/tests/testPan.java.in => mobile/android/base/tests/testPan.java
rename : mobile/android/base/tests/testPanCorrectness.java.in => mobile/android/base/tests/testPanCorrectness.java
rename : mobile/android/base/tests/testPasswordEncrypt.java.in => mobile/android/base/tests/testPasswordEncrypt.java
rename : mobile/android/base/tests/testPasswordProvider.java.in => mobile/android/base/tests/testPasswordProvider.java
rename : mobile/android/base/tests/testPermissions.java.in => mobile/android/base/tests/testPermissions.java
rename : mobile/android/base/tests/testPictureLinkContextMenu.java.in => mobile/android/base/tests/testPictureLinkContextMenu.java
rename : mobile/android/base/tests/testPrefsObserver.java.in => mobile/android/base/tests/testPrefsObserver.java
rename : mobile/android/base/tests/testPrivateBrowsing.java.in => mobile/android/base/tests/testPrivateBrowsing.java
rename : mobile/android/base/tests/testPromptGridInput.java.in => mobile/android/base/tests/testPromptGridInput.java
rename : mobile/android/base/tests/testReaderMode.java.in => mobile/android/base/tests/testReaderMode.java
rename : mobile/android/base/tests/testSearchSuggestions.java.in => mobile/android/base/tests/testSearchSuggestions.java
rename : mobile/android/base/tests/testSettingsMenuItems.java.in => mobile/android/base/tests/testSettingsMenuItems.java
rename : mobile/android/base/tests/testShareLink.java.in => mobile/android/base/tests/testShareLink.java
rename : mobile/android/base/tests/testSharedPreferences.java.in => mobile/android/base/tests/testSharedPreferences.java
rename : mobile/android/base/tests/testSystemPages.java.in => mobile/android/base/tests/testSystemPages.java
rename : mobile/android/base/tests/testTabHistory.java.in => mobile/android/base/tests/testTabHistory.java
rename : mobile/android/base/tests/testThumbnails.java.in => mobile/android/base/tests/testThumbnails.java
rename : mobile/android/base/tests/testVkbOverlap.java.in => mobile/android/base/tests/testVkbOverlap.java
rename : mobile/android/base/tests/test_bug720538.java.in => mobile/android/base/tests/test_bug720538.java
extra : rebase_source : c8d715aa110b07c6010054a674879e143a5f04e7
extra : amend_source : fb5714b78e055e336b5e0c6a0da8eb8c931ff09e
extra : histedit_source : ec57d8ba94000092438a2ba0bf4fb66091e98513%2C114ade72bb9b72b96557da74f1179734fa347e5c
2013-11-07 11:18:51 -05:00
a470038314
Bug 935305 - Move preprocessor to mozbuild.action. r=gps
...
--HG--
rename : config/Preprocessor.py => python/mozbuild/mozbuild/preprocessor.py
rename : config/tests/unit-Expression.py => python/mozbuild/mozbuild/test/test_expression.py
rename : config/tests/unit-LineEndings.py => python/mozbuild/mozbuild/test/test_line_endings.py
rename : config/tests/unit-Preprocessor.py => python/mozbuild/mozbuild/test/test_preprocessor.py
2013-11-09 10:35:44 +09:00
aa27f88eb0
Merge m-c to inbound
2013-11-07 17:56:10 -08:00
53daa692c8
Bug 932112: Rollup of changes previously applied to media/webrtc/trunk/webrtc rs=jesup
...
* * *
* * *
Add AndroidAudioManager to the moz.build files.
2013-11-07 20:07:47 -05:00
e97e27e96e
bug 930062 - GeckoView library should support building as an ant project r=nalexander
2013-10-24 01:08:29 +02:00
069bf2bdef
Bug 911364 - Connect new GeckoView to Gecko after rotation. r=mfinkle
2013-11-07 11:38:00 -08:00
c34f3fcd03
Bug 930566 - Change sans-serif title to bold. r=lucasr
...
DONTBUILD
2013-11-07 11:37:01 -05:00
784e81a440
Bug 922147 - Abstract password out of Android Sync auth flow. r=rnewman
...
--HG--
extra : amend_source : 785ee7294bce83665caa3d79ee2144644fc7b9b5
extra : histedit_source : b4b47d0903d6f94b8bd08b78654b4538d18e220f%2Cf89a9d672b5ac4e13481abfcc0f937182680eddd
2013-11-13 19:36:02 -08:00
30c7e2173f
Bug 933300 - Write preprocessed Fennec code into generated/org/mozilla/*. r=glandium
2013-11-13 19:32:55 -08:00
355f92582f
Backed out changeset ba9c8fcf76e6 (bug 933300)
2013-11-13 17:11:58 -08:00
bb285d9ecf
Backed out changeset 569d58c88da3 (bug 922147)
2013-11-13 17:03:18 -08:00
233b15cf3b
Backed out changeset 1bef02988eb7 (bug 922147)
2013-11-13 17:03:17 -08:00
73a1b1e6d7
Bug 922147 - Follow-up: Fix build bustage on a CLOSED TREE.
...
--HG--
extra : amend_source : 20b3c088b9bfe11ca4a187fe1d96334f4196f323
2013-11-13 15:43:20 -08:00
341cdd3040
Bug 922147 - Abstract password out of Android Sync auth flow. r=rnewman
2013-11-13 15:11:16 -08:00
c24481562d
Bug 933300 - Write preprocessed Fennec code into generated/org/mozilla/*. r=glandium
...
This writes source with preprocessed package names into
generated/org/mozilla/{firefox,firefox_beta,fennec,fennec_$USERID},
and the other preprocessed source into generated/org/mozilla/gecko.
This layout matches the Java package hierarchy and is what IDEs expect
when including $OBJDIR/generated as a source directory.
--HG--
extra : rebase_source : 5cc397e6808d21a662c1f718ef49ee148c15e465
2013-11-11 23:39:16 -05:00
976e97b40a
Bug 936727 - Garble account name that is logged by UpgradeReceiver. r=rnewman
2013-11-13 08:23:02 -05:00
c4eedb156d
Bug 852608 - Part 3: Add UI for adding a search engine. r=lucasr
2013-11-06 15:21:56 -08:00
Ryan VanderMeulen
Wes Johnston
Federico Paolinelli
Lucas Rocha
Lucas Rocha
Geoff Brown
Carsten "Tomcat" Book
Margaret Leibovic
Wes Kocher
Brian Nicholson
Mike Hommey
Randell Jesup
Brad Lassey
Dominic Kuang
Nick Alexander
Swaroop Rao
Chenxia Liu