Swaroop Rao
06b5f8f7cf
Bug 936727 - Garble account name that is logged by UpgradeReceiver. (Reapplied ee57a684f9f2, blown away by 569d58c88da3.) r=rnewman
2013-11-13 08:23:02 -05:00
Chris Kitching
f7dde79803
Bug 913985: Part 6 - Remove redundant AndroidBridge::Bridge() checks. r=kats
2013-11-12 10:41:01 -08:00
Chris Kitching
36c7d139c0
Bug 913985: Part 5 - Refactor the Bridge to use the generated code. r=kats
2013-11-12 10:41:01 -08:00
Chris Kitching
c7984b3c10
Bug 913985: Part 3 - Update the annotation processor to generate wrapper classes. r=kats
...
--HG--
rename : build/annotationProcessors/MethodWithAnnotationInfo.java => build/annotationProcessors/AnnotationInfo.java
rename : build/annotationProcessors/utils/AlphabeticMethodComparator.java => build/annotationProcessors/utils/AlphabeticAnnotatableEntityComparator.java
rename : build/annotationProcessors/utils/GeneratableEntryPointIterator.java => build/annotationProcessors/utils/GeneratableElementIterator.java
2013-11-21 20:41:28 +00:00
Chris Kitching
a0d772e2ad
Bug 913985: Part 2 - Add annotations to all remaining JNI entry points, marking them for generations. r=kats
2013-11-12 10:41:00 -08:00
Chris Kitching
c7f7720232
Bug 913985: Part 1 - Introduce a nicer annotation API for the generator, and migrate all existing annotations to it. r=kats
...
--HG--
rename : mobile/android/base/mozglue/OptionalGeneratedParameter.java => mobile/android/base/mozglue/generatorannotations/OptionalGeneratedParameter.java
rename : mobile/android/base/mozglue/GeneratableAndroidBridgeTarget.java => mobile/android/base/mozglue/generatorannotations/WrapElementForJNI.java
2013-11-12 10:40:59 -08:00
Lucas Rocha
8ca68f6008
Bug 883500 - Update query to avoid bookmarks with null URLs. r=mfinkle
2013-11-18 15:40:27 -08:00
Ryan VanderMeulen
5f5fcba645
Merge m-c to fx-team.
2013-11-21 11:39:17 -05:00
Ryan VanderMeulen
976017db14
Backed out changeset 95562517dc8c (bug 938818) for Android crashes.
2013-11-21 11:06:22 -05:00
Carsten "Tomcat" Book
c2ff3261b4
merge fx-team to mozilla-central
2013-11-21 14:32:10 +01:00
Lucas Rocha
a4c7c3793b
Bug 939060 - Check URL associated with grid item before displaying favicon. r=rnewman
2013-11-20 17:09:51 -08:00
Brad Lassey
0f8d21e4e6
bug 930059 - Overscroll.java doesn't need to use compatibility libraries, follow up to not use invalidateAfterAnnimation on ICS r=wesj
2013-11-20 14:35:10 -08:00
Taylor Skidmore
86aca42387
Bug 938818 - Change calls to mLayerView.setVisibility to mLayerView.show or .hide. r=mcomella
2013-11-20 20:04:42 -05:00
Lucas Rocha
ae6b364b30
Bug 937534 - Only handle BACK key on ACTION_UP in Bookmarks page (r=mfinkle)
2013-11-21 13:43:21 +00:00
Benoit Jacob
1efd0c594d
Bug 834243 - avoid calling serverSurfaceChanged before the compositor is created - r=vladv
2013-11-20 17:50:54 -05:00
Wes Kocher
0baa2a0d4e
Merge m-c to inbound
2013-11-21 19:18:18 -08:00
Wes Kocher
0ad19cee88
Backed out changeset 763bcda2802f (bug 834243) for Android bustage on a CLOSED TREE
2013-11-21 16:35:44 -08:00
Benoit Jacob
76b65afddb
Bug 834243 - Revert to old behavior of holding off from starting the compositor until we have successfully preallocated its EGLSurface - r=snorp
2013-11-21 16:47:20 -05:00
Ryan VanderMeulen
eb92d7c6c4
Merge m-c to inbound.
2013-11-21 15:53:49 -05:00
Jacob Liebert
b38b9337d2
Bug 871884 - Change text input default in Android browser to capitalize first character in a sentence; r=jchen
2013-11-21 14:57:47 -05:00
Brad Lassey
79ded462ff
bug 930059 - Overscroll.java doesn't need to use compatibility libraries r=wesj
...
--HG--
rename : mobile/android/base/gfx/Overscroll.java => mobile/android/base/gfx/OverscrollEdgeEffect.java
2013-10-23 18:12:28 +02:00
Lucas Rocha
97270cd143
Bug 929982 - Update parent stack and cursor at the same time (r=margaret)
2013-11-20 19:51:05 +00:00
Lucas Rocha
e6640fd9ee
Bug 929982 - Change Bookmark's parent stack to use a custom type (r=margaret)
2013-11-20 19:51:00 +00:00
Mark Capella
cc1a729cb3
Bug 938563 - Select all + copy on textarea doesn't copy linebreaks, r=margaret
2013-11-20 13:57:20 -05:00
Carsten "Tomcat" Book
d2242582b2
Backed out changeset 5dd946b1f29b (bug 934646) Android Nightly Build Bustage
2013-11-20 15:16:32 +01:00
Carsten "Tomcat" Book
56cce399d2
Backed out changeset 4ae3d82562fa (bug 934646) Android Nighly Build Bustage
2013-11-20 15:16:17 +01:00
Carsten "Tomcat" Book
b35c0e3a73
Backed out changeset a829f4d2584a (bug 934646) Android Nightlies Build Bustage
...
--HG--
rename : mobile/android/branding/aurora/res/drawable-xxhdpi/icon.png => mobile/android/branding/aurora/content/fennec_144x144.png
rename : mobile/android/branding/aurora/res/drawable-mdpi/icon.png => mobile/android/branding/aurora/content/fennec_48x48.png
rename : mobile/android/branding/aurora/res/drawable-hdpi/icon.png => mobile/android/branding/aurora/content/fennec_72x72.png
rename : mobile/android/branding/aurora/res/drawable-xhdpi/icon.png => mobile/android/branding/aurora/content/fennec_96x96.png
rename : mobile/android/branding/beta/res/drawable-xxhdpi/icon.png => mobile/android/branding/beta/content/fennec_144x144.png
rename : mobile/android/branding/beta/res/drawable-mdpi/icon.png => mobile/android/branding/beta/content/fennec_48x48.png
rename : mobile/android/branding/beta/res/drawable-hdpi/icon.png => mobile/android/branding/beta/content/fennec_72x72.png
rename : mobile/android/branding/beta/res/drawable-xhdpi/icon.png => mobile/android/branding/beta/content/fennec_96x96.png
rename : mobile/android/branding/nightly/res/drawable-xxhdpi/icon.png => mobile/android/branding/nightly/content/fennec_144x144.png
rename : mobile/android/branding/nightly/res/drawable-mdpi/icon.png => mobile/android/branding/nightly/content/fennec_48x48.png
rename : mobile/android/branding/nightly/res/drawable-hdpi/icon.png => mobile/android/branding/nightly/content/fennec_72x72.png
rename : mobile/android/branding/nightly/res/drawable-xhdpi/icon.png => mobile/android/branding/nightly/content/fennec_96x96.png
rename : mobile/android/branding/official/res/drawable-xxhdpi/icon.png => mobile/android/branding/official/content/fennec_144x144.png
rename : mobile/android/branding/official/res/drawable-mdpi/icon.png => mobile/android/branding/official/content/fennec_48x48.png
rename : mobile/android/branding/official/res/drawable-hdpi/icon.png => mobile/android/branding/official/content/fennec_72x72.png
rename : mobile/android/branding/official/res/drawable-xhdpi/icon.png => mobile/android/branding/official/content/fennec_96x96.png
rename : mobile/android/branding/unofficial/res/drawable-xxhdpi/icon.png => mobile/android/branding/unofficial/content/fennec_144x144.png
rename : mobile/android/branding/unofficial/res/drawable-mdpi/icon.png => mobile/android/branding/unofficial/content/fennec_48x48.png
rename : mobile/android/branding/unofficial/res/drawable-hdpi/icon.png => mobile/android/branding/unofficial/content/fennec_72x72.png
rename : mobile/android/branding/unofficial/res/drawable-xhdpi/icon.png => mobile/android/branding/unofficial/content/fennec_96x96.png
2013-11-20 15:16:00 +01:00
Ryan VanderMeulen
7c7b6a11fe
Merge inbound to m-c.
2013-11-19 20:43:15 -05:00
Nick Alexander
193f865ba8
Bug 934646 - Declare Android resource directories relative to $SRCDIR. r=glandium,gps,mfinkle
...
--HG--
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-11-18 09:31:55 -08:00
Ryan VanderMeulen
fb27786b35
Backed out changesets 26df3bab1ab9 and 3c9dbe653a4e (bug 768667) for Android test bustage.
...
--HG--
rename : mobile/android/base/resources/drawable-hdpi/ic_menu_share.png => mobile/android/base/resources/drawable-hdpi-v11/ic_menu_share.png
rename : mobile/android/base/resources/drawable-mdpi/ic_menu_share.png => mobile/android/base/resources/drawable-mdpi-v11/ic_menu_share.png
rename : mobile/android/base/resources/drawable-xhdpi/ic_menu_share.png => mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_share.png
2013-11-19 17:33:27 -05:00
Mark Finkle
c5df992597
Bug 939680 - Implement nsINetworkLinkService.linkType on Android r=blassey
2013-11-18 23:43:09 -05:00
Wes Johnston
93774474dc
Bug 768667 - Use an actionmode for text selection. r=margaret,sriram
...
--HG--
rename : mobile/android/base/resources/drawable-hdpi-v11/ic_menu_share.png => mobile/android/base/resources/drawable-hdpi/ic_menu_share.png
rename : mobile/android/base/resources/drawable-mdpi-v11/ic_menu_share.png => mobile/android/base/resources/drawable-mdpi/ic_menu_share.png
rename : mobile/android/base/resources/drawable-xhdpi-v11/ic_menu_share.png => mobile/android/base/resources/drawable-xhdpi/ic_menu_share.png
2013-11-19 11:57:37 -08:00
Wes Johnston
9747791d38
Bug 768667 - Provide an action mode for compatibility with old Android versions. r=sriram
2013-11-19 11:57:35 -08:00
Ryan VanderMeulen
2c440594a5
Backed out 7 changesets (bug 913985) for intermittent Android crashes.
...
Backed out changeset 53513a959cf0 (bug 913985)
Backed out changeset d23d1e678417 (bug 913985)
Backed out changeset a9c9187b4f4a (bug 913985)
Backed out changeset c6b02e4a3e35 (bug 913985)
Backed out changeset 895dae322e3c (bug 913985)
Backed out changeset 3d97e6a53313 (bug 913985)
Backed out changeset 892bb017f8ba (bug 913985)
--HG--
rename : build/annotationProcessors/AnnotationInfo.java => build/annotationProcessors/MethodWithAnnotationInfo.java
rename : build/annotationProcessors/utils/AlphabeticAnnotatableEntityComparator.java => build/annotationProcessors/utils/AlphabeticMethodComparator.java
rename : build/annotationProcessors/utils/GeneratableElementIterator.java => build/annotationProcessors/utils/GeneratableEntryPointIterator.java
rename : mobile/android/base/mozglue/generatorannotations/WrapElementForJNI.java => mobile/android/base/mozglue/GeneratableAndroidBridgeTarget.java
rename : mobile/android/base/mozglue/generatorannotations/OptionalGeneratedParameter.java => mobile/android/base/mozglue/OptionalGeneratedParameter.java
2013-11-19 10:56:09 -05:00
Lucas Rocha
d4c8df7ab0
Bug 937641 - Move toolbar-related classes to the toolbar package (r=sriram)
...
--HG--
rename : mobile/android/base/AutocompleteHandler.java => mobile/android/base/toolbar/AutocompleteHandler.java
rename : mobile/android/base/BackButton.java => mobile/android/base/toolbar/BackButton.java
rename : mobile/android/base/BrowserToolbar.java => mobile/android/base/toolbar/BrowserToolbar.java
rename : mobile/android/base/BrowserToolbarBackground.java => mobile/android/base/toolbar/BrowserToolbarBackground.java
rename : mobile/android/base/CanvasDelegate.java => mobile/android/base/toolbar/CanvasDelegate.java
rename : mobile/android/base/ForwardButton.java => mobile/android/base/toolbar/ForwardButton.java
rename : mobile/android/base/PageActionLayout.java => mobile/android/base/toolbar/PageActionLayout.java
rename : mobile/android/base/ShapedButton.java => mobile/android/base/toolbar/ShapedButton.java
rename : mobile/android/base/TabCounter.java => mobile/android/base/toolbar/TabCounter.java
2013-11-19 15:46:48 +00:00
Mark Capella
57aabc0270
Bug 934470 - Cursor pin disappears on drag in textarea input, r=margaret
2013-11-18 23:48:49 -05:00
Chris Kitching
ce5cac707e
Bug 913985 - Part 6: remove redundant AndroidBridge::Bridge() checks. r=kats
2013-11-12 10:41:01 -08:00
Chris Kitching
c4e86cb63e
Bug 913985 - Part 5: refactor the Bridge to use the generated code. r=kats
2013-11-12 10:41:01 -08:00
Chris Kitching
e66536370a
Bug 913985 - Part 3: update the annotation processor to generate wrapper classes. r=kats
...
--HG--
rename : build/annotationProcessors/MethodWithAnnotationInfo.java => build/annotationProcessors/AnnotationInfo.java
rename : build/annotationProcessors/utils/AlphabeticMethodComparator.java => build/annotationProcessors/utils/AlphabeticAnnotatableEntityComparator.java
rename : build/annotationProcessors/utils/GeneratableEntryPointIterator.java => build/annotationProcessors/utils/GeneratableElementIterator.java
2013-11-18 20:31:35 -08:00
Chris Kitching
b034e15277
Bug 913985 - Part 2: add annotations to all remaining JNI entry points, marking them for generations. r=kats
2013-11-12 10:41:00 -08:00
Chris Kitching
a1aea84f38
Bug 913985 - Part 1: introduce a nicer annotation API for the generator, and migrate all existing annotations to it. r=kats
...
--HG--
rename : mobile/android/base/mozglue/OptionalGeneratedParameter.java => mobile/android/base/mozglue/generatorannotations/OptionalGeneratedParameter.java
rename : mobile/android/base/mozglue/GeneratableAndroidBridgeTarget.java => mobile/android/base/mozglue/generatorannotations/WrapElementForJNI.java
2013-11-12 10:40:59 -08:00
Mike Hommey
e06d795c71
Bug 939074 - Remove most LIBXUL_LIBRARY. rs=gps
2013-11-19 11:48:10 +09:00
Mike Hommey
26bc04d200
Bug 939044 - Rename remaining MODULE definitions to XPIDL_MODULE. r=mshal
2013-11-19 11:47:43 +09:00
Mike Hommey
ffe0380912
Bug 935881 - Use FINAL_LIBRARY for all (fake) libraries that end up linked in a single other library. r=gps
2013-11-19 11:47:14 +09:00
Wes Kocher
991d5a6782
Merge fx-team to m-c on a CLOSED TREE
2013-11-18 18:25:57 -08:00
Benoit Jacob
41684de010
Bug 834243 - back out part 8/8 of bug 925608 on suspiscion that it may be causing EGLSurface creation failures causing crashes on bug 834243 - no review, backing out recent change
2013-11-18 17:57:59 -05:00
Benoit Jacob
4899d3e4bf
Bug 834243 - defer updateCompositor to a runnable on the LayerView in hope that it avoids subsequent EGLSurface creation failures - r=kats
2013-11-18 17:57:47 -05:00
Wes Johnston
0dbe3caeb7
Bug 938304 - Pass messages from payment providers back to requester. r=mfinkle
2013-11-18 13:46:09 -08:00
Sriram Ramasubramanian
cdb3b4bd3f
Bug 928800: Doorhanger, while showing, should respect dynamic toolbar's dynamicness. [r=mfinkle]
...
--HG--
extra : rebase_source : dfb816f01fb26b032b8402b80371d6e70889a3f3
2013-11-14 16:06:01 -08:00
Richard Newman
11fb5f163d
Bug 933272 - Click to play "Tap here to activate plugin." is not localized on multi-locale build. r=mfinkle
2013-11-18 13:25:34 -08:00
Michael Comella
ac528ffe19
Bug 916507 - Part 4: Remove reflection from tests. r=nalexander
2013-11-18 11:50:12 -08:00
Michael Comella
729061638b
Bug 916507 - Part 3: Remove reflection from DatabaseHelper. r=nalexander
2013-11-18 11:50:11 -08:00
Michael Comella
8c841ee70d
Bug 916507 - Part 2: Remove reflection from BaseTest. r=nalexander
2013-11-13 14:53:21 -08:00
Sriram Ramasubramanian
f596a10091
Bug 937829: Make QuickShare aware of the history to choose the icons. [r=mfinkle]
...
--HG--
extra : rebase_source : 9a6d15dc3e4355c9063a4d49cae02259cf3d4cb3
2013-11-13 09:34:09 -08:00
Sriram Ramasubramanian
9a159ff8ea
Bug 937829: Cleanup the layout glitch when only one share icon is shown. [r=mfinkle]
...
--HG--
extra : rebase_source : c9432f960f8295d27d2756406dd0067d7427d83e
2013-11-13 09:34:05 -08:00
Sriram Ramasubramanian
dab31c55e3
Bug 937829: QuickShare with more icons. [r=mfinkle]
...
--HG--
rename : browser/themes/linux/Toolbar-inverted.png => browser/themes/windows/Toolbar-inverted.png
extra : rebase_source : b3bea92b63ce42d7bec2a2da55075e42453b3e56
2013-11-13 09:34:00 -08:00
Chenxia Liu
a744354b48
Bug 937769 - JS Error: Error in invoking addEngine, no onError. r=lucasr
2013-11-18 10:17:46 -08:00
Michael Comella
b716c56863
Bug 935604 - Part 2: Typing about:home directly does not break tab. r=sriram
2013-11-14 14:13:54 -08:00
Michael Comella
acfe8f85ed
Bug 935604 - Part 1: Fix graphical corruption on page load. r=lucasr
2013-11-15 09:42:58 -08:00
Brian Nicholson
3314bff4f6
Bug 874985 - Part 3: Session restore tests. r=gbrown
2013-11-15 22:59:17 -08:00
Brian Nicholson
4c111b5b39
Bug 874985 - Part 2: Add stateBundle extra to allow injecting fake state bundles. r=mfinkle,gbrown
2013-11-15 22:59:17 -08:00
Brian Nicholson
a7fa026862
Bug 874985 - Part 1: Robustify existing test methods. r=gbrown
2013-11-15 22:59:16 -08:00
Brian Nicholson
63380f4655
Bug 937945 - Don't store Context in GeckoProfile. r=rnewman
2013-11-15 22:53:53 -08:00
Benoit Jacob
2538f9f3a5
Bug 925608 - 8/8: remove mServerSurfaceValid - r=kats
2013-11-15 11:29:01 -05:00
Benoit Jacob
8c1260ea32
Bug 925608 - 7/8: rename ProvideEGLSurface to CreateEGLSurfaceForCompositor - r=kats
2013-11-15 11:28:59 -05:00
Benoit Jacob
e68c9e0ae6
Bug 925608 - 6/8: rename createCompositor to updateCompositor - r=kats
2013-11-15 11:28:57 -05:00
Benoit Jacob
e84898872d
Bug 925608 - 5/8: simplify serverSurfaceChanged callback - r=kats
2013-11-15 11:28:56 -05:00
Benoit Jacob
5703ee4082
Bug 925608 - 4/8: Consistently manage the client surface on the GLContext side. Java only provides the function to create a surface - r=kats,jgilbert
...
Also folded in the originally separate patch on bug 936968 because it didn't work on its own.
2013-11-15 11:28:54 -05:00
Benoit Jacob
826d50eb9b
Bug 925608 - 3/8: rename GLController's surfaceDestroyed and surfaceChanged to clarify that they refer to the server surface - r=kats
2013-11-15 11:28:52 -05:00
Benoit Jacob
3afdf5f58d
Bug 925608 - 2/8: Rename mSurface to mClientSurface - r=kats
2013-11-15 11:28:50 -05:00
Benoit Jacob
442cb8d1a8
Bug 925608 - 1/8: Rename mSurfaceValid to mServerSurfaceValid for clarity - r=kats
2013-11-15 11:28:49 -05:00
Benoit Jacob
acdb7ab005
Bug 937204 - 3/3. Kill GfxInfoThread. Instead, get GL strings from the compositor - r=kats,jrmuizel
2013-11-15 11:28:43 -05:00
Nick Alexander
a39c4d3b5b
Bug 934646 - Replace hard-coded Android resource ID. r=mfinkle
2013-11-07 15:01:54 -05:00
Nick Alexander
f164c9c6f2
Bug 934646 - Delete unused resources. r=mfinkle
...
These resources weren't defined in moz.build, so they were never
copied to $OBJDIR/mobile/android/base/res. This means they could not
have been referenced by the system. (Of course, text search turns up
zero uses as well.)
2013-11-06 17:52:52 -05:00
Carsten "Tomcat" Book
9ad5aea201
Merge m-c to mozilla-inbound
2013-11-20 15:33:32 +01:00
Ryan VanderMeulen
56e157765f
Merge fx-team to m-c on a CLOSED TREE.
2013-11-14 22:19:19 -05:00
Wes Johnston
267728c4c6
Bug 936593 - Allow overriding active button colors. r=mfinkle
2013-11-12 16:23:52 -08:00
Wes Johnston
6d0b415bd5
Bug 936008 - Unregister tabs listener in LayerView. r=kats
2013-11-11 13:56:47 -08:00
Wes Johnston
2c54507ff7
Bug 924693 - Add payment callbacks earlier in startup. r=mfinkle
2013-11-11 13:56:10 -08:00
Ryan VanderMeulen
92244f5510
Merge m-c to fx-team.
2013-11-11 16:03:46 -05:00
Ryan VanderMeulen
4343609ebb
Backed out changesets 5fdcf5a9697f, da1a4740a722, and f16921967806 (bug 935628) for robocop failures.
...
CLOSED TREE
2013-11-11 15:56:27 -05:00
Ryan VanderMeulen
ac6b377e78
Merge inbound to m-c.
2013-11-11 15:41:03 -05:00
Ryan VanderMeulen
37f29611d1
Bug 915897 - Disable testShareLink due to intermittent failures.
2013-11-11 12:25:42 -05:00
Federico Paolinelli
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
Lucas Rocha
7419652e74
Bug 934900 - Ensure back/forward are not re-enabled while in editing mode (r=sriram)
2013-11-11 18:43:40 +00:00
Lucas Rocha
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
Lucas Rocha
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
Lucas Rocha
30e5813e65
Bug 935628 - Only show right edge in toolbar when necessary (r=sriram)
2013-11-11 18:33:55 +00:00
Lucas Rocha
7e5972dae7
Bug 935628 - Remove BrowserToolbarBackground from toolbar (r=sriram)
2013-11-11 18:33:49 +00:00
Lucas Rocha
2ef8a630f9
Bug 935628 - Animate toolbar with translation instead of scroll (r=sriram)
2013-11-11 18:33:45 +00:00
Ryan VanderMeulen
4c5da5d643
No bug - Alphabetize robocop.ini. DONTBUILD
2013-11-11 10:51:32 -05:00
Ryan VanderMeulen
7aa01d109d
Bug 913254 - Disable testReaderMode due to intermittent failures.
2013-11-11 10:36:19 -05:00
Geoff Brown
5ffb918919
Bug 936226 - Disable frequent robocop failures on Android x86; r=dminor
2013-11-11 07:54:12 -07:00
Ryan VanderMeulen
355dc507c8
Bug 915350 - Disable testBookmark due to intermittent failures.
2013-11-11 08:34:54 -05:00
Lucas Rocha
1a75e4e0f0
Bug 935543 - Remove unused members in BrowserToolbar (r=wesj)
2013-11-11 16:54:19 +00:00
Lucas Rocha
e26ab6e0a3
Bug 935526 - Remove redudant uses of 'this' in PageActionLayout (r=wesj)
2013-11-11 16:54:10 +00:00
Carsten "Tomcat" Book
ae6f76e443
Merge mozilla-central to mozilla-inbound
2013-11-09 12:25:41 +01:00
Margaret Leibovic
a2d60c49f1
Bug 846569 - Don't scroll tabs tray when a tab is closed. r=lucasr
2013-11-08 13:35:44 -08:00
Margaret Leibovic
84c92aeac4
Bug 935414 - Limit number of constraint terms in filter query. r=lucasr
2013-11-08 13:35:41 -08:00
Lucas Rocha
b3c70f5640
Bug 935527 - Make all inner views private in BrowserToolbar (r=margaret)
2013-11-08 15:11:43 +00:00