summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLeon Scroggins <scroggo@google.com>2010-06-16 14:35:33 -0400
committerLeon Scroggins <scroggo@google.com>2010-06-16 14:35:33 -0400
commit897ba06f8bad14e697389978719578b07429fc5b (patch)
tree204cb9de8d9f8bb0e64dfe89826fd37dad218482
parentab6b5f9adda90b0ba76ea8ed8386602556d073d1 (diff)
downloadpackages_apps_Browser-897ba06f8bad14e697389978719578b07429fc5b.zip
packages_apps_Browser-897ba06f8bad14e697389978719578b07429fc5b.tar.gz
packages_apps_Browser-897ba06f8bad14e697389978719578b07429fc5b.tar.bz2
Use the new look for the progress bar.
Bug 2712871 Change-Id: Ifb6afe59196332d966590dbc08228fb78aa5f8cf
-rw-r--r--res/drawable/progress.xml31
-rw-r--r--res/layout/title_bar_xlarge.xml4
-rw-r--r--src/com/android/browser/TitleBarXLarge.java2
3 files changed, 35 insertions, 2 deletions
diff --git a/res/drawable/progress.xml b/res/drawable/progress.xml
new file mode 100644
index 0000000..dd7c375
--- /dev/null
+++ b/res/drawable/progress.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+
+ <item android:id="@android:id/background">
+ <shape>
+ <solid android:color="#ffffffff"/>
+ </shape>
+ </item>
+ <item android:id="@android:id/progress">
+ <clip>
+ <shape>
+ <solid android:color="#ff94b73f"/>
+ </shape>
+ </clip>
+ </item>
+
+</layer-list>
diff --git a/res/layout/title_bar_xlarge.xml b/res/layout/title_bar_xlarge.xml
index c5a44f8..3070b8b 100644
--- a/res/layout/title_bar_xlarge.xml
+++ b/res/layout/title_bar_xlarge.xml
@@ -19,14 +19,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:paddingLeft="6dip"
- android:paddingRight="6dip"
android:background="#ffdddddd" >
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
+ android:paddingLeft="6dip"
+ android:paddingRight="6dip"
>
<ImageButton android:id="@+id/back"
android:src="@drawable/ic_arrow_left"
diff --git a/src/com/android/browser/TitleBarXLarge.java b/src/com/android/browser/TitleBarXLarge.java
index 5296ed1..76f57d0 100644
--- a/src/com/android/browser/TitleBarXLarge.java
+++ b/src/com/android/browser/TitleBarXLarge.java
@@ -78,6 +78,8 @@ public class TitleBarXLarge extends TitleBarBase {
mCircularProgress.setBounds(0, 0, iconDimension, iconDimension);
mHorizontalProgress = (ProgressBar) findViewById(
R.id.progress_horizontal);
+ mHorizontalProgress.setProgressDrawable(
+ resources.getDrawable(R.drawable.progress));
// FIXME: Change enabled states based on whether you can go
// back/forward. Probably should be done inside onPageStarted.