diff options
Diffstat (limited to 'support')
35 files changed, 108 insertions, 19 deletions
diff --git a/support/hololens/ServoApp/Assets/LargeTile.scale-100.png b/support/hololens/ServoApp/Assets/LargeTile.scale-100.png Binary files differnew file mode 100644 index 00000000000..a4e2641eec2 --- /dev/null +++ b/support/hololens/ServoApp/Assets/LargeTile.scale-100.png diff --git a/support/hololens/ServoApp/Assets/LargeTile.scale-200.png b/support/hololens/ServoApp/Assets/LargeTile.scale-200.png Binary files differnew file mode 100644 index 00000000000..07563b4da79 --- /dev/null +++ b/support/hololens/ServoApp/Assets/LargeTile.scale-200.png diff --git a/support/hololens/ServoApp/Assets/LargeTile.scale-400.png b/support/hololens/ServoApp/Assets/LargeTile.scale-400.png Binary files differnew file mode 100644 index 00000000000..64d79e3bd6a --- /dev/null +++ b/support/hololens/ServoApp/Assets/LargeTile.scale-400.png diff --git a/support/hololens/ServoApp/Assets/LockScreenLogo.scale-200.png b/support/hololens/ServoApp/Assets/LockScreenLogo.scale-200.png Binary files differdeleted file mode 100644 index 735f57adb5d..00000000000 --- a/support/hololens/ServoApp/Assets/LockScreenLogo.scale-200.png +++ /dev/null diff --git a/support/hololens/ServoApp/Assets/SmallTile.scale-100.png b/support/hololens/ServoApp/Assets/SmallTile.scale-100.png Binary files differnew file mode 100644 index 00000000000..39be2badd1d --- /dev/null +++ b/support/hololens/ServoApp/Assets/SmallTile.scale-100.png diff --git a/support/hololens/ServoApp/Assets/SmallTile.scale-200.png b/support/hololens/ServoApp/Assets/SmallTile.scale-200.png Binary files differnew file mode 100644 index 00000000000..da531151c1b --- /dev/null +++ b/support/hololens/ServoApp/Assets/SmallTile.scale-200.png diff --git a/support/hololens/ServoApp/Assets/SmallTile.scale-400.png b/support/hololens/ServoApp/Assets/SmallTile.scale-400.png Binary files differnew file mode 100644 index 00000000000..59e25f586b8 --- /dev/null +++ b/support/hololens/ServoApp/Assets/SmallTile.scale-400.png diff --git a/support/hololens/ServoApp/Assets/SplashScreen.scale-100.png b/support/hololens/ServoApp/Assets/SplashScreen.scale-100.png Binary files differnew file mode 100644 index 00000000000..60411e81c4c --- /dev/null +++ b/support/hololens/ServoApp/Assets/SplashScreen.scale-100.png diff --git a/support/hololens/ServoApp/Assets/SplashScreen.scale-200.png b/support/hololens/ServoApp/Assets/SplashScreen.scale-200.png Binary files differindex 023e7f1feda..0d49ee32270 100644 --- a/support/hololens/ServoApp/Assets/SplashScreen.scale-200.png +++ b/support/hololens/ServoApp/Assets/SplashScreen.scale-200.png diff --git a/support/hololens/ServoApp/Assets/SplashScreen.scale-400.png b/support/hololens/ServoApp/Assets/SplashScreen.scale-400.png Binary files differnew file mode 100644 index 00000000000..bda01e2abc1 --- /dev/null +++ b/support/hololens/ServoApp/Assets/SplashScreen.scale-400.png diff --git a/support/hololens/ServoApp/Assets/Square150x150Logo.scale-100.png b/support/hololens/ServoApp/Assets/Square150x150Logo.scale-100.png Binary files differnew file mode 100644 index 00000000000..a04dc27b495 --- /dev/null +++ b/support/hololens/ServoApp/Assets/Square150x150Logo.scale-100.png diff --git a/support/hololens/ServoApp/Assets/Square150x150Logo.scale-200.png b/support/hololens/ServoApp/Assets/Square150x150Logo.scale-200.png Binary files differindex af49fec1a54..4fa3dcc499d 100644 --- a/support/hololens/ServoApp/Assets/Square150x150Logo.scale-200.png +++ b/support/hololens/ServoApp/Assets/Square150x150Logo.scale-200.png diff --git a/support/hololens/ServoApp/Assets/Square150x150Logo.scale-400.png b/support/hololens/ServoApp/Assets/Square150x150Logo.scale-400.png Binary files differnew file mode 100644 index 00000000000..51839dc40bd --- /dev/null +++ b/support/hololens/ServoApp/Assets/Square150x150Logo.scale-400.png diff --git a/support/hololens/ServoApp/Assets/Square44x44Logo.altform-unplated_targetsize-16.png b/support/hololens/ServoApp/Assets/Square44x44Logo.altform-unplated_targetsize-16.png Binary files differnew file mode 100644 index 00000000000..0b9c24698ab --- /dev/null +++ b/support/hololens/ServoApp/Assets/Square44x44Logo.altform-unplated_targetsize-16.png diff --git a/support/hololens/ServoApp/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/support/hololens/ServoApp/Assets/Square44x44Logo.altform-unplated_targetsize-256.png Binary files differnew file mode 100644 index 00000000000..1a1b5b6cd80 --- /dev/null +++ b/support/hololens/ServoApp/Assets/Square44x44Logo.altform-unplated_targetsize-256.png diff --git a/support/hololens/ServoApp/Assets/Square44x44Logo.altform-unplated_targetsize-48.png b/support/hololens/ServoApp/Assets/Square44x44Logo.altform-unplated_targetsize-48.png Binary files differnew file mode 100644 index 00000000000..a2d34067395 --- /dev/null +++ b/support/hololens/ServoApp/Assets/Square44x44Logo.altform-unplated_targetsize-48.png diff --git a/support/hololens/ServoApp/Assets/Square44x44Logo.scale-100.png b/support/hololens/ServoApp/Assets/Square44x44Logo.scale-100.png Binary files differnew file mode 100644 index 00000000000..47844024c7e --- /dev/null +++ b/support/hololens/ServoApp/Assets/Square44x44Logo.scale-100.png diff --git a/support/hololens/ServoApp/Assets/Square44x44Logo.scale-200.png b/support/hololens/ServoApp/Assets/Square44x44Logo.scale-200.png Binary files differindex ce342a2ec8a..b7d25e371d0 100644 --- a/support/hololens/ServoApp/Assets/Square44x44Logo.scale-200.png +++ b/support/hololens/ServoApp/Assets/Square44x44Logo.scale-200.png diff --git a/support/hololens/ServoApp/Assets/Square44x44Logo.scale-400.png b/support/hololens/ServoApp/Assets/Square44x44Logo.scale-400.png Binary files differnew file mode 100644 index 00000000000..4961ca89b48 --- /dev/null +++ b/support/hololens/ServoApp/Assets/Square44x44Logo.scale-400.png diff --git a/support/hololens/ServoApp/Assets/Square44x44Logo.targetsize-16.png b/support/hololens/ServoApp/Assets/Square44x44Logo.targetsize-16.png Binary files differnew file mode 100644 index 00000000000..0b9c24698ab --- /dev/null +++ b/support/hololens/ServoApp/Assets/Square44x44Logo.targetsize-16.png diff --git a/support/hololens/ServoApp/Assets/Square44x44Logo.targetsize-256.png b/support/hololens/ServoApp/Assets/Square44x44Logo.targetsize-256.png Binary files differnew file mode 100644 index 00000000000..1a1b5b6cd80 --- /dev/null +++ b/support/hololens/ServoApp/Assets/Square44x44Logo.targetsize-256.png diff --git a/support/hololens/ServoApp/Assets/Square44x44Logo.targetsize-48.png b/support/hololens/ServoApp/Assets/Square44x44Logo.targetsize-48.png Binary files differnew file mode 100644 index 00000000000..a2d34067395 --- /dev/null +++ b/support/hololens/ServoApp/Assets/Square44x44Logo.targetsize-48.png diff --git a/support/hololens/ServoApp/Assets/StoreLogo.png b/support/hololens/ServoApp/Assets/StoreLogo.png Binary files differdeleted file mode 100644 index 7385b56c0e4..00000000000 --- a/support/hololens/ServoApp/Assets/StoreLogo.png +++ /dev/null diff --git a/support/hololens/ServoApp/Assets/StoreLogo.scale-100.png b/support/hololens/ServoApp/Assets/StoreLogo.scale-100.png Binary files differnew file mode 100644 index 00000000000..a07356b4fae --- /dev/null +++ b/support/hololens/ServoApp/Assets/StoreLogo.scale-100.png diff --git a/support/hololens/ServoApp/Assets/StoreLogo.scale-200.png b/support/hololens/ServoApp/Assets/StoreLogo.scale-200.png Binary files differnew file mode 100644 index 00000000000..aa394af3818 --- /dev/null +++ b/support/hololens/ServoApp/Assets/StoreLogo.scale-200.png diff --git a/support/hololens/ServoApp/Assets/StoreLogo.scale-400.png b/support/hololens/ServoApp/Assets/StoreLogo.scale-400.png Binary files differnew file mode 100644 index 00000000000..dfd110c3f7c --- /dev/null +++ b/support/hololens/ServoApp/Assets/StoreLogo.scale-400.png diff --git a/support/hololens/ServoApp/Assets/Wide310x150Logo.scale-100.png b/support/hololens/ServoApp/Assets/Wide310x150Logo.scale-100.png Binary files differnew file mode 100644 index 00000000000..b3d10361ef5 --- /dev/null +++ b/support/hololens/ServoApp/Assets/Wide310x150Logo.scale-100.png diff --git a/support/hololens/ServoApp/Assets/Wide310x150Logo.scale-200.png b/support/hololens/ServoApp/Assets/Wide310x150Logo.scale-200.png Binary files differindex 288995b397f..5c7e06b1dc8 100644 --- a/support/hololens/ServoApp/Assets/Wide310x150Logo.scale-200.png +++ b/support/hololens/ServoApp/Assets/Wide310x150Logo.scale-200.png diff --git a/support/hololens/ServoApp/Assets/Wide310x150Logo.scale-400.png b/support/hololens/ServoApp/Assets/Wide310x150Logo.scale-400.png Binary files differnew file mode 100644 index 00000000000..94a9d390bd2 --- /dev/null +++ b/support/hololens/ServoApp/Assets/Wide310x150Logo.scale-400.png diff --git a/support/hololens/ServoApp/BrowserPage.h b/support/hololens/ServoApp/BrowserPage.h index e9f2ee8448b..89372c9af3b 100644 --- a/support/hololens/ServoApp/BrowserPage.h +++ b/support/hololens/ServoApp/BrowserPage.h @@ -9,8 +9,8 @@ namespace winrt::ServoApp::implementation { -static const hstring SERVO_SCHEME = L"servo"; -static const hstring SERVO_SCHEME_SLASH_SLASH = L"servo://"; +static const hstring SERVO_SCHEME = L"fxr"; +static const hstring SERVO_SCHEME_SLASH_SLASH = L"fxr://"; struct BrowserPage : BrowserPageT<BrowserPage> { public: diff --git a/support/hololens/ServoApp/Package.appxmanifest b/support/hololens/ServoApp/Package.appxmanifest index 8eb1a55ef74..a8363f8d0fa 100644 --- a/support/hololens/ServoApp/Package.appxmanifest +++ b/support/hololens/ServoApp/Package.appxmanifest @@ -1,9 +1,9 @@ <?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"> - <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" /> <Properties> - <DisplayName>ServoApp</DisplayName> + <DisplayName>Firefox Reality</DisplayName> <PublisherDisplayName>Mozilla</PublisherDisplayName> <Logo>Assets\StoreLogo.png</Logo> </Properties> @@ -15,16 +15,21 @@ </Resources> <Applications> <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:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png"> + <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" 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:SplashScreen Image="Assets\SplashScreen.png" /> </uap:VisualElements> <Extensions> <uap:Extension Category="windows.protocol"> - <uap:Protocol Name="servo"> + <uap:Protocol Name="fxr"> <uap:Logo>Assets\StoreLogo.png</uap:Logo> - <uap:DisplayName>Servo URL</uap:DisplayName> + <uap:DisplayName>Firefox Reality URL</uap:DisplayName> </uap:Protocol> </uap:Extension> </Extensions> @@ -33,4 +38,4 @@ <Capabilities> <Capability Name="internetClient" /> </Capabilities> -</Package> +</Package>
\ No newline at end of file diff --git a/support/hololens/ServoApp/ServoApp.vcxproj b/support/hololens/ServoApp/ServoApp.vcxproj index 1f14220c899..b21faaa3309 100644 --- a/support/hololens/ServoApp/ServoApp.vcxproj +++ b/support/hololens/ServoApp/ServoApp.vcxproj @@ -78,7 +78,7 @@ <PropertyGroup Label="UserMacros" /> <PropertyGroup> <PackageCertificateKeyFile>ServoApp_TemporaryKey.pfx</PackageCertificateKeyFile> - <PackageCertificateThumbprint>8263338D5334DAD5918004E354DDCDCF8A2C2217</PackageCertificateThumbprint> + <PackageCertificateThumbprint>DC99ACEDA24EBA00BFB07A3986BB6892B0DE278B</PackageCertificateThumbprint> <GenerateAppInstallerFile>False</GenerateAppInstallerFile> <AppxAutoIncrementPackageRevision>False</AppxAutoIncrementPackageRevision> <AppxBundle>Always</AppxBundle> @@ -937,13 +937,34 @@ <None Include="ServoApp_TemporaryKey.pfx" /> </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-400.png" /> + <Image Include="Assets\Square150x150Logo.scale-100.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-400.png" /> + <Image Include="Assets\Square44x44Logo.targetsize-16.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-400.png" /> </ItemGroup> <ItemGroup> <ClCompile Include="pch.cpp"> @@ -987,4 +1008,4 @@ <Error Condition="!Exists('..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\Microsoft.Windows.CppWinRT.2.0.190620.2\build\native\Microsoft.Windows.CppWinRT.targets'))" /> <Error Condition="!Exists('..\packages\ANGLE.WindowsStore.Servo.2.1.13\build\native\ANGLE.WindowsStore.Servo.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\ANGLE.WindowsStore.Servo.2.1.13\build\native\ANGLE.WindowsStore.Servo.targets'))" /> </Target> -</Project> +</Project>
\ No newline at end of file diff --git a/support/hololens/ServoApp/ServoApp.vcxproj.filters b/support/hololens/ServoApp/ServoApp.vcxproj.filters index 59c46ee463b..cdf41dff660 100644 --- a/support/hololens/ServoApp/ServoApp.vcxproj.filters +++ b/support/hololens/ServoApp/ServoApp.vcxproj.filters @@ -42,9 +42,6 @@ <Image Include="Assets\Wide310x150Logo.scale-200.png"> <Filter>Assets</Filter> </Image> - <Image Include="Assets\StoreLogo.png"> - <Filter>Assets</Filter> - </Image> <Image Include="Assets\Square150x150Logo.scale-200.png"> <Filter>Assets</Filter> </Image> @@ -57,7 +54,73 @@ <Image Include="Assets\SplashScreen.scale-200.png"> <Filter>Assets</Filter> </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> </Image> </ItemGroup> @@ -838,4 +901,4 @@ <ItemGroup> <ApplicationDefinition Include="App.xaml" /> </ItemGroup> -</Project> +</Project>
\ No newline at end of file diff --git a/support/hololens/ServoApp/ServoApp_TemporaryKey.pfx b/support/hololens/ServoApp/ServoApp_TemporaryKey.pfx Binary files differindex 4602aaa5a79..a1224301b62 100644 --- a/support/hololens/ServoApp/ServoApp_TemporaryKey.pfx +++ b/support/hololens/ServoApp/ServoApp_TemporaryKey.pfx diff --git a/support/hololens/ServoApp/ServoControl/ServoControl.h b/support/hololens/ServoApp/ServoControl/ServoControl.h index 3191a8e03a7..9c38cec5efb 100644 --- a/support/hololens/ServoApp/ServoControl/ServoControl.h +++ b/support/hololens/ServoApp/ServoControl/ServoControl.h @@ -95,7 +95,7 @@ private: winrt::event<EventDelegate> mOnCaptureGesturesEndedEvent; float mDPI = 1; - hstring mInitialURL = L"https://servo.org"; + hstring mInitialURL = L"about:blank"; bool mTransient = false; Windows::UI::Xaml::Controls::SwapChainPanel ServoControl::Panel(); |
