| OLD | NEW |
| 1 <?xml version="1.0" encoding="utf-8"?> | 1 <?xml version="1.0" encoding="utf-8"?> |
| 2 <!-- Copyright 2016 The Chromium Authors. All rights reserved. | 2 <!-- Copyright 2016 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 <ViewStub | 7 <ViewStub |
| 8 android:id="@+id/action_bar_stub" | 8 android:id="@+id/action_bar_stub" |
| 9 android:inflatedId="@+id/action_bar" | 9 android:inflatedId="@+id/action_bar" |
| 10 android:layout_width="match_parent" | 10 android:layout_width="match_parent" |
| 11 android:layout_height="?attr/actionBarSize" | 11 android:layout_height="?attr/actionBarSize" |
| 12 android:background="@color/appbar_background" /> | 12 android:background="@color/default_primary_color" /> |
| 13 | 13 |
| 14 <FrameLayout | 14 <FrameLayout |
| 15 android:id="@+id/list_content" | 15 android:id="@+id/list_content" |
| 16 android:layout_width="match_parent" | 16 android:layout_width="match_parent" |
| 17 android:layout_height="match_parent" | 17 android:layout_height="match_parent" |
| 18 android:layout_marginTop="?attr/actionBarSize" > | 18 android:layout_marginTop="?attr/actionBarSize" > |
| 19 | 19 |
| 20 <android.support.v7.widget.RecyclerView | 20 <android.support.v7.widget.RecyclerView |
| 21 android:id="@+id/recycler_view" | 21 android:id="@+id/recycler_view" |
| 22 android:layout_width="match_parent" | 22 android:layout_width="match_parent" |
| (...skipping 17 matching lines...) Expand all Loading... |
| 40 android:layout_gravity="center" /> | 40 android:layout_gravity="center" /> |
| 41 </FrameLayout> | 41 </FrameLayout> |
| 42 | 42 |
| 43 <org.chromium.chrome.browser.widget.FadingShadowView | 43 <org.chromium.chrome.browser.widget.FadingShadowView |
| 44 android:id="@+id/shadow" | 44 android:id="@+id/shadow" |
| 45 android:layout_width="match_parent" | 45 android:layout_width="match_parent" |
| 46 android:layout_height="@dimen/action_bar_shadow_height" | 46 android:layout_height="@dimen/action_bar_shadow_height" |
| 47 android:layout_marginTop="?attr/actionBarSize" /> | 47 android:layout_marginTop="?attr/actionBarSize" /> |
| 48 | 48 |
| 49 </merge> | 49 </merge> |
| OLD | NEW |