Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Do not update matches string when there are no matches." into honeycomb

Browse Source
This commit is contained in:
Leon Scroggins
2011-01-07 13:17:19 -08:00
committed by Android (Google) Code Review
parent 48d5f1f681 73254be0dd
commit 2358623917
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
core/java/android/webkit/FindActionModeCallback.java
View File

@@ -143,6 +143,7 @@ class FindActionModeCallback implements ActionMode.Callback, TextWatcher,
/* /*
* Update the string which tells the user how many matches were found, and * Update the string which tells the user how many matches were found, and
* which match is currently highlighted. * which match is currently highlighted.
* Not to be called when mNumberOfMatches is 0.
*/ */
private void updateMatchesString() { private void updateMatchesString() {
String template = mResources.getQuantityString( String template = mResources.getQuantityString(
@@ -196,6 +197,11 @@ class FindActionModeCallback implements ActionMode.Callback, TextWatcher,
findAll(); findAll();
return true; return true;
} }
if (0 == mNumberOfMatches) {
// There are no matches, so moving to the next match will not do
// anything.
return true;
}
switch(item.getItemId()) { switch(item.getItemId()) {
case com.android.internal.R.id.find_prev: case com.android.internal.R.id.find_prev:
findNext(false); findNext(false);