зеркало из https://github.com/mozilla/gecko-dev.git
Bug 710433 - The bookmark menu item should always say 'Bookmark', not 'Remove' [r=mbrubeck]
This commit is contained in:
Родитель
50284c67e1
Коммит
f89cd96685
|
@ -454,11 +454,9 @@ abstract public class GeckoApp
|
||||||
if (tab.isBookmark()) {
|
if (tab.isBookmark()) {
|
||||||
bookmark.setChecked(true);
|
bookmark.setChecked(true);
|
||||||
bookmark.setIcon(R.drawable.ic_menu_bookmark_remove);
|
bookmark.setIcon(R.drawable.ic_menu_bookmark_remove);
|
||||||
bookmark.setTitle(R.string.bookmark_remove);
|
|
||||||
} else {
|
} else {
|
||||||
bookmark.setChecked(false);
|
bookmark.setChecked(false);
|
||||||
bookmark.setIcon(R.drawable.ic_menu_bookmark_add);
|
bookmark.setIcon(R.drawable.ic_menu_bookmark_add);
|
||||||
bookmark.setTitle(R.string.bookmark_add);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
forward.setEnabled(tab.canDoForward());
|
forward.setEnabled(tab.canDoForward());
|
||||||
|
@ -503,12 +501,10 @@ abstract public class GeckoApp
|
||||||
tab.removeBookmark();
|
tab.removeBookmark();
|
||||||
Toast.makeText(this, R.string.bookmark_removed, Toast.LENGTH_SHORT).show();
|
Toast.makeText(this, R.string.bookmark_removed, Toast.LENGTH_SHORT).show();
|
||||||
item.setIcon(R.drawable.ic_menu_bookmark_add);
|
item.setIcon(R.drawable.ic_menu_bookmark_add);
|
||||||
item.setTitle(R.string.bookmark_add);
|
|
||||||
} else {
|
} else {
|
||||||
tab.addBookmark();
|
tab.addBookmark();
|
||||||
Toast.makeText(this, R.string.bookmark_added, Toast.LENGTH_SHORT).show();
|
Toast.makeText(this, R.string.bookmark_added, Toast.LENGTH_SHORT).show();
|
||||||
item.setIcon(R.drawable.ic_menu_bookmark_remove);
|
item.setIcon(R.drawable.ic_menu_bookmark_remove);
|
||||||
item.setTitle(R.string.bookmark_remove);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
|
|
@ -27,9 +27,7 @@
|
||||||
|
|
||||||
<!ENTITY awesomebar_default_text "Enter Search or Address">
|
<!ENTITY awesomebar_default_text "Enter Search or Address">
|
||||||
|
|
||||||
<!ENTITY bookmarks_title "Bookmarks">
|
<!ENTITY bookmark "Bookmark">
|
||||||
<!ENTITY bookmark_add "Bookmark">
|
|
||||||
<!ENTITY bookmark_remove "Remove">
|
|
||||||
<!ENTITY bookmark_added "Bookmark added">
|
<!ENTITY bookmark_added "Bookmark added">
|
||||||
<!ENTITY bookmark_removed "Bookmark removed">
|
<!ENTITY bookmark_removed "Bookmark removed">
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
|
|
||||||
<item android:id="@+id/bookmark"
|
<item android:id="@+id/bookmark"
|
||||||
android:icon="@drawable/ic_menu_bookmark_add"
|
android:icon="@drawable/ic_menu_bookmark_add"
|
||||||
android:title="@string/bookmark_add"/>
|
android:title="@string/bookmark"/>
|
||||||
|
|
||||||
<item android:id="@+id/share"
|
<item android:id="@+id/share"
|
||||||
android:icon="@drawable/ic_menu_share"
|
android:icon="@drawable/ic_menu_share"
|
||||||
|
|
|
@ -35,9 +35,7 @@
|
||||||
<string name="awesomebar_default_text">&awesomebar_default_text;</string>
|
<string name="awesomebar_default_text">&awesomebar_default_text;</string>
|
||||||
|
|
||||||
<string name="quit">&quit;</string>
|
<string name="quit">&quit;</string>
|
||||||
<string name="bookmarks_title">&bookmarks_title;</string>
|
<string name="bookmark">&bookmark;</string>
|
||||||
<string name="bookmark_add">&bookmark_add;</string>
|
|
||||||
<string name="bookmark_remove">&bookmark_remove;</string>
|
|
||||||
<string name="bookmark_added">&bookmark_added;</string>
|
<string name="bookmark_added">&bookmark_added;</string>
|
||||||
<string name="bookmark_removed">&bookmark_removed;</string>
|
<string name="bookmark_removed">&bookmark_removed;</string>
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче