diff --git a/mobile/android/base/AboutHomeContent.java b/mobile/android/base/AboutHomeContent.java index 37655e4343b..c5f428ca630 100644 --- a/mobile/android/base/AboutHomeContent.java +++ b/mobile/android/base/AboutHomeContent.java @@ -192,7 +192,6 @@ public class AboutHomeContent extends ScrollView // If nothing is pinned at all, hide both clear items TopSitesCursorWrapper cursor = (TopSitesCursorWrapper)mTopSitesAdapter.getCursor(); if (!cursor.hasPinnedSites()) { - menu.findItem(R.id.abouthome_topsites_unpinall).setVisible(false); menu.findItem(R.id.abouthome_topsites_unpin).setVisible(false); } else { PinnedSite site = cursor.getPinnedSite(info.position); @@ -944,32 +943,6 @@ public class AboutHomeContent extends ScrollView holder.thumbnailView.setScaleType(ImageView.ScaleType.FIT_CENTER); } - public void unpinAllSites() { - final ContentResolver resolver = mActivity.getContentResolver(); - - // Clear the view quickly to make things appear responsive - for (int i = 0; i < mTopSitesGrid.getChildCount(); i++) { - View v = mTopSitesGrid.getChildAt(i); - TopSitesViewHolder holder = (TopSitesViewHolder) v.getTag(); - clearThumbnail(holder); - holder.setPinned(false); - } - - (new GeckoAsyncTask(GeckoApp.mAppContext, GeckoAppShell.getHandler()) { - @Override - public Void doInBackground(Void... params) { - ContentResolver resolver = mActivity.getContentResolver(); - BrowserDB.unpinAllSites(resolver); - return null; - } - - @Override - public void onPostExecute(Void v) { - update(EnumSet.of(UpdateFlags.TOP_SITES)); - } - }).execute(); - } - public void unpinSite() { final int position = mTopSitesGrid.getSelectedPosition(); View v = mTopSitesGrid.getChildAt(position); diff --git a/mobile/android/base/BrowserApp.java b/mobile/android/base/BrowserApp.java index 12c92d20126..dfcfa36e8c1 100644 --- a/mobile/android/base/BrowserApp.java +++ b/mobile/android/base/BrowserApp.java @@ -1040,10 +1040,6 @@ abstract public class BrowserApp extends GeckoApp mAboutHomeContent.unpinSite(); return true; - case R.id.abouthome_topsites_unpinall: - mAboutHomeContent.unpinAllSites(); - return true; - case R.id.abouthome_topsites_pin: mAboutHomeContent.pinSite(); return true; diff --git a/mobile/android/base/locales/en-US/android_strings.dtd b/mobile/android/base/locales/en-US/android_strings.dtd index c0f55c96d64..d7383168b40 100644 --- a/mobile/android/base/locales/en-US/android_strings.dtd +++ b/mobile/android/base/locales/en-US/android_strings.dtd @@ -203,7 +203,7 @@ size. --> - +