Commit Graph

11204 Commits

Author SHA1 Message Date
Carsten "Tomcat" Book
19e4c98632 Merge m-c to mozilla-inbound 2013-11-20 15:33:32 +01:00
Carsten "Tomcat" Book
298ab5dd3e Backed out changeset 5dd946b1f29b (bug 934646) Android Nightly Build Bustage 2013-11-20 15:16:32 +01:00
Carsten "Tomcat" Book
1148e21d64 Backed out changeset 4ae3d82562fa (bug 934646) Android Nighly Build Bustage 2013-11-20 15:16:17 +01:00
Carsten "Tomcat" Book
22519643b6 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
73463a4880 Merge inbound to m-c. 2013-11-19 20:43:15 -05:00
Nick Alexander
0bec83eec7 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
659ccf3419 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
06028442a6 Bug 939680 - Implement nsINetworkLinkService.linkType on Android r=blassey 2013-11-18 23:43:09 -05:00
Wes Johnston
efd71cba3e 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
edad724fda Bug 768667 - Provide an action mode for compatibility with old Android versions. r=sriram 2013-11-19 11:57:35 -08:00
Ryan VanderMeulen
99217d0d2e 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
f60d2fd5dd 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
0c05ef6452 Bug 934470 - Cursor pin disappears on drag in textarea input, r=margaret 2013-11-18 23:48:49 -05:00
Chris Kitching
49274d490a Bug 913985 - Part 6: remove redundant AndroidBridge::Bridge() checks. r=kats 2013-11-12 10:41:01 -08:00
Chris Kitching
6ba50c4b94 Bug 913985 - Part 5: refactor the Bridge to use the generated code. r=kats 2013-11-12 10:41:01 -08:00
Chris Kitching
7a52179daa 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
34f0ac2169 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
862dd3de5f 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
8ceb917350 Bug 939074 - Remove most LIBXUL_LIBRARY. rs=gps 2013-11-19 11:48:10 +09:00
Mike Hommey
9fe772e7fd Bug 939044 - Rename remaining MODULE definitions to XPIDL_MODULE. r=mshal 2013-11-19 11:47:43 +09:00
Mike Hommey
d7b6f95761 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
ed9b536ced Merge fx-team to m-c on a CLOSED TREE 2013-11-18 18:25:57 -08:00
Benoit Jacob
eeff611692 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
5242a8937e 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
87e8e358f3 Bug 938304 - Pass messages from payment providers back to requester. r=mfinkle 2013-11-18 13:46:09 -08:00
Sriram Ramasubramanian
e15f1bd4b7 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
d7975ce1b7 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
68e62f449a Bug 916507 - Part 4: Remove reflection from tests. r=nalexander 2013-11-18 11:50:12 -08:00
Michael Comella
338766978b Bug 916507 - Part 3: Remove reflection from DatabaseHelper. r=nalexander 2013-11-18 11:50:11 -08:00
Michael Comella
9ea21fd958 Bug 916507 - Part 2: Remove reflection from BaseTest. r=nalexander 2013-11-13 14:53:21 -08:00
Sriram Ramasubramanian
e3963ed591 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
675185dcf3 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
c69ecab3b5 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
9cbb113bf2 Bug 937769 - JS Error: Error in invoking addEngine, no onError. r=lucasr 2013-11-18 10:17:46 -08:00
Michael Comella
3d9b8c7095 Bug 935604 - Part 2: Typing about:home directly does not break tab. r=sriram 2013-11-14 14:13:54 -08:00
Michael Comella
78be7461a9 Bug 935604 - Part 1: Fix graphical corruption on page load. r=lucasr 2013-11-15 09:42:58 -08:00
Brian Nicholson
def58437dd Bug 874985 - Part 3: Session restore tests. r=gbrown 2013-11-15 22:59:17 -08:00
Brian Nicholson
22fc041390 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
43c3f0d4ad Bug 874985 - Part 1: Robustify existing test methods. r=gbrown 2013-11-15 22:59:16 -08:00
Brian Nicholson
85e2a1e3bc Bug 937945 - Don't store Context in GeckoProfile. r=rnewman 2013-11-15 22:53:53 -08:00
Benoit Jacob
e1e0174f07 Bug 925608 - 8/8: remove mServerSurfaceValid - r=kats 2013-11-15 11:29:01 -05:00
Benoit Jacob
1d3a8d8fae Bug 925608 - 7/8: rename ProvideEGLSurface to CreateEGLSurfaceForCompositor - r=kats 2013-11-15 11:28:59 -05:00
Benoit Jacob
b56e9f0b0c Bug 925608 - 6/8: rename createCompositor to updateCompositor - r=kats 2013-11-15 11:28:57 -05:00
Benoit Jacob
0fbd16e75b Bug 925608 - 5/8: simplify serverSurfaceChanged callback - r=kats 2013-11-15 11:28:56 -05:00
Benoit Jacob
d6ee05d835 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
009d0cc6b3 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
5e059f1fa7 Bug 925608 - 2/8: Rename mSurface to mClientSurface - r=kats 2013-11-15 11:28:50 -05:00
Benoit Jacob
5b5eb3c161 Bug 925608 - 1/8: Rename mSurfaceValid to mServerSurfaceValid for clarity - r=kats 2013-11-15 11:28:49 -05:00
Benoit Jacob
5480ece61e 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
0f4c4191c2 Bug 934646 - Replace hard-coded Android resource ID. r=mfinkle 2013-11-07 15:01:54 -05:00