Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(372)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: remoting/android/java/res/layout/vr_desktop.xml

Issue 1231153002: Add VR desktop activity structure (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix naming convention Created 5 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« remoting/android/java/AndroidManifest.xml.jinja2 ('K') | « remoting/android/java/AndroidManifest.xml.jinja2 ('k') | remoting/android/java/src/org/chromium/chromoting/CardboardDesktopActivity.java » ('j') | remoting/android/java/src/org/chromium/chromoting/CardboardDesktopActivity.java » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: remoting/android/java/res/layout/vr_desktop.xml
diff --git a/content/shell/android/shell_apk/res/layout/content_shell_activity.xml b/remoting/android/java/res/layout/vr_desktop.xml
similarity index 66%
copy from content/shell/android/shell_apk/res/layout/content_shell_activity.xml
copy to remoting/android/java/res/layout/vr_desktop.xml
index c62e66ec5dc4c82b36ee5bece9d72661b013a6bd..def62d7abe0d037b09ea04a44a52b3162df34910 100644
--- a/content/shell/android/shell_apk/res/layout/content_shell_activity.xml
+++ b/remoting/android/java/res/layout/vr_desktop.xml
@@ -1,14 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (c) 2012 The Chromium Authors. All rights reserved.
-
+<!-- Copyright 2015 The Chromium Authors. All rights reserved.
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file.
- -->
+-->
<merge xmlns:android="http://schemas.android.com/apk/res/android">
- <org.chromium.content_shell.ShellManager
- android:id="@+id/shell_container"
+ <com.google.vrtoolkit.cardboard.CardboardView
+ android:id="@+id/cardboard_view"
android:layout_width="match_parent"
android:layout_height="match_parent" />
</merge>
« remoting/android/java/AndroidManifest.xml.jinja2 ('K') | « remoting/android/java/AndroidManifest.xml.jinja2 ('k') | remoting/android/java/src/org/chromium/chromoting/CardboardDesktopActivity.java » ('j') | remoting/android/java/src/org/chromium/chromoting/CardboardDesktopActivity.java » ('J')

Powered by Google App Engine
This is Rietveld 408576698