| OLD | NEW |
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 | 2 |
| 3 <!-- Copyright 2014 The Chromium Authors. All rights reserved. | 3 <!-- Copyright 2014 The Chromium Authors. All rights reserved. |
| 4 Use of this source code is governed by a BSD-style license that can be | 4 Use of this source code is governed by a BSD-style license that can be |
| 5 found in the LICENSE file. | 5 found in the LICENSE file. |
| 6 --> | 6 --> |
| 7 | 7 |
| 8 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | 8 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" |
| 9 android:layout_width="match_parent" | 9 android:layout_width="match_parent" |
| 10 android:layout_height="match_parent"> | 10 android:layout_height="match_parent"> |
| 11 <org.chromium.chromoting.DesktopView android:id="@+id/desktop_view" | 11 <FrameLayout android:id="@+id/desktop_view_placeholder" |
| 12 android:layout_width="match_parent" | 12 android:layout_width="match_parent" |
| 13 android:layout_height="match_parent"/> | 13 android:layout_height="match_parent"/> |
| 14 <RelativeLayout | 14 <RelativeLayout |
| 15 android:layout_width="match_parent" | 15 android:layout_width="match_parent" |
| 16 android:layout_height="match_parent" | 16 android:layout_height="match_parent" |
| 17 android:fitsSystemWindows="true" | 17 android:fitsSystemWindows="true" |
| 18 android:elevation="4dp"> | 18 android:elevation="4dp"> |
| 19 <android.support.v7.widget.Toolbar | 19 <android.support.v7.widget.Toolbar |
| 20 android:id="@+id/toolbar" | 20 android:id="@+id/toolbar" |
| 21 android:alpha="0.85" | 21 android:alpha="0.85" |
| 22 android:layout_width="match_parent" | 22 android:layout_width="match_parent" |
| 23 android:layout_height="wrap_content" | 23 android:layout_height="wrap_content" |
| 24 android:fitsSystemWindows="true" | 24 android:fitsSystemWindows="true" |
| 25 style="@style/ToolbarStyle"/> | 25 style="@style/ToolbarStyle"/> |
| 26 <FrameLayout | 26 <FrameLayout |
| 27 android:id="@+id/resize_detector" | 27 android:id="@+id/resize_detector" |
| 28 android:layout_below="@id/toolbar" | 28 android:layout_below="@id/toolbar" |
| 29 android:layout_width="match_parent" | 29 android:layout_width="match_parent" |
| 30 android:layout_height="match_parent" | 30 android:layout_height="match_parent" |
| 31 android:fitsSystemWindows="true" | 31 android:fitsSystemWindows="true" |
| 32 android:background="@android:color/transparent"> | 32 android:background="@android:color/transparent"> |
| 33 </FrameLayout> | 33 </FrameLayout> |
| 34 </RelativeLayout> | 34 </RelativeLayout> |
| 35 </RelativeLayout> | 35 </RelativeLayout> |
| OLD | NEW |