platform_tools/android/apps/viewer/src/main/res/layout/activity_main.xml - Issue 2016343002: Revert of Add drawer with state information

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

Unified Diff: platform_tools/android/apps/viewer/src/main/res/layout/activity_main.xml

Issue 2016343002: Revert of Add drawer with state information (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 4 years, 7 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

« no previous file with comments | « platform_tools/android/apps/viewer/src/main/java/org/skia/viewer/ViewerApplication.java ('k') | platform_tools/android/apps/viewer/src/main/res/layout/state_item.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: platform_tools/android/apps/viewer/src/main/res/layout/activity_main.xml

diff --git a/platform_tools/android/apps/viewer/src/main/res/layout/activity_main.xml b/platform_tools/android/apps/viewer/src/main/res/layout/activity_main.xml

index 985b67d085f1ac59fa3a9e3731b0e6d106ac3021..6597a48dcc8d7b7741602af9fba8ee4db4f85e18 100644

--- a/platform_tools/android/apps/viewer/src/main/res/layout/activity_main.xml

+++ b/platform_tools/android/apps/viewer/src/main/res/layout/activity_main.xml

@@ -1,36 +1,17 @@

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

+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

+ xmlns:tools="http://schemas.android.com/tools"

+ android:id="@+id/mainLayout"

+ android:orientation="vertical"

+ android:layout_width="match_parent"

+ android:layout_height="match_parent"

+ tools:context=".ViewerActivity">

-<android.support.v4.widget.DrawerLayout

- xmlns:android="http://schemas.android.com/apk/res/android"

- android:id="@+id/drawerLayout"

- android:layout_width="match_parent"

- android:layout_height="match_parent">

-

- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

- xmlns:tools="http://schemas.android.com/tools"

- android:id="@+id/mainLayout"

- android:orientation="vertical"

+ <SurfaceView

+ android:id="@+id/surfaceView"

android:layout_width="match_parent"

android:layout_height="match_parent"

- tools:context=".ViewerActivity">

+ android:layout_centerVertical="true"

+ android:layout_centerHorizontal="true" />

- <SurfaceView

- android:id="@+id/surfaceView"

- android:layout_width="match_parent"

- android:layout_height="match_parent"

- android:layout_centerVertical="true"

- android:layout_centerHorizontal="true" />

- </LinearLayout>

-

- <ListView android:id="@+id/leftDrawer"

- android:layout_width="240dp"

- android:layout_height="match_parent"

- android:layout_gravity="start"

- android:choiceMode="singleChoice"

- android:divider="@android:color/transparent"

- android:dividerHeight="0dp"

- android:background="@android:color/background_light"/>

-</android.support.v4.widget.DrawerLayout>

+</LinearLayout>