blimp/client/android/java/res/layout/blimp_main.xml - Issue 1295243003: Initial commit of the blimp/ folder and target

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Side by Side Diff: blimp/client/android/java/res/layout/blimp_main.xml

Issue 1295243003: Initial commit of the blimp/ folder and target (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Address final nits. Created 5 years, 3 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:

OLD	NEW
1 <?xml version="1.0" encoding="utf-8"?>	1 <?xml version="1.0" encoding="utf-8"?>

2

3 <!-- Copyright 2015 The Chromium Authors. All rights reserved.	2 <!-- Copyright 2015 The Chromium Authors. All rights reserved.

4 Use of this source code is governed by a BSD-style license that can be	3 Use of this source code is governed by a BSD-style license that can be

5 found in the LICENSE file.	4 found in the LICENSE file. -->

6 -->

7	5

8 <merge xmlns:android="http://schemas.android.com/apk/res/android">	6 <merge xmlns:android="http://schemas.android.com/apk/res/android">

9 <com.google.vrtoolkit.cardboard.CardboardView	7 <org.chromium.blimp.BlimpView

10 android:id="@+id/cardboard_view"	8 android:id="@+id/renderer"

11 android:layout_width="match_parent"	9 android:layout_width="match_parent"

12 android:layout_height="match_parent" />	10 android:layout_height="match_parent" />

13 </merge>	11 </merge>

OLD	NEW