Merge change I3c58dbaa into eclair
* changes:
New assets. This makes the title bar's button match the voice button.
diff --git a/res/drawable-hdpi/background_titlebar.png b/res/drawable-hdpi/background_titlebar.png
deleted file mode 100644
index 8271454..0000000
--- a/res/drawable-hdpi/background_titlebar.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/browser_tab_selected.9.png b/res/drawable-hdpi/browser_tab_selected.9.png
deleted file mode 100755
index cc1086b..0000000
--- a/res/drawable-hdpi/browser_tab_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/browser_tab_unselected.9.png b/res/drawable-hdpi/browser_tab_unselected.9.png
deleted file mode 100755
index a5e7087..0000000
--- a/res/drawable-hdpi/browser_tab_unselected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_list_data_large.png b/res/drawable-hdpi/ic_list_data_large.png
new file mode 100644
index 0000000..aaa035d
--- /dev/null
+++ b/res/drawable-hdpi/ic_list_data_large.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_list_data_off.png b/res/drawable-hdpi/ic_list_data_off.png
new file mode 100644
index 0000000..f7eb6af
--- /dev/null
+++ b/res/drawable-hdpi/ic_list_data_off.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_list_data_small.png b/res/drawable-hdpi/ic_list_data_small.png
new file mode 100644
index 0000000..eb90a6b
--- /dev/null
+++ b/res/drawable-hdpi/ic_list_data_small.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_list_gps_denied.png b/res/drawable-hdpi/ic_list_gps_denied.png
new file mode 100644
index 0000000..97dbc9b
--- /dev/null
+++ b/res/drawable-hdpi/ic_list_gps_denied.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_list_gps_on.png b/res/drawable-hdpi/ic_list_gps_on.png
new file mode 100644
index 0000000..2c02e58
--- /dev/null
+++ b/res/drawable-hdpi/ic_list_gps_on.png
Binary files differ
diff --git a/res/drawable-hdpi/ic_new_window.png b/res/drawable-hdpi/ic_new_window.png
deleted file mode 100644
index 0eaea9b..0000000
--- a/res/drawable-hdpi/ic_new_window.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_titlebar_zoom.png b/res/drawable-hdpi/ic_titlebar_zoom.png
deleted file mode 100644
index f6cb83a..0000000
--- a/res/drawable-hdpi/ic_titlebar_zoom.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_titlebar_zoom_out.png b/res/drawable-hdpi/ic_titlebar_zoom_out.png
deleted file mode 100644
index 60dde08..0000000
--- a/res/drawable-hdpi/ic_titlebar_zoom_out.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/minitab_focus.9.png b/res/drawable-hdpi/minitab_focus.9.png
deleted file mode 100755
index 3ea2540..0000000
--- a/res/drawable-hdpi/minitab_focus.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/minitab_press.9.png b/res/drawable-hdpi/minitab_press.9.png
deleted file mode 100755
index 5de769d..0000000
--- a/res/drawable-hdpi/minitab_press.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/minitab_selected.9.png b/res/drawable-hdpi/minitab_selected.9.png
deleted file mode 100755
index 05f1a3c..0000000
--- a/res/drawable-hdpi/minitab_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/minitab_unselected.9.png b/res/drawable-hdpi/minitab_unselected.9.png
deleted file mode 100755
index ac6b7f8..0000000
--- a/res/drawable-hdpi/minitab_unselected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/search.9.png b/res/drawable-hdpi/search.9.png
deleted file mode 100755
index a152fa0..0000000
--- a/res/drawable-hdpi/search.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/tab_browser_selected.9.png b/res/drawable-hdpi/tab_browser_selected.9.png
deleted file mode 100755
index 379ffe0..0000000
--- a/res/drawable-hdpi/tab_browser_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/tab_browser_unselected.9.png b/res/drawable-hdpi/tab_browser_unselected.9.png
deleted file mode 100755
index bc37346..0000000
--- a/res/drawable-hdpi/tab_browser_unselected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/tab_selected.9.png b/res/drawable-hdpi/tab_selected.9.png
deleted file mode 100755
index 76ca8ae..0000000
--- a/res/drawable-hdpi/tab_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/tab_unselected.9.png b/res/drawable-hdpi/tab_unselected.9.png
deleted file mode 100755
index e1dce20..0000000
--- a/res/drawable-hdpi/tab_unselected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/background_titlebar.png b/res/drawable-mdpi/background_titlebar.png
deleted file mode 100644
index 1fdb078..0000000
--- a/res/drawable-mdpi/background_titlebar.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/browser_tab_selected.9.png b/res/drawable-mdpi/browser_tab_selected.9.png
deleted file mode 100644
index f822528..0000000
--- a/res/drawable-mdpi/browser_tab_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/browser_tab_unselected.9.png b/res/drawable-mdpi/browser_tab_unselected.9.png
deleted file mode 100644
index 6f6e373..0000000
--- a/res/drawable-mdpi/browser_tab_unselected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_list_data_large.png b/res/drawable-mdpi/ic_list_data_large.png
new file mode 100644
index 0000000..58f7c2f
--- /dev/null
+++ b/res/drawable-mdpi/ic_list_data_large.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_list_data_off.png b/res/drawable-mdpi/ic_list_data_off.png
new file mode 100644
index 0000000..69d4eae
--- /dev/null
+++ b/res/drawable-mdpi/ic_list_data_off.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_list_data_small.png b/res/drawable-mdpi/ic_list_data_small.png
new file mode 100644
index 0000000..3d40655
--- /dev/null
+++ b/res/drawable-mdpi/ic_list_data_small.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_list_gps_denied.png b/res/drawable-mdpi/ic_list_gps_denied.png
new file mode 100644
index 0000000..d53a5c1
--- /dev/null
+++ b/res/drawable-mdpi/ic_list_gps_denied.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_list_gps_on.png b/res/drawable-mdpi/ic_list_gps_on.png
new file mode 100644
index 0000000..15ff6ee
--- /dev/null
+++ b/res/drawable-mdpi/ic_list_gps_on.png
Binary files differ
diff --git a/res/drawable-mdpi/ic_new_window.png b/res/drawable-mdpi/ic_new_window.png
deleted file mode 100644
index 3f8442d..0000000
--- a/res/drawable-mdpi/ic_new_window.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_titlebar_zoom.png b/res/drawable-mdpi/ic_titlebar_zoom.png
deleted file mode 100644
index b497dab..0000000
--- a/res/drawable-mdpi/ic_titlebar_zoom.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_titlebar_zoom_out.png b/res/drawable-mdpi/ic_titlebar_zoom_out.png
deleted file mode 100644
index 4b5a3dd..0000000
--- a/res/drawable-mdpi/ic_titlebar_zoom_out.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/minitab_focus.9.png b/res/drawable-mdpi/minitab_focus.9.png
deleted file mode 100644
index 7c290e3..0000000
--- a/res/drawable-mdpi/minitab_focus.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/minitab_press.9.png b/res/drawable-mdpi/minitab_press.9.png
deleted file mode 100644
index c7369e7..0000000
--- a/res/drawable-mdpi/minitab_press.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/minitab_selected.9.png b/res/drawable-mdpi/minitab_selected.9.png
deleted file mode 100644
index 849e124..0000000
--- a/res/drawable-mdpi/minitab_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/minitab_unselected.9.png b/res/drawable-mdpi/minitab_unselected.9.png
deleted file mode 100644
index e12b36d..0000000
--- a/res/drawable-mdpi/minitab_unselected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/search.9.png b/res/drawable-mdpi/search.9.png
deleted file mode 100644
index 037e8f0..0000000
--- a/res/drawable-mdpi/search.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/tab_browser_selected.9.png b/res/drawable-mdpi/tab_browser_selected.9.png
deleted file mode 100644
index 40ad080..0000000
--- a/res/drawable-mdpi/tab_browser_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/tab_browser_unselected.9.png b/res/drawable-mdpi/tab_browser_unselected.9.png
deleted file mode 100644
index 9b5ec0e..0000000
--- a/res/drawable-mdpi/tab_browser_unselected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/tab_selected.9.png b/res/drawable-mdpi/tab_selected.9.png
deleted file mode 100644
index a47f024..0000000
--- a/res/drawable-mdpi/tab_selected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/tab_unselected.9.png b/res/drawable-mdpi/tab_unselected.9.png
deleted file mode 100644
index 2e3a454..0000000
--- a/res/drawable-mdpi/tab_unselected.9.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/location.png b/res/drawable/location.png
deleted file mode 100644
index c7eb1dc..0000000
--- a/res/drawable/location.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/tab_indicator.xml b/res/drawable/tab_indicator.xml
deleted file mode 100644
index 839532b..0000000
--- a/res/drawable/tab_indicator.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
- <item
- android:state_selected="true"
- android:state_focused="false"
- android:state_pressed="false"
- android:drawable="@drawable/minitab_selected"
- />
- <item
- android:state_selected="false"
- android:state_focused="false"
- android:state_pressed="false"
- android:drawable="@drawable/minitab_unselected"
- />
- <item
- android:state_focused="true"
- android:state_selected="true"
- android:state_pressed="false"
- android:drawable="@drawable/minitab_focus"
- />
- <item
- android:state_pressed="true"
- android:state_selected="true"
- android:state_focused="true"
- android:drawable="@drawable/minitab_press"
- />
-</selector>
diff --git a/res/drawable/usage_empty.png b/res/drawable/usage_empty.png
deleted file mode 100644
index 6a7e2db..0000000
--- a/res/drawable/usage_empty.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/usage_high.png b/res/drawable/usage_high.png
deleted file mode 100644
index 006e1ac..0000000
--- a/res/drawable/usage_high.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/usage_low.png b/res/drawable/usage_low.png
deleted file mode 100644
index 828ffb2..0000000
--- a/res/drawable/usage_low.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/usage_medium.png b/res/drawable/usage_medium.png
deleted file mode 100644
index dc37363..0000000
--- a/res/drawable/usage_medium.png
+++ /dev/null
Binary files differ
diff --git a/res/layout/tab_header.xml b/res/layout/tab_header.xml
deleted file mode 100644
index 7187034..0000000
--- a/res/layout/tab_header.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2009 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.
--->
-
-<FrameLayout
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="fill_parent"
- android:layout_height="wrap_content"
- android:background="@drawable/tab_indicator"
- >
- <TextView
- android:id="@+id/tab_label"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="?android:attr/textColorPrimary"
- android:layout_gravity="center"
- />
-</FrameLayout>
diff --git a/res/layout/website_settings_row.xml b/res/layout/website_settings_row.xml
index 911e1d6..4901ff1 100644
--- a/res/layout/website_settings_row.xml
+++ b/res/layout/website_settings_row.xml
@@ -22,8 +22,8 @@
android:padding="0dip">
<ImageView android:id="@+id/icon"
- android:layout_width="32px"
- android:layout_height="32px"
+ android:layout_width="32dip"
+ android:layout_height="32dip"
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_alignParentBottom="true"
@@ -40,13 +40,13 @@
android:layout_marginRight="2dip">
<ImageView android:id="@+id/location_icon"
- android:layout_width="32px"
- android:layout_height="32px"
+ android:layout_width="32dip"
+ android:layout_height="32dip"
android:padding="2dip" />
<ImageView android:id="@+id/usage_icon"
- android:layout_width="32px"
- android:layout_height="32px"
+ android:layout_width="32dip"
+ android:layout_height="32dip"
android:padding="2dip" />
</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 86468f1..3bb6ffd 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -677,7 +677,7 @@
<item>NY Times</item>
<item>http://www.nytimes.com/</item>
<item>ESPN</item>
- <item>http://espn.go.com/</item>
+ <item>http://espn.com/</item>
<item>Amazon</item>
<item>http://www.amazon.com/</item>
<item>Weather Channel</item>
diff --git a/src/com/android/browser/GeolocationPermissionsPrompt.java b/src/com/android/browser/GeolocationPermissionsPrompt.java
index 61005d5..a21bc3e 100755
--- a/src/com/android/browser/GeolocationPermissionsPrompt.java
+++ b/src/com/android/browser/GeolocationPermissionsPrompt.java
@@ -64,6 +64,8 @@
mCallback = callback;
Uri uri = Uri.parse(mOrigin);
setMessage("http".equals(uri.getScheme()) ? mOrigin.substring(7) : mOrigin);
+ // The checkbox should always be intially checked.
+ mRemember.setChecked(true);
showDialog(true);
}
diff --git a/src/com/android/browser/WebsiteSettingsActivity.java b/src/com/android/browser/WebsiteSettingsActivity.java
index 5260a25..645e084 100644
--- a/src/com/android/browser/WebsiteSettingsActivity.java
+++ b/src/com/android/browser/WebsiteSettingsActivity.java
@@ -158,9 +158,9 @@
private Bitmap mDefaultIcon;
private Bitmap mUsageEmptyIcon;
private Bitmap mUsageLowIcon;
- private Bitmap mUsageMediumIcon;
private Bitmap mUsageHighIcon;
- private Bitmap mLocationIcon;
+ private Bitmap mLocationAllowedIcon;
+ private Bitmap mLocationDisallowedIcon;
private Site mCurrentSite;
public SiteAdapter(Context context, int rsc) {
@@ -170,15 +170,15 @@
mDefaultIcon = BitmapFactory.decodeResource(getResources(),
R.drawable.ic_launcher_shortcut_browser_bookmark);
mUsageEmptyIcon = BitmapFactory.decodeResource(getResources(),
- R.drawable.usage_empty);
+ R.drawable.ic_list_data_off);
mUsageLowIcon = BitmapFactory.decodeResource(getResources(),
- R.drawable.usage_low);
- mUsageMediumIcon = BitmapFactory.decodeResource(getResources(),
- R.drawable.usage_medium);
+ R.drawable.ic_list_data_small);
mUsageHighIcon = BitmapFactory.decodeResource(getResources(),
- R.drawable.usage_high);
- mLocationIcon = BitmapFactory.decodeResource(getResources(),
- R.drawable.location);
+ R.drawable.ic_list_data_large);
+ mLocationAllowedIcon = BitmapFactory.decodeResource(getResources(),
+ R.drawable.ic_list_gps_on);
+ mLocationDisallowedIcon = BitmapFactory.decodeResource(getResources(),
+ R.drawable.ic_list_gps_denied);
askForOrigins();
}
@@ -358,16 +358,13 @@
// We set the correct icon:
// 0 < empty < 0.1MB
- // 0.1MB < low < 3MB
- // 3MB < medium < 6MB
- // 6MB < high
+ // 0.1MB < low < 5MB
+ // 5MB < high
if (usageInMegabytes <= 0.1) {
usageIcon.setImageBitmap(mUsageEmptyIcon);
- } else if (usageInMegabytes > 0.1 && usageInMegabytes <= 3) {
+ } else if (usageInMegabytes > 0.1 && usageInMegabytes <= 5) {
usageIcon.setImageBitmap(mUsageLowIcon);
- } else if (usageInMegabytes > 3 && usageInMegabytes <= 6) {
- usageIcon.setImageBitmap(mUsageMediumIcon);
- } else if (usageInMegabytes > 6) {
+ } else if (usageInMegabytes > 5) {
usageIcon.setImageBitmap(mUsageHighIcon);
}
}
@@ -378,7 +375,7 @@
final TextView subtitle;
ImageView icon;
final ImageView usageIcon;
- ImageView locationIcon;
+ final ImageView locationIcon;
if (convertView == null) {
view = mInflater.inflate(mResource, parent, false);
@@ -412,20 +409,30 @@
// so that we can get it in onItemClick()
view.setTag(site);
+ String origin = site.getOrigin();
if (site.hasFeature(Site.FEATURE_WEB_STORAGE)) {
- String origin = site.getOrigin();
- WebStorage.getInstance().getUsageForOrigin(origin, new ValueCallback<Long>() {
- public void onReceiveValue(Long value) {
- if (value != null) {
- setIconForUsage(usageIcon, value.longValue());
- }
- }
- });
+ WebStorage.getInstance().getUsageForOrigin(origin, new ValueCallback<Long>() {
+ public void onReceiveValue(Long value) {
+ if (value != null) {
+ setIconForUsage(usageIcon, value.longValue());
+ }
+ }
+ });
}
if (site.hasFeature(Site.FEATURE_GEOLOCATION)) {
- locationIcon.setVisibility(View.VISIBLE);
- locationIcon.setImageBitmap(mLocationIcon);
+ locationIcon.setVisibility(View.VISIBLE);
+ GeolocationPermissions.getInstance().getAllowed(origin, new ValueCallback<Boolean>() {
+ public void onReceiveValue(Boolean allowed) {
+ if (allowed != null) {
+ if (allowed.booleanValue()) {
+ locationIcon.setImageBitmap(mLocationAllowedIcon);
+ } else {
+ locationIcon.setImageBitmap(mLocationDisallowedIcon);
+ }
+ }
+ }
+ });
}
} else {
setTitle(mCurrentSite.getPrettyTitle());
