chrome/android/java/res/layout/eb_search_core.xml - Issue 1270693004: Add bookmark search feature to enhanced bookmark

Side by Side Diff: chrome/android/java/res/layout/eb_search_core.xml

Issue 1270693004: Add bookmark search feature to enhanced bookmark (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: address kkimlabs@'s comments 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 unified diff | Download patch

« no previous file with comments | « chrome/android/java/res/layout/eb_search.xml ('k') | chrome/android/java/res/layout/eb_search_row.xml » ('j') | chrome/android/java/src/org/chromium/chrome/browser/enhancedbookmarks/EnhancedBookmarkRow.java » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

OLD	NEW
(Empty)
	1 <?xml version="1.0" encoding="utf-8"?>

	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

	4 found in the LICENSE file. -->

	5

	6 <merge xmlns:android="http://schemas.android.com/apk/res/android">

	7

	8 <android.support.v7.widget.Toolbar

	9 android:id="@+id/search_bar"

	10 android:layout_width="match_parent"

	11 android:layout_height="@dimen/toolbar_height_no_shadow"
	Kibeom Kim (inactive) 2015/08/12 04:26:29 ?attr/actionBarSize (suggested by go/appcompat-mat ?attr/actionBarSize (suggested by go/appcompat-material-doc and also matches other toolbars we have) Ian Wen 2015/08/12 18:32:40 Done. On nexus 9 this is 56dp instead of 48. Show quoted text On 2015/08/12 04:26:29, Kibeom Kim wrote: > ?attr/actionBarSize (suggested by go/appcompat-material-doc and also matches > other toolbars we have) Done. On nexus 9 this is 56dp instead of 48.
	12 android:orientation="horizontal"
	Kibeom Kim (inactive) 2015/08/12 04:26:29 I suppose orientation is not needed? I suppose orientation is not needed? Ian Wen 2015/08/12 18:32:40 Done. Show quoted text On 2015/08/12 04:26:29, Kibeom Kim wrote: > I suppose orientation is not needed? Done.
	13 android:descendantFocusability="afterDescendants" >
	Kibeom Kim (inactive) 2015/08/12 04:26:29 Is this still needed with Toolbar? Is this still needed with Toolbar? Ian Wen 2015/08/12 18:32:40 No. Removed. Show quoted text On 2015/08/12 04:26:29, Kibeom Kim wrote: > Is this still needed with Toolbar? No. Removed.
	14

	15 <EditText

	16 android:id="@+id/eb_search_text"

	17 android:layout_width="match_parent"

	18 android:layout_height="match_parent"

	19 android:background="@null"

	20 android:gravity="center_vertical"

	21 android:hint="@string/enhanced_bookmark_action_bar_search"

	22 android:imeOptions="flagNoExtractUi\|actionSearch"

	23 android:inputType="textNoSuggestions"

	24 android:singleLine="true"

	25 android:textColor="#343434"

	26 android:textSize="20sp" />

	27 </android.support.v7.widget.Toolbar>

	28

	29 <View

	30 android:layout_width="match_parent"

	31 android:layout_height="1dp"

	32 android:background="#E1E1E1" />

	33

	34 <view class="org.chromium.chrome.browser.enhancedbookmarks.EnhancedBookmarkS earchView$HistoryResultSwitcher"

	35 android:id="@+id/history_result_switcher"

	36 android:layout_width="match_parent"

	37 android:layout_height="match_parent"

	38 android:inAnimation="@android:anim/fade_in"

	39 android:outAnimation="@android:anim/fade_out" >

	40

	41 <ListView

	42 android:id="@+id/eb_history_list"

	43 android:layout_width="match_parent"

	44 android:layout_height="match_parent"

	45 android:divider="@null"

	46 android:dividerHeight="0dp" />

	47

	48 <ViewSwitcher

	49 android:id="@+id/result_empty_switcher"

	50 android:layout_width="match_parent"

	51 android:layout_height="match_parent"

	52 android:inAnimation="@android:anim/fade_in"

	53 android:outAnimation="@android:anim/fade_out" >

	54

	55 <ListView

	56 android:id="@+id/eb_result_list"

	57 android:layout_width="match_parent"

	58 android:layout_height="match_parent"

	59 android:divider="@null"

	60 android:dividerHeight="0dp" />

	61

	62 <TextView

	63 android:id="@+id/eb_search_empty_view"

	64 android:layout_width="wrap_content"

	65 android:layout_height="wrap_content"

	66 android:layout_gravity="center"

	67 android:drawablePadding="3dp"

	68 android:drawableTop="@drawable/eb_logo_large"

	69 android:gravity="center"

	70 android:padding="16dp"

	71 android:text="@string/enhanced_bookmark_no_result"

	72 android:textColor="#5B5B5B"

	73 android:textSize="16sp" />

	74 </ViewSwitcher>

	75 </view>

	76

	77 </merge>

OLD	NEW