summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
authorLeon Scroggins <scroggo@google.com>2010-08-24 14:24:05 -0400
committerLeon Scroggins <scroggo@google.com>2010-09-01 08:53:03 -0400
commit4fc12cbfe150afe12059ceb5bfa4a497ef20072d (patch)
treef81dbc39d0797f98455d664b740ebf12605d12a0 /res/layout
parent2bdc79fa5a2ddd9ab9318c8856b659a1cd2e95a7 (diff)
downloadpackages_apps_Browser-4fc12cbfe150afe12059ceb5bfa4a497ef20072d.zip
packages_apps_Browser-4fc12cbfe150afe12059ceb5bfa4a497ef20072d.tar.gz
packages_apps_Browser-4fc12cbfe150afe12059ceb5bfa4a497ef20072d.tar.bz2
Move Find on page and Select into the framework.
Bug: 2938052 Depends on a change to frameworks/base Change-Id: I28db6d06fa248913091455e82853ef151a0561b0
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/bookmarkwidget.xml4
-rw-r--r--res/layout/browser_find.xml40
2 files changed, 2 insertions, 42 deletions
diff --git a/res/layout/bookmarkwidget.xml b/res/layout/bookmarkwidget.xml
index 2416e4f..c7c2a90 100644
--- a/res/layout/bookmarkwidget.xml
+++ b/res/layout/bookmarkwidget.xml
@@ -31,7 +31,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dip"
- android:src="@drawable/ic_btn_find_prev" />
+ android:src="@*android:drawable/ic_btn_find_prev" />
<TextView
android:id="@+id/title"
@@ -49,7 +49,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="10dip"
- android:src="@drawable/ic_btn_find_next" />
+ android:src="@*android:drawable/ic_btn_find_next" />
</LinearLayout>
diff --git a/res/layout/browser_find.xml b/res/layout/browser_find.xml
deleted file mode 100644
index bb7a36f..0000000
--- a/res/layout/browser_find.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2007 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- >
- <EditText android:id="@+id/edit"
- android:layout_width="0dip"
- android:layout_weight="1"
- android:layout_height="wrap_content"
- android:scrollHorizontally="true"
- android:inputType="text"
- android:hint="@string/find_dot"
- android:imeOptions="actionDone"
- android:layout_marginRight="10dip"
- />
- <TextView android:id="@+id/matches"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="center_vertical"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:textColor="?android:attr/textColorSecondaryInverse"
- />
-</LinearLayout>
-