Index: chrome/android/java/res/layout/bookmark_main.xml |
diff --git a/chrome/android/java/res/layout/bookmark_main.xml b/chrome/android/java/res/layout/bookmark_main.xml |
index bd9525b5d2d60abbc8b1f36c10996aa8867cb7a6..685c8b050461c5d887c6556aea743b3f0923470d 100644 |
--- a/chrome/android/java/res/layout/bookmark_main.xml |
+++ b/chrome/android/java/res/layout/bookmark_main.xml |
@@ -3,35 +3,25 @@ |
Use of this source code is governed by a BSD-style license that can be |
found in the LICENSE file. --> |
-<ViewSwitcher xmlns:android="http://schemas.android.com/apk/res/android" |
- android:id="@+id/bookmark_view_switcher" |
+<android.support.v4.widget.DrawerLayout |
+ xmlns:android="http://schemas.android.com/apk/res/android" |
+ android:id="@+id/bookmark_drawer_layout" |
android:layout_width="match_parent" |
- android:layout_height="match_parent" |
- android:inAnimation="@android:anim/fade_in" |
- android:outAnimation="@android:anim/fade_out" > |
+ android:layout_height="match_parent" > |
- <android.support.v4.widget.DrawerLayout |
- android:id="@+id/bookmark_drawer_layout" |
+ <org.chromium.chrome.browser.widget.selection.SelectableListLayout |
+ android:id="@+id/selectable_list" |
android:layout_width="match_parent" |
- android:layout_height="match_parent" > |
+ android:layout_height="match_parent" |
+ android:background="@color/default_primary_color" /> |
- <org.chromium.chrome.browser.widget.selection.SelectableListLayout |
- android:id="@+id/selectable_list" |
- android:layout_width="match_parent" |
- android:layout_height="match_parent" |
- android:background="@color/default_primary_color" /> |
- |
- <org.chromium.chrome.browser.bookmarks.BookmarkDrawerListView |
- android:id="@+id/bookmark_drawer_list" |
- android:layout_width="@dimen/drawer_width" |
- android:layout_height="match_parent" |
- android:layout_gravity="start" |
- android:background="@android:color/white" |
- android:choiceMode="singleChoice" |
- android:divider="@null" |
- android:dividerHeight="0dp" /> |
- </android.support.v4.widget.DrawerLayout> |
- |
- <include layout="@layout/bookmark_search"/> |
- |
-</ViewSwitcher> |
+ <org.chromium.chrome.browser.bookmarks.BookmarkDrawerListView |
+ android:id="@+id/bookmark_drawer_list" |
+ android:layout_width="@dimen/drawer_width" |
+ android:layout_height="match_parent" |
+ android:layout_gravity="start" |
+ android:background="@android:color/white" |
+ android:choiceMode="singleChoice" |
+ android:divider="@null" |
+ android:dividerHeight="0dp" /> |
+</android.support.v4.widget.DrawerLayout> |