Prep tree for forward-porting Goanna, stage 1

This commit is contained in:
wolfbeast
2016-03-23 10:12:30 +01:00
committed by roytam1
parent 5d59e0437f
commit 5ee6187aad
1539 changed files with 7733 additions and 7733 deletions
@@ -136,8 +136,8 @@ public class SearchEnginePreference extends CustomListPreference {
}
/**
* Configure this Preference object from the Gecko search engine JSON object.
* @param geckoEngineJSON The Gecko-formatted JSON object representing the search engine.
* Configure this Preference object from the Goanna search engine JSON object.
* @param geckoEngineJSON The Goanna-formatted JSON object representing the search engine.
* @throws JSONException If the JSONObject is invalid.
*/
public void setSearchEngineFromJSON(JSONObject geckoEngineJSON) throws JSONException {
@@ -161,7 +161,7 @@ public class SearchEnginePreference extends CustomListPreference {
desiredWidth = mFaviconView.getWidth();
} else {
// largestFaviconSize is initialized when Favicons is attached to a
// context, which occurs during GeckoApp.onCreate. That might not
// context, which occurs during GoannaApp.onCreate. That might not
// ever happen (leaving it at 0), so we fall back.
if (Favicons.largestFaviconSize == 0) {
desiredWidth = 128;