зеркало из https://github.com/mozilla/gecko-dev.git
Bug 871522 - Encapsulate isEditing assignment into a setter (r=sriram)
This commit is contained in:
Родитель
6820df2d6b
Коммит
f08db5ad3d
|
@ -219,7 +219,7 @@ public class BrowserToolbar extends GeckoRelativeLayout
|
||||||
Tabs.registerOnTabsChangedListener(this);
|
Tabs.registerOnTabsChangedListener(this);
|
||||||
mSwitchingTabs = true;
|
mSwitchingTabs = true;
|
||||||
|
|
||||||
mIsEditing = false;
|
setIsEditing(false);
|
||||||
mAnimatingEntry = false;
|
mAnimatingEntry = false;
|
||||||
mShowUrl = false;
|
mShowUrl = false;
|
||||||
mTrimURLs = true;
|
mTrimURLs = true;
|
||||||
|
@ -1346,6 +1346,10 @@ public class BrowserToolbar extends GeckoRelativeLayout
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public void setIsEditing(boolean isEditing) {
|
||||||
|
mIsEditing = isEditing;
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Returns whether or not the URL bar is in editing mode (url bar is expanded, hiding the new
|
* Returns whether or not the URL bar is in editing mode (url bar is expanded, hiding the new
|
||||||
* tab button). Note that selection state is independent of editing mode.
|
* tab button). Note that selection state is independent of editing mode.
|
||||||
|
@ -1360,7 +1364,7 @@ public class BrowserToolbar extends GeckoRelativeLayout
|
||||||
}
|
}
|
||||||
|
|
||||||
mUrlEditText.setText(url != null ? url : "");
|
mUrlEditText.setText(url != null ? url : "");
|
||||||
mIsEditing = true;
|
setIsEditing(true);
|
||||||
|
|
||||||
updateChildrenForEditing();
|
updateChildrenForEditing();
|
||||||
|
|
||||||
|
@ -1478,7 +1482,7 @@ public class BrowserToolbar extends GeckoRelativeLayout
|
||||||
if (!isEditing()) {
|
if (!isEditing()) {
|
||||||
return url;
|
return url;
|
||||||
}
|
}
|
||||||
mIsEditing = false;
|
setIsEditing(false);
|
||||||
|
|
||||||
updateChildrenForEditing();
|
updateChildrenForEditing();
|
||||||
|
|
||||||
|
|
Загрузка…
Ссылка в новой задаче