Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1873)

Unified Diff: chrome/android/java/res/layout/eb_main.xml

Issue 1270693004: Add bookmark search feature to enhanced bookmark (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/android/java/res/layout-sw720dp/eb_main.xml ('k') | chrome/android/java/res/layout/eb_search.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/android/java/res/layout/eb_main.xml
diff --git a/chrome/android/java/res/layout/eb_main.xml b/chrome/android/java/res/layout/eb_main.xml
index d120b8f2b1f29b6184ba43a27c8cbd39d2253284..8a9a58a63b457c34621b566f67cb8f95de0c236c 100644
--- a/chrome/android/java/res/layout/eb_main.xml
+++ b/chrome/android/java/res/layout/eb_main.xml
@@ -3,20 +3,31 @@
Use of this source code is governed by a BSD-style license that can be
found in the LICENSE file. -->
-<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/eb_drawer_layout"
+<ViewSwitcher xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/eb_view_switcher"
android:layout_width="match_parent"
- android:layout_height="match_parent" >
+ android:layout_height="match_parent"
+ android:inAnimation="@android:anim/fade_in"
+ android:outAnimation="@android:anim/fade_out" >
- <include layout="@layout/eb_main_content" />
+ <android.support.v4.widget.DrawerLayout
+ android:id="@+id/eb_drawer_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
- <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_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>
« no previous file with comments | « chrome/android/java/res/layout-sw720dp/eb_main.xml ('k') | chrome/android/java/res/layout/eb_search.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698