Auto merge of #24125 - paulrouget:branding, r=jdm

Branding: s/servo/firefox reality/

- Used images from https://github.com/MozillaReality/FirefoxReality
- Used description from https://play.google.com/store/apps/details?id=org.mozilla.vrbrowser
- Changed protocol handler url scheme from "servo://" to "fxr://"
- Default page for now is about:blank

Fix #24108

<!-- Reviewable:start -->
---
This change is [<img src="https://reviewable.io/review_button.svg" height="34" align="absmiddle" alt="Reviewable"/>](https://reviewable.io/reviews/servo/servo/24125)
<!-- Reviewable:end -->
This commit is contained in:
bors-servo 2019-09-06 03:16:16 -04:00 committed by GitHub
commit d6118923d3
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
36 changed files with 109 additions and 18 deletions

2
.gitignore vendored
View file

@ -53,6 +53,8 @@ support/hololens/ServoApp/x64/
support/hololens/ServoApp/ARM/ support/hololens/ServoApp/ARM/
support/hololens/ServoApp/ARM64/ support/hololens/ServoApp/ARM64/
support/hololens/ServoApp/Generated\ Files support/hololens/ServoApp/Generated\ Files
support/hololens/ServoApp/BundleArtifacts/
support/hololens/ServoApp/support/
# Ignore thumbnails created by Windows # Ignore thumbnails created by Windows
support/hololens/ServoApp/Thumbs.db support/hololens/ServoApp/Thumbs.db

Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 156 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 104 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 6.5 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 18 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 47 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 56 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.5 KiB

After

Width:  |  Height:  |  Size: 160 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 446 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 19 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 51 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 146 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 744 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.6 KiB

After

Width:  |  Height:  |  Size: 9 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 24 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 744 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 41 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.9 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 11 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 29 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 20 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.1 KiB

After

Width:  |  Height:  |  Size: 53 KiB

Before After
Before After

Binary file not shown.

After

Width:  |  Height:  |  Size: 154 KiB

View file

@ -9,8 +9,8 @@
namespace winrt::ServoApp::implementation { namespace winrt::ServoApp::implementation {
static const hstring SERVO_SCHEME = L"servo"; static const hstring SERVO_SCHEME = L"fxr";
static const hstring SERVO_SCHEME_SLASH_SLASH = L"servo://"; static const hstring SERVO_SCHEME_SLASH_SLASH = L"fxr://";
struct BrowserPage : BrowserPageT<BrowserPage> { struct BrowserPage : BrowserPageT<BrowserPage> {
public: public:

View file

@ -1,9 +1,9 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp"> <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
<Identity Name="1d265729-8836-4bd3-9992-4cb111d1068b" Publisher="CN=paul" Version="1.0.0.0" /> <Identity Name="1d265729-8836-4bd3-9992-4cb111d1068b" Publisher="CN=Allizom" Version="1.0.0.0" />
<mp:PhoneIdentity PhoneProductId="1d265729-8836-4bd3-9992-4cb111d1068b" PhonePublisherId="00000000-0000-0000-0000-000000000000" /> <mp:PhoneIdentity PhoneProductId="1d265729-8836-4bd3-9992-4cb111d1068b" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
<Properties> <Properties>
<DisplayName>ServoApp</DisplayName> <DisplayName>Firefox Reality</DisplayName>
<PublisherDisplayName>Mozilla</PublisherDisplayName> <PublisherDisplayName>Mozilla</PublisherDisplayName>
<Logo>Assets\StoreLogo.png</Logo> <Logo>Assets\StoreLogo.png</Logo>
</Properties> </Properties>
@ -15,16 +15,21 @@
</Resources> </Resources>
<Applications> <Applications>
<Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="ServoApp.App"> <Application Id="App" Executable="$targetnametoken$.exe" EntryPoint="ServoApp.App">
<uap:VisualElements DisplayName="ServoApp" Description="A Servo-based browser." Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" BackgroundColor="transparent"> <uap:VisualElements DisplayName="Firefox Reality" Description="Firefox Reality brings the best and freshest content from the web that you know and love to Virtual Reality headsets. Our browser provides an open, accessible and secure way for everyone to explore the web. Experience sharp text, high quality videos, and a seamless transition from 2D to 3D immersive modes. Enjoy the best possible web browsing experience with Firefox Reality." Square150x150Logo="Assets\Square150x150Logo.png" Square44x44Logo="Assets\Square44x44Logo.png" BackgroundColor="transparent">
<uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png"> <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" ShortName="Firefox Reality" Square310x310Logo="Assets\LargeTile.png" Square71x71Logo="Assets\SmallTile.png">
<uap:ShowNameOnTiles>
<uap:ShowOn Tile="square150x150Logo" />
<uap:ShowOn Tile="wide310x150Logo" />
<uap:ShowOn Tile="square310x310Logo" />
</uap:ShowNameOnTiles>
</uap:DefaultTile> </uap:DefaultTile>
<uap:SplashScreen Image="Assets\SplashScreen.png" /> <uap:SplashScreen Image="Assets\SplashScreen.png" />
</uap:VisualElements> </uap:VisualElements>
<Extensions> <Extensions>
<uap:Extension Category="windows.protocol"> <uap:Extension Category="windows.protocol">
<uap:Protocol Name="servo"> <uap:Protocol Name="fxr">
<uap:Logo>Assets\StoreLogo.png</uap:Logo> <uap:Logo>Assets\StoreLogo.png</uap:Logo>
<uap:DisplayName>Servo URL</uap:DisplayName> <uap:DisplayName>Firefox Reality URL</uap:DisplayName>
</uap:Protocol> </uap:Protocol>
</uap:Extension> </uap:Extension>
</Extensions> </Extensions>

View file

@ -79,7 +79,7 @@
<PropertyGroup Label="UserMacros" /> <PropertyGroup Label="UserMacros" />
<PropertyGroup> <PropertyGroup>
<PackageCertificateKeyFile>ServoApp_TemporaryKey.pfx</PackageCertificateKeyFile> <PackageCertificateKeyFile>ServoApp_TemporaryKey.pfx</PackageCertificateKeyFile>
<PackageCertificateThumbprint>8263338D5334DAD5918004E354DDCDCF8A2C2217</PackageCertificateThumbprint> <PackageCertificateThumbprint>DC99ACEDA24EBA00BFB07A3986BB6892B0DE278B</PackageCertificateThumbprint>
<GenerateAppInstallerFile>False</GenerateAppInstallerFile> <GenerateAppInstallerFile>False</GenerateAppInstallerFile>
<AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision> <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision>
<AppxBundle>Always</AppxBundle> <AppxBundle>Always</AppxBundle>
@ -923,13 +923,34 @@
<None Include="ServoApp_TemporaryKey.pfx" /> <None Include="ServoApp_TemporaryKey.pfx" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Image Include="Assets\LockScreenLogo.scale-200.png" /> <Image Include="Assets\LargeTile.scale-100.png" />
<Image Include="Assets\LargeTile.scale-200.png" />
<Image Include="Assets\LargeTile.scale-400.png" />
<Image Include="Assets\SmallTile.scale-100.png" />
<Image Include="Assets\SmallTile.scale-200.png" />
<Image Include="Assets\SmallTile.scale-400.png" />
<Image Include="Assets\SplashScreen.scale-100.png" />
<Image Include="Assets\SplashScreen.scale-200.png" /> <Image Include="Assets\SplashScreen.scale-200.png" />
<Image Include="Assets\SplashScreen.scale-400.png" />
<Image Include="Assets\Square150x150Logo.scale-100.png" />
<Image Include="Assets\Square150x150Logo.scale-200.png" /> <Image Include="Assets\Square150x150Logo.scale-200.png" />
<Image Include="Assets\Square150x150Logo.scale-400.png" />
<Image Include="Assets\Square44x44Logo.altform-unplated_targetsize-16.png" />
<Image Include="Assets\Square44x44Logo.altform-unplated_targetsize-256.png" />
<Image Include="Assets\Square44x44Logo.altform-unplated_targetsize-48.png" />
<Image Include="Assets\Square44x44Logo.scale-100.png" />
<Image Include="Assets\Square44x44Logo.scale-200.png" /> <Image Include="Assets\Square44x44Logo.scale-200.png" />
<Image Include="Assets\Square44x44Logo.scale-400.png" />
<Image Include="Assets\Square44x44Logo.targetsize-16.png" />
<Image Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" /> <Image Include="Assets\Square44x44Logo.targetsize-24_altform-unplated.png" />
<Image Include="Assets\StoreLogo.png" /> <Image Include="Assets\Square44x44Logo.targetsize-256.png" />
<Image Include="Assets\Square44x44Logo.targetsize-48.png" />
<Image Include="Assets\StoreLogo.scale-100.png" />
<Image Include="Assets\StoreLogo.scale-200.png" />
<Image Include="Assets\StoreLogo.scale-400.png" />
<Image Include="Assets\Wide310x150Logo.scale-100.png" />
<Image Include="Assets\Wide310x150Logo.scale-200.png" /> <Image Include="Assets\Wide310x150Logo.scale-200.png" />
<Image Include="Assets\Wide310x150Logo.scale-400.png" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<ClCompile Include="pch.cpp"> <ClCompile Include="pch.cpp">

View file

@ -42,9 +42,6 @@
<Image Include="Assets\Wide310x150Logo.scale-200.png"> <Image Include="Assets\Wide310x150Logo.scale-200.png">
<Filter>Assets</Filter> <Filter>Assets</Filter>
</Image> </Image>
<Image Include="Assets\StoreLogo.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Square150x150Logo.scale-200.png"> <Image Include="Assets\Square150x150Logo.scale-200.png">
<Filter>Assets</Filter> <Filter>Assets</Filter>
</Image> </Image>
@ -57,7 +54,73 @@
<Image Include="Assets\SplashScreen.scale-200.png"> <Image Include="Assets\SplashScreen.scale-200.png">
<Filter>Assets</Filter> <Filter>Assets</Filter>
</Image> </Image>
<Image Include="Assets\LockScreenLogo.scale-200.png"> <Image Include="Assets\SmallTile.scale-100.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\SmallTile.scale-200.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\SmallTile.scale-400.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Square150x150Logo.scale-100.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Square150x150Logo.scale-400.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Wide310x150Logo.scale-100.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Wide310x150Logo.scale-400.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\LargeTile.scale-100.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\LargeTile.scale-200.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\LargeTile.scale-400.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Square44x44Logo.scale-100.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Square44x44Logo.scale-400.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Square44x44Logo.targetsize-16.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Square44x44Logo.targetsize-48.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Square44x44Logo.targetsize-256.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Square44x44Logo.altform-unplated_targetsize-16.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Square44x44Logo.altform-unplated_targetsize-48.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\Square44x44Logo.altform-unplated_targetsize-256.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\SplashScreen.scale-100.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\SplashScreen.scale-400.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\StoreLogo.scale-100.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\StoreLogo.scale-200.png">
<Filter>Assets</Filter>
</Image>
<Image Include="Assets\StoreLogo.scale-400.png">
<Filter>Assets</Filter> <Filter>Assets</Filter>
</Image> </Image>
</ItemGroup> </ItemGroup>

View file

@ -95,7 +95,7 @@ private:
winrt::event<EventDelegate> mOnCaptureGesturesEndedEvent; winrt::event<EventDelegate> mOnCaptureGesturesEndedEvent;
float mDPI = 1; float mDPI = 1;
hstring mInitialURL = L"https://servo.org"; hstring mInitialURL = L"about:blank";
bool mTransient = false; bool mTransient = false;
Windows::UI::Xaml::Controls::SwapChainPanel ServoControl::Panel(); Windows::UI::Xaml::Controls::SwapChainPanel ServoControl::Panel();