diff --git a/.gitignore b/.gitignore index f0391264e09..c9d754bc569 100644 --- a/.gitignore +++ b/.gitignore @@ -53,6 +53,8 @@ support/hololens/ServoApp/x64/ support/hololens/ServoApp/ARM/ support/hololens/ServoApp/ARM64/ support/hololens/ServoApp/Generated\ Files +support/hololens/ServoApp/BundleArtifacts/ +support/hololens/ServoApp/support/ # Ignore thumbnails created by Windows support/hololens/ServoApp/Thumbs.db diff --git a/support/hololens/ServoApp/Assets/LargeTile.scale-100.png b/support/hololens/ServoApp/Assets/LargeTile.scale-100.png new file mode 100644 index 00000000000..a4e2641eec2 Binary files /dev/null and b/support/hololens/ServoApp/Assets/LargeTile.scale-100.png differ diff --git a/support/hololens/ServoApp/Assets/LargeTile.scale-200.png b/support/hololens/ServoApp/Assets/LargeTile.scale-200.png new file mode 100644 index 00000000000..07563b4da79 Binary files /dev/null and b/support/hololens/ServoApp/Assets/LargeTile.scale-200.png differ diff --git a/support/hololens/ServoApp/Assets/LargeTile.scale-400.png b/support/hololens/ServoApp/Assets/LargeTile.scale-400.png new file mode 100644 index 00000000000..64d79e3bd6a Binary files /dev/null and b/support/hololens/ServoApp/Assets/LargeTile.scale-400.png differ diff --git a/support/hololens/ServoApp/Assets/LockScreenLogo.scale-200.png b/support/hololens/ServoApp/Assets/LockScreenLogo.scale-200.png deleted file mode 100644 index 735f57adb5d..00000000000 Binary files a/support/hololens/ServoApp/Assets/LockScreenLogo.scale-200.png and /dev/null differ diff --git a/support/hololens/ServoApp/Assets/SmallTile.scale-100.png b/support/hololens/ServoApp/Assets/SmallTile.scale-100.png new file mode 100644 index 00000000000..39be2badd1d Binary files /dev/null and b/support/hololens/ServoApp/Assets/SmallTile.scale-100.png differ diff --git a/support/hololens/ServoApp/Assets/SmallTile.scale-200.png b/support/hololens/ServoApp/Assets/SmallTile.scale-200.png new file mode 100644 index 00000000000..da531151c1b Binary files /dev/null and b/support/hololens/ServoApp/Assets/SmallTile.scale-200.png differ diff --git a/support/hololens/ServoApp/Assets/SmallTile.scale-400.png b/support/hololens/ServoApp/Assets/SmallTile.scale-400.png new file mode 100644 index 00000000000..59e25f586b8 Binary files /dev/null and b/support/hololens/ServoApp/Assets/SmallTile.scale-400.png differ diff --git a/support/hololens/ServoApp/Assets/SplashScreen.scale-100.png b/support/hololens/ServoApp/Assets/SplashScreen.scale-100.png new file mode 100644 index 00000000000..60411e81c4c Binary files /dev/null and b/support/hololens/ServoApp/Assets/SplashScreen.scale-100.png differ diff --git a/support/hololens/ServoApp/Assets/SplashScreen.scale-200.png b/support/hololens/ServoApp/Assets/SplashScreen.scale-200.png index 023e7f1feda..0d49ee32270 100644 Binary files a/support/hololens/ServoApp/Assets/SplashScreen.scale-200.png and b/support/hololens/ServoApp/Assets/SplashScreen.scale-200.png differ diff --git a/support/hololens/ServoApp/Assets/SplashScreen.scale-400.png b/support/hololens/ServoApp/Assets/SplashScreen.scale-400.png new file mode 100644 index 00000000000..bda01e2abc1 Binary files /dev/null and b/support/hololens/ServoApp/Assets/SplashScreen.scale-400.png differ diff --git a/support/hololens/ServoApp/Assets/Square150x150Logo.scale-100.png b/support/hololens/ServoApp/Assets/Square150x150Logo.scale-100.png new file mode 100644 index 00000000000..a04dc27b495 Binary files /dev/null and b/support/hololens/ServoApp/Assets/Square150x150Logo.scale-100.png differ diff --git a/support/hololens/ServoApp/Assets/Square150x150Logo.scale-200.png b/support/hololens/ServoApp/Assets/Square150x150Logo.scale-200.png index af49fec1a54..4fa3dcc499d 100644 Binary files a/support/hololens/ServoApp/Assets/Square150x150Logo.scale-200.png and b/support/hololens/ServoApp/Assets/Square150x150Logo.scale-200.png differ diff --git a/support/hololens/ServoApp/Assets/Square150x150Logo.scale-400.png b/support/hololens/ServoApp/Assets/Square150x150Logo.scale-400.png new file mode 100644 index 00000000000..51839dc40bd Binary files /dev/null and b/support/hololens/ServoApp/Assets/Square150x150Logo.scale-400.png differ diff --git a/support/hololens/ServoApp/Assets/Square44x44Logo.altform-unplated_targetsize-16.png b/support/hololens/ServoApp/Assets/Square44x44Logo.altform-unplated_targetsize-16.png new file mode 100644 index 00000000000..0b9c24698ab Binary files /dev/null and b/support/hololens/ServoApp/Assets/Square44x44Logo.altform-unplated_targetsize-16.png differ diff --git a/support/hololens/ServoApp/Assets/Square44x44Logo.altform-unplated_targetsize-256.png b/support/hololens/ServoApp/Assets/Square44x44Logo.altform-unplated_targetsize-256.png new file mode 100644 index 00000000000..1a1b5b6cd80 Binary files /dev/null and b/support/hololens/ServoApp/Assets/Square44x44Logo.altform-unplated_targetsize-256.png differ diff --git a/support/hololens/ServoApp/Assets/Square44x44Logo.altform-unplated_targetsize-48.png b/support/hololens/ServoApp/Assets/Square44x44Logo.altform-unplated_targetsize-48.png new file mode 100644 index 00000000000..a2d34067395 Binary files /dev/null and b/support/hololens/ServoApp/Assets/Square44x44Logo.altform-unplated_targetsize-48.png differ diff --git a/support/hololens/ServoApp/Assets/Square44x44Logo.scale-100.png b/support/hololens/ServoApp/Assets/Square44x44Logo.scale-100.png new file mode 100644 index 00000000000..47844024c7e Binary files /dev/null and b/support/hololens/ServoApp/Assets/Square44x44Logo.scale-100.png differ diff --git a/support/hololens/ServoApp/Assets/Square44x44Logo.scale-200.png b/support/hololens/ServoApp/Assets/Square44x44Logo.scale-200.png index ce342a2ec8a..b7d25e371d0 100644 Binary files a/support/hololens/ServoApp/Assets/Square44x44Logo.scale-200.png and b/support/hololens/ServoApp/Assets/Square44x44Logo.scale-200.png differ diff --git a/support/hololens/ServoApp/Assets/Square44x44Logo.scale-400.png b/support/hololens/ServoApp/Assets/Square44x44Logo.scale-400.png new file mode 100644 index 00000000000..4961ca89b48 Binary files /dev/null and b/support/hololens/ServoApp/Assets/Square44x44Logo.scale-400.png differ diff --git a/support/hololens/ServoApp/Assets/Square44x44Logo.targetsize-16.png b/support/hololens/ServoApp/Assets/Square44x44Logo.targetsize-16.png new file mode 100644 index 00000000000..0b9c24698ab Binary files /dev/null and b/support/hololens/ServoApp/Assets/Square44x44Logo.targetsize-16.png differ diff --git a/support/hololens/ServoApp/Assets/Square44x44Logo.targetsize-256.png b/support/hololens/ServoApp/Assets/Square44x44Logo.targetsize-256.png new file mode 100644 index 00000000000..1a1b5b6cd80 Binary files /dev/null and b/support/hololens/ServoApp/Assets/Square44x44Logo.targetsize-256.png differ diff --git a/support/hololens/ServoApp/Assets/Square44x44Logo.targetsize-48.png b/support/hololens/ServoApp/Assets/Square44x44Logo.targetsize-48.png new file mode 100644 index 00000000000..a2d34067395 Binary files /dev/null and b/support/hololens/ServoApp/Assets/Square44x44Logo.targetsize-48.png differ diff --git a/support/hololens/ServoApp/Assets/StoreLogo.png b/support/hololens/ServoApp/Assets/StoreLogo.png deleted file mode 100644 index 7385b56c0e4..00000000000 Binary files a/support/hololens/ServoApp/Assets/StoreLogo.png and /dev/null differ diff --git a/support/hololens/ServoApp/Assets/StoreLogo.scale-100.png b/support/hololens/ServoApp/Assets/StoreLogo.scale-100.png new file mode 100644 index 00000000000..a07356b4fae Binary files /dev/null and b/support/hololens/ServoApp/Assets/StoreLogo.scale-100.png differ diff --git a/support/hololens/ServoApp/Assets/StoreLogo.scale-200.png b/support/hololens/ServoApp/Assets/StoreLogo.scale-200.png new file mode 100644 index 00000000000..aa394af3818 Binary files /dev/null and b/support/hololens/ServoApp/Assets/StoreLogo.scale-200.png differ diff --git a/support/hololens/ServoApp/Assets/StoreLogo.scale-400.png b/support/hololens/ServoApp/Assets/StoreLogo.scale-400.png new file mode 100644 index 00000000000..dfd110c3f7c Binary files /dev/null and b/support/hololens/ServoApp/Assets/StoreLogo.scale-400.png differ diff --git a/support/hololens/ServoApp/Assets/Wide310x150Logo.scale-100.png b/support/hololens/ServoApp/Assets/Wide310x150Logo.scale-100.png new file mode 100644 index 00000000000..b3d10361ef5 Binary files /dev/null and b/support/hololens/ServoApp/Assets/Wide310x150Logo.scale-100.png differ diff --git a/support/hololens/ServoApp/Assets/Wide310x150Logo.scale-200.png b/support/hololens/ServoApp/Assets/Wide310x150Logo.scale-200.png index 288995b397f..5c7e06b1dc8 100644 Binary files a/support/hololens/ServoApp/Assets/Wide310x150Logo.scale-200.png and b/support/hololens/ServoApp/Assets/Wide310x150Logo.scale-200.png differ diff --git a/support/hololens/ServoApp/Assets/Wide310x150Logo.scale-400.png b/support/hololens/ServoApp/Assets/Wide310x150Logo.scale-400.png new file mode 100644 index 00000000000..94a9d390bd2 Binary files /dev/null and b/support/hololens/ServoApp/Assets/Wide310x150Logo.scale-400.png differ 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 { 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 @@  - + - ServoApp + Firefox Reality Mozilla Assets\StoreLogo.png @@ -15,16 +15,21 @@ - - + + + + + + + - + Assets\StoreLogo.png - Servo URL + Firefox Reality URL @@ -33,4 +38,4 @@ - + \ 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 @@ ServoApp_TemporaryKey.pfx - 8263338D5334DAD5918004E354DDCDCF8A2C2217 + DC99ACEDA24EBA00BFB07A3986BB6892B0DE278B False False Always @@ -937,13 +937,34 @@ - + + + + + + + + + + + + + + + + - + + + + + + + @@ -987,4 +1008,4 @@ - + \ 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 @@ Assets - - Assets - Assets @@ -57,7 +54,73 @@ Assets - + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + + Assets + + Assets @@ -838,4 +901,4 @@ - + \ No newline at end of file diff --git a/support/hololens/ServoApp/ServoApp_TemporaryKey.pfx b/support/hololens/ServoApp/ServoApp_TemporaryKey.pfx index 4602aaa5a79..a1224301b62 100644 Binary files a/support/hololens/ServoApp/ServoApp_TemporaryKey.pfx and b/support/hololens/ServoApp/ServoApp_TemporaryKey.pfx differ 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 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();