Bug 1286511 - Fixes incorrect start menu tile color by removing VisualElementsManfiest.xml r?jaws
This patch removes the VisualElementsManifest.xml file, which I found was breaking the start menu tile for some Windows 10 computers. Without it, firefox.VisualElementsManifest.xml still customizes Nightly's start menu tile for some Windows 10 computers. For others, it leaves the tile unaffected and the default background color and icon image show.
MozReview-Commit-ID: 6eusd5pJTUs
deleted file mode 100644
--- a/browser/branding/aurora/VisualElementsManifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <VisualElements
- DisplayName='Firefox Developer Edition'
- Logo='browser\VisualElements\VisualElements_150.png'
- SmallLogo='browser\VisualElements\VisualElements_70.png'
- ForegroundText='light'
- BackgroundColor='#14171a'/>
- <DefaultTile ShowName='allLogos'/>
- <SplashScreen Image='DummyFileNameRequiredByWindows.png'/>
- </VisualElements>
-</Application>
--- a/browser/branding/branding-common.mozbuild
+++ b/browser/branding/branding-common.mozbuild
@@ -8,17 +8,16 @@
def FirefoxBranding():
JS_PREFERENCE_FILES += [
'pref/firefox-branding.js',
]
if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'windows':
FINAL_TARGET_FILES['..'] += [
'firefox.VisualElementsManifest.xml',
- 'VisualElementsManifest.xml',
]
FINAL_TARGET_FILES.VisualElements += [
'VisualElements_150.png',
'VisualElements_70.png',
]
BRANDING_FILES += [
'appname.bmp',
'bgintro.bmp',
deleted file mode 100644
--- a/browser/branding/nightly/VisualElementsManifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <VisualElements
- DisplayName='Nightly'
- Logo='browser\VisualElements\VisualElements_150.png'
- SmallLogo='browser\VisualElements\VisualElements_70.png'
- ForegroundText='light'
- BackgroundColor='#14171a'/>
- <DefaultTile ShowName='allLogos'/>
- <SplashScreen Image='DummyFileNameRequiredByWindows.png'/>
- </VisualElements>
-</Application>
deleted file mode 100644
--- a/browser/branding/official/VisualElementsManifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Application xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance'>
- <VisualElements
- DisplayName='Mozilla Firefox'
- Logo='browser\VisualElements\VisualElements_150.png'
- SmallLogo='browser\VisualElements\VisualElements_70.png'
- ForegroundText='light'
- BackgroundColor='#0996f8'/>
- <DefaultTile ShowName='allLogos'/>
- <SplashScreen Image='DummyFileNameRequiredByWindows.png'/>
- </VisualElements>
-</Application>
deleted file mode 100644
--- a/browser/branding/unofficial/VisualElementsManifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<Application>
- <VisualElements
- DisplayName='Nightly'
- Logo='browser\VisualElements\VisualElements_150.png'
- SmallLogo='browser\VisualElements\VisualElements_70.png'
- ForegroundText='light'
- BackgroundColor='#14171a'>
- <DefaultTile ShowName='allLogos'/>
- <SplashScreen Image='DummyFileNameRequiredByWindows.png'/>
- </VisualElements>
-</Application>
--- a/browser/installer/package-manifest.in
+++ b/browser/installer/package-manifest.in
@@ -109,17 +109,16 @@
@BINPATH@/gtk2/@DLL_PREFIX@mozgtk@DLL_SUFFIX@
#endif
[browser]
; [Base Browser Files]
#ifndef XP_UNIX
@BINPATH@/@MOZ_APP_NAME@.exe
@BINPATH@/firefox.VisualElementsManifest.xml
-@BINPATH@/VisualElementsManifest.xml
@BINPATH@/browser/VisualElements/VisualElements_150.png
@BINPATH@/browser/VisualElements/VisualElements_70.png
#else
@BINPATH@/@MOZ_APP_NAME@-bin
@BINPATH@/@MOZ_APP_NAME@
#endif
@RESPATH@/application.ini
#ifdef MOZ_UPDATER
