auto import from //branches/cupcake/...@132276
diff --git a/src/com/android/browser/GearsBaseDialog.java b/src/com/android/browser/GearsBaseDialog.java
index 3379537..638ba27 100644
--- a/src/com/android/browser/GearsBaseDialog.java
+++ b/src/com/android/browser/GearsBaseDialog.java
@@ -68,6 +68,7 @@
public static final int UPDATE_ICON = 5;
public static final int REQUEST_ICON = 6;
public static final int PAUSE_REQUEST_ICON = 7;
+ public static final int CLEAR_REQUEST_ICON = 8;
protected final String LOCAL_DATA_STRING = "localData";
protected final String LOCAL_STORAGE_STRING = "localStorage";
@@ -256,7 +257,12 @@
if (rsc == 0) {
return;
}
- View view = v.findViewById(rsc);
+ View view;
+ if (v == null) {
+ view = findViewById(rsc);
+ } else {
+ view = v.findViewById(rsc);
+ }
if (view != null) {
view.setVisibility(View.GONE);
}
@@ -269,7 +275,12 @@
if (rsc == 0) {
return;
}
- View view = v.findViewById(rsc);
+ View view;
+ if (v == null) {
+ view = findViewById(rsc);
+ } else {
+ view = v.findViewById(rsc);
+ }
if (view != null) {
view.setVisibility(View.VISIBLE);
}