am 4abbaab3: am 9e19e44f: Remove the "clear all" menu option when you are in the website settings activity and are looking at the settings for a specific site rather than the overview of all sites.
Merge commit '4abbaab374eba11c08512d3d91ab02fd28d46ea8'
* commit '4abbaab374eba11c08512d3d91ab02fd28d46ea8':
Remove the "clear all" menu option when you are in the website settings activity and are looking at the settings for a specific site rather than the overview of all sites.
diff --git a/src/com/android/browser/WebsiteSettingsActivity.java b/src/com/android/browser/WebsiteSettingsActivity.java
index 645e084..7166b16 100644
--- a/src/com/android/browser/WebsiteSettingsActivity.java
+++ b/src/com/android/browser/WebsiteSettingsActivity.java
@@ -512,6 +512,10 @@
notifyDataSetChanged();
}
}
+
+ public Site currentSite() {
+ return mCurrentSite;
+ }
}
/**
@@ -548,8 +552,9 @@
@Override
public boolean onPrepareOptionsMenu(Menu menu) {
- // If we aren't listing any sites hide the clear all button (and hence the menu).
- return mAdapter.getCount() > 0;
+ // If we are not on the sites list (rather on the page for a specific site) or
+ // we aren't listing any sites hide the clear all button (and hence the menu).
+ return mAdapter.currentSite() == null && mAdapter.getCount() > 0;
}
@Override