summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorLeon Scroggins III <scroggo@google.com>2010-09-28 07:20:28 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2010-09-28 07:20:28 -0700
commitb2ac49918672f66b71111895cf460e85648b587f (patch)
tree6c0fdf9d1baff490772c90d7d9541eec05b85172 /res
parent307f0c17b7f6624ee005db5fe2f99c640cf83916 (diff)
parenta682a3ccac02db69bd8708258aae263be4b22e72 (diff)
downloadpackages_apps_Browser-b2ac49918672f66b71111895cf460e85648b587f.zip
packages_apps_Browser-b2ac49918672f66b71111895cf460e85648b587f.tar.gz
packages_apps_Browser-b2ac49918672f66b71111895cf460e85648b587f.tar.bz2
Merge "Use the system downloads UI, instead of browser specific 1." into gingerbread
Diffstat (limited to 'res')
-rw-r--r--res/layout/browser_download_item.xml91
-rw-r--r--res/layout/browser_downloads_page.xml24
-rw-r--r--res/layout/no_downloads.xml25
3 files changed, 0 insertions, 140 deletions
diff --git a/res/layout/browser_download_item.xml b/res/layout/browser_download_item.xml
deleted file mode 100644
index 52f49c1..0000000
--- a/res/layout/browser_download_item.xml
+++ /dev/null
@@ -1,91 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** assets/res/any/layout/browser_bookmark_item.xml
-**
-** Copyright 2006, 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.
-*/
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:paddingRight="?android:attr/scrollbarSize"
- >
-
- <ImageView android:id="@+id/download_icon"
- android:layout_width="@android:dimen/app_icon_size"
- android:layout_height="@android:dimen/app_icon_size"
- android:layout_alignParentTop="true"
- android:layout_alignParentLeft="true"
- android:scaleType="fitCenter"
- />
-
- <TextView android:id="@+id/download_title"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:maxLines="1"
- android:layout_alignParentTop="true"
- android:layout_toRightOf="@id/download_icon"
- android:textAppearance="?android:attr/textAppearanceMedium"
- />
- <TextView android:id="@+id/domain"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_toRightOf="@id/download_icon"
- android:layout_below="@id/download_title"
- android:maxLines="1"
- android:textAppearance="?android:attr/textAppearanceSmall"
- />
-
- <TextView android:id="@+id/complete_date"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:maxLines="1"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_below="@id/domain"
- android:layout_alignParentRight="true"
- android:visibility="gone"
- />
-
- <TextView android:id="@+id/complete_text"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_below="@id/domain"
- android:layout_toRightOf="@id/download_icon"
- android:layout_toLeftOf="@id/complete_date"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:visibility="gone"
- />
-
- <ProgressBar android:id="@+id/download_progress"
- style="?android:attr/progressBarStyleHorizontal"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_below="@id/download_icon"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true"
- android:max="100"
- />
- <TextView android:id="@+id/progress_text"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:maxLines="1"
- android:textAppearance="?android:attr/textAppearanceSmall"
- android:layout_centerHorizontal="true"
- android:layout_below="@id/download_progress"
- />
-</RelativeLayout>
-
diff --git a/res/layout/browser_downloads_page.xml b/res/layout/browser_downloads_page.xml
deleted file mode 100644
index 5cdf30c..0000000
--- a/res/layout/browser_downloads_page.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/*
-** assets/res/any/layout/browser_bookmarks_page.xml
-**
-** Copyright 2006, 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.
-*/
--->
-<merge xmlns:android="http://schemas.android.com/apk/res/android">
- <ExpandableListView android:id="@android:id/list" android:layout_width="match_parent" android:layout_height="match_parent"/>
- <ViewStub android:id="@+id/empty" android:layout="@layout/no_downloads" android:layout_width="match_parent" android:layout_height="match_parent"/>
-</merge>
diff --git a/res/layout/no_downloads.xml b/res/layout/no_downloads.xml
deleted file mode 100644
index 6918eab..0000000
--- a/res/layout/no_downloads.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:text="@string/no_downloads"
- android:background="@color/black"
- android:textColor="@color/white"
- android:gravity="center"
- android:textStyle="bold"
- />