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

Unified 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 side-by-side diff with in-line comments
Download patch
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..7041d0e8edc9406b5f3ef4f0702c9a02b5614aed 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
@@ -6,22 +6,37 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
<!-- The main content view -->
- <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:id="@+id/mainLayout"
- android:orientation="vertical"
+ <RelativeLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
- tools:context=".ViewerActivity">
+ android:layout_height="match_parent">
- <SurfaceView
- android:id="@+id/surfaceView"
+ <!-- We use mainLayout for recreating SurfaceView -->
+ <LinearLayout
+ android:id="@+id/mainLayout"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_centerVertical="true"
- android:layout_centerHorizontal="true" />
+ android:layout_height="match_parent">
+ <SurfaceView
+ android:id="@+id/surfaceView"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_centerVertical="true"
+ android:layout_centerHorizontal="true" />
+ </LinearLayout>
+
+ <TextView
+ android:layout_width="100dp"
+ android:layout_height="wrap_content"
+ android:layout_margin="10dp"
+ android:padding="10dp"
+ android:background="@android:color/holo_blue_dark"
+ android:textColor="@android:color/white"
+ android:text=" 100.000ms"
+ android:id="@+id/fpsFloatText"
+ android:visibility="invisible"
+ android:layout_alignParentBottom="true"
+ android:layout_alignParentEnd="true" />
- </LinearLayout>
+ </RelativeLayout>
<!-- The navigation drawer -->
<ListView android:id="@+id/leftDrawer"

Powered by Google App Engine
This is Rietveld 408576698