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

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

Issue 2071333002: Keep drawer open in xlarge-land and add float fps (Closed) Base URL: https://skia.googlesource.com/skia.git@master
Patch Set: FPS -> Render time Created 4 years, 6 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 unified diff | Download patch
OLDNEW
1 <?xml version="1.0" encoding="utf-8"?> 1 <?xml version="1.0" encoding="utf-8"?>
2 2
3 <android.support.v4.widget.DrawerLayout 3 <android.support.v4.widget.DrawerLayout
4 xmlns:android="http://schemas.android.com/apk/res/android" 4 xmlns:android="http://schemas.android.com/apk/res/android"
5 android:id="@+id/drawerLayout" 5 android:id="@+id/drawerLayout"
6 android:layout_width="match_parent" 6 android:layout_width="match_parent"
7 android:layout_height="match_parent"> 7 android:layout_height="match_parent">
8 <!-- The main content view --> 8 <!-- The main content view -->
9 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" 9 <RelativeLayout
10 xmlns:tools="http://schemas.android.com/tools"
11 android:id="@+id/mainLayout"
12 android:orientation="vertical"
13 android:layout_width="match_parent" 10 android:layout_width="match_parent"
14 android:layout_height="match_parent" 11 android:layout_height="match_parent">
15 tools:context=".ViewerActivity">
16 12
17 <SurfaceView 13 <!-- We use mainLayout for recreating SurfaceView -->
18 android:id="@+id/surfaceView" 14 <LinearLayout
15 android:id="@+id/mainLayout"
19 android:layout_width="match_parent" 16 android:layout_width="match_parent"
20 android:layout_height="match_parent" 17 android:layout_height="match_parent">
21 android:layout_centerVertical="true" 18 <SurfaceView
22 android:layout_centerHorizontal="true" /> 19 android:id="@+id/surfaceView"
20 android:layout_width="match_parent"
21 android:layout_height="match_parent"
22 android:layout_centerVertical="true"
23 android:layout_centerHorizontal="true" />
24 </LinearLayout>
23 25
24 </LinearLayout> 26 <TextView
27 android:layout_width="100dp"
28 android:layout_height="wrap_content"
29 android:layout_margin="10dp"
30 android:padding="10dp"
31 android:background="@android:color/holo_blue_dark"
32 android:textColor="@android:color/white"
33 android:text=" 100.000ms"
34 android:id="@+id/fpsFloatText"
35 android:visibility="invisible"
36 android:layout_alignParentBottom="true"
37 android:layout_alignParentEnd="true" />
38
39 </RelativeLayout>
25 40
26 <!-- The navigation drawer --> 41 <!-- The navigation drawer -->
27 <ListView android:id="@+id/leftDrawer" 42 <ListView android:id="@+id/leftDrawer"
28 android:layout_width="240dp" 43 android:layout_width="240dp"
29 android:layout_height="match_parent" 44 android:layout_height="match_parent"
30 android:layout_gravity="start" 45 android:layout_gravity="start"
31 android:choiceMode="singleChoice" 46 android:choiceMode="singleChoice"
32 android:divider="@android:color/transparent" 47 android:divider="@android:color/transparent"
33 android:dividerHeight="0dp" 48 android:dividerHeight="0dp"
34 android:background="@android:color/background_light"/> 49 android:background="@android:color/background_light"/>
35 </android.support.v4.widget.DrawerLayout> 50 </android.support.v4.widget.DrawerLayout>
36 51
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698