| OLD | NEW |
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. | 2 <!-- Copyright 2015 The Chromium Authors. All rights reserved. |
| 3 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 |
| 4 found in the LICENSE file. --> | 4 found in the LICENSE file. --> |
| 5 | 5 |
| 6 <merge xmlns:android="http://schemas.android.com/apk/res/android"> | 6 <merge xmlns:android="http://schemas.android.com/apk/res/android"> |
| 7 <LinearLayout | 7 <LinearLayout |
| 8 android:layout_width="match_parent" | 8 android:layout_width="match_parent" |
| 9 android:layout_height="match_parent" | 9 android:layout_height="match_parent" |
| 10 android:orientation="vertical"> | 10 android:orientation="vertical"> |
| (...skipping 26 matching lines...) Expand all Loading... |
| 37 android:src="@drawable/btn_reload" /> | 37 android:src="@drawable/btn_reload" /> |
| 38 </org.chromium.blimp.toolbar.Toolbar> | 38 </org.chromium.blimp.toolbar.Toolbar> |
| 39 | 39 |
| 40 <!-- Content Area --> | 40 <!-- Content Area --> |
| 41 <org.chromium.blimp.BlimpView | 41 <org.chromium.blimp.BlimpView |
| 42 android:id="@+id/renderer" | 42 android:id="@+id/renderer" |
| 43 android:layout_width="match_parent" | 43 android:layout_width="match_parent" |
| 44 android:layout_height="match_parent" /> | 44 android:layout_height="match_parent" /> |
| 45 </LinearLayout> | 45 </LinearLayout> |
| 46 </merge> | 46 </merge> |
| OLD | NEW |