Remove unused and duplicate strings
Change-Id: I7e1a3120e66ca8bc3adab65499663fecb5b041a3
diff --git a/src/com/android/browser/AddBookmarkPage.java b/src/com/android/browser/AddBookmarkPage.java
index a73625d..860e00a 100644
--- a/src/com/android/browser/AddBookmarkPage.java
+++ b/src/com/android/browser/AddBookmarkPage.java
@@ -1008,7 +1008,7 @@
}
new AlertDialog.Builder(this)
- .setTitle(getString(R.string.save_to_bookmarks_title))
+ .setTitle(getString(R.string.save_to_bookmarks))
.setMessage(getString(R.string.overwrite_bookmark_msg))
.setNegativeButton(android.R.string.cancel, null)
.setPositiveButton(android.R.string.ok, new DialogInterface.OnClickListener() {
diff --git a/src/com/android/browser/BrowserYesNoPreference.java b/src/com/android/browser/BrowserYesNoPreference.java
index 289ddf3..37e8431 100644
--- a/src/com/android/browser/BrowserYesNoPreference.java
+++ b/src/com/android/browser/BrowserYesNoPreference.java
@@ -113,7 +113,7 @@
}
if (mPrefs.getBoolean(PreferenceKeys.PREF_PRIVACY_CLEAR_HISTORY, false)) {
dialogMessage = dialogMessage.concat("\n\t" +
- mContext.getString(R.string.pref_privacy_clear_history));
+ mContext.getString(R.string.history));
itemSelected = true;
}
if (mPrefs.getBoolean(PreferenceKeys.PREF_PRIVACY_CLEAR_FORM_DATA, false)) {
diff --git a/src/com/android/browser/ComboView.java b/src/com/android/browser/ComboView.java
index 3dabb50..8d64ac9 100644
--- a/src/com/android/browser/ComboView.java
+++ b/src/com/android/browser/ComboView.java
@@ -157,9 +157,9 @@
if (mTabsAdapter == null) {
mExtraArgs = args;
mTabsAdapter = new ComboTabsAdapter(activity, mViewPager);
- mTabsAdapter.addTab(bar.newTab().setText(R.string.tab_bookmarks),
+ mTabsAdapter.addTab(bar.newTab().setText(R.string.bookmarks),
BrowserBookmarksPage.class, args);
- mTabsAdapter.addTab(bar.newTab().setText(R.string.tab_history),
+ mTabsAdapter.addTab(bar.newTab().setText(R.string.history),
BrowserHistoryPage.class, args);
mTabsAdapter.addTab(bar.newTab().setText(R.string.tab_snapshots),
BrowserSnapshotPage.class, args);
diff --git a/src/com/android/browser/ComboViewActivity.java b/src/com/android/browser/ComboViewActivity.java
index 4e672ca..4731451 100644
--- a/src/com/android/browser/ComboViewActivity.java
+++ b/src/com/android/browser/ComboViewActivity.java
@@ -63,9 +63,9 @@
}
mTabsAdapter = new ComboTabsAdapter(this, mViewPager);
- mTabsAdapter.addTab(bar.newTab().setText(R.string.tab_bookmarks),
+ mTabsAdapter.addTab(bar.newTab().setText(R.string.bookmarks),
BrowserBookmarksPage.class, args);
- mTabsAdapter.addTab(bar.newTab().setText(R.string.tab_history),
+ mTabsAdapter.addTab(bar.newTab().setText(R.string.history),
BrowserHistoryPage.class, args);
mTabsAdapter.addTab(bar.newTab().setText(R.string.tab_snapshots),
BrowserSnapshotPage.class, args);
diff --git a/src/com/android/browser/Controller.java b/src/com/android/browser/Controller.java
index ff902e8..230e49f 100644
--- a/src/com/android/browser/Controller.java
+++ b/src/com/android/browser/Controller.java
@@ -937,7 +937,7 @@
this.getContext().startActivity(intent);
} catch (Exception e) {
String err_msg = this.getContext().getString(
- R.string.acivity_not_found, wifiSelection);
+ R.string.activity_not_found, wifiSelection);
Toast.makeText(this.getContext(), err_msg, Toast.LENGTH_LONG).show();
}
}
@@ -2250,7 +2250,7 @@
.addCategory(Intent.CATEGORY_HOME));
}})
.setNegativeButton(getContext().getResources().getString(
- R.string.import_bookmarks_wizard_cancel), new DialogInterface.OnClickListener() {
+ R.string.cancel), new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int whichButton) {
// Do nothing.
}
diff --git a/src/com/android/browser/addbookmark/FolderSpinnerAdapter.java b/src/com/android/browser/addbookmark/FolderSpinnerAdapter.java
index c7d24f7..2321002 100644
--- a/src/com/android/browser/addbookmark/FolderSpinnerAdapter.java
+++ b/src/com/android/browser/addbookmark/FolderSpinnerAdapter.java
@@ -72,7 +72,7 @@
drawableResource = R.drawable.ic_deco_home_normal;
break;
case ROOT_FOLDER:
- labelResource = R.string.add_to_bookmarks_menu_option;
+ labelResource = R.string.bookmarks;
drawableResource = R.drawable.ic_deco_bookmarks_normal;
break;
case RECENT_FOLDER:
diff --git a/src/com/android/browser/preferences/SiteSpecificPreferencesFragment.java b/src/com/android/browser/preferences/SiteSpecificPreferencesFragment.java
index 1a764a9..b5762a5 100644
--- a/src/com/android/browser/preferences/SiteSpecificPreferencesFragment.java
+++ b/src/com/android/browser/preferences/SiteSpecificPreferencesFragment.java
@@ -612,7 +612,7 @@
new AlertDialog.Builder(getActivity())
.setMessage(R.string.pref_extras_reset_default_dlg)
.setPositiveButton(
- R.string.website_settings_clear_all_dialog_ok_button,
+ R.string.ok,
new AlertDialog.OnClickListener() {
public void onClick(DialogInterface dlg, int which) {
if (mOriginInfo != null) {
@@ -633,7 +633,7 @@
}
})
.setNegativeButton(
- R.string.website_settings_clear_all_dialog_cancel_button, null)
+ R.string.cancel, null)
.setIconAttribute(android.R.attr.alertDialogIcon)
.show();
}
@@ -752,7 +752,7 @@
if (pref.getKey().toString().equalsIgnoreCase("clear_data")) {
new AlertDialog.Builder(getActivity())
.setMessage(R.string.website_settings_clear_all_dialog_message)
- .setPositiveButton(R.string.website_settings_clear_all_dialog_ok_button,
+ .setPositiveButton(R.string.ok,
new AlertDialog.OnClickListener() {
public void onClick(DialogInterface dlg, int which) {
if (mOriginInfo != null) {
@@ -762,7 +762,7 @@
}
}
})
- .setNegativeButton(R.string.website_settings_clear_all_dialog_cancel_button, null)
+ .setNegativeButton(R.string.cancel, null)
.setIconAttribute(android.R.attr.alertDialogIcon)
.show();
}
diff --git a/src/com/android/browser/preferences/WebsiteSettingsFragment.java b/src/com/android/browser/preferences/WebsiteSettingsFragment.java
index 3f0215b..2b5c9eb 100644
--- a/src/com/android/browser/preferences/WebsiteSettingsFragment.java
+++ b/src/com/android/browser/preferences/WebsiteSettingsFragment.java
@@ -316,7 +316,7 @@
// Show the prompt to clear all origins of their data and geolocation permissions.
new AlertDialog.Builder(getActivity())
.setMessage(R.string.website_settings_clear_all_dialog_message)
- .setPositiveButton(R.string.website_settings_clear_all_dialog_ok_button,
+ .setPositiveButton(R.string.ok,
new AlertDialog.OnClickListener() {
public void onClick(DialogInterface dlg, int which) {
mAdapter.deleteAllOrigins();
@@ -328,7 +328,7 @@
finish();
}
})
- .setNegativeButton(R.string.website_settings_clear_all_dialog_cancel_button, null)
+ .setNegativeButton(R.string.cancel, null)
.setIconAttribute(android.R.attr.alertDialogIcon)
.show();
break;
@@ -355,7 +355,7 @@
fragmentTransaction.addToBackStack(null);
fragmentTransaction.commit();
}})
- .setNegativeButton(R.string.pref_security_cancel, null)
+ .setNegativeButton(R.string.cancel, null)
.show();
break;