| Index: chrome/android/java_staging/res/layout/eb_main.xml
|
| diff --git a/chrome/android/java_staging/res/layout/eb_main.xml b/chrome/android/java_staging/res/layout/eb_main.xml
|
| index 8a9a58a63b457c34621b566f67cb8f95de0c236c..d120b8f2b1f29b6184ba43a27c8cbd39d2253284 100644
|
| --- a/chrome/android/java_staging/res/layout/eb_main.xml
|
| +++ b/chrome/android/java_staging/res/layout/eb_main.xml
|
| @@ -3,31 +3,20 @@
|
| 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/eb_view_switcher"
|
| +<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
| + android:id="@+id/eb_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/eb_drawer_layout"
|
| - android:layout_width="match_parent"
|
| - android:layout_height="match_parent" >
|
| + <include layout="@layout/eb_main_content" />
|
|
|
| - <include layout="@layout/eb_main_content" />
|
| -
|
| - <org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarkDrawerListView
|
| - android:id="@+id/eb_drawer_list"
|
| - android:layout_width="240dp"
|
| - android:layout_height="match_parent"
|
| - android:layout_gravity="start"
|
| - android:background="#fff"
|
| - android:choiceMode="singleChoice"
|
| - android:divider="@null"
|
| - android:dividerHeight="0dp" />
|
| - </android.support.v4.widget.DrawerLayout>
|
| -
|
| - <include layout="@layout/eb_search"/>
|
| -
|
| -</ViewSwitcher>
|
| + <org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarkDrawerListView
|
| + android:id="@+id/eb_drawer_list"
|
| + android:layout_width="240dp"
|
| + android:layout_height="match_parent"
|
| + android:layout_gravity="start"
|
| + android:background="#fff"
|
| + android:choiceMode="singleChoice"
|
| + android:divider="@null"
|
| + android:dividerHeight="0dp" />
|
| +</android.support.v4.widget.DrawerLayout>
|
|
|