wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 971900 - onLocaleReady incorrectly elides onConfigurationChange call if urlBar doesn't exist. r=nalexander

Browse Source
This commit is contained in:
Richard Newman 2014-04-15 17:55:58 -07:00
parent 789c6639b5
commit 5c760c4c93
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mobile/android/base/GeckoApp.java
View File

@ -1394,6 +1394,13 @@ public abstract class GeckoApp
* aware of the locale.
*
* Now we can display strings!
*
* You can think of this as being something like a second phase of onCreate,
* where you can do string-related operations. Use this in place of embedding
* strings in view XML.
*
* By contrast, onConfigurationChanged does some locale operations, but is in
* response to device changes.
*/
@Override
public void onLocaleReady(final String locale) {
@ -1403,11 +1410,12 @@ public abstract class GeckoApp
// The URL bar hint needs to be populated.
TextView urlBar = (TextView) findViewById(R.id.url_bar_title);
if (urlBar == null) {
return;
if (urlBar != null) {
final String hint = getResources().getString(R.string.url_bar_default_text);
urlBar.setHint(hint);
} else {
Log.d(LOGTAG, "No URL bar in GeckoApp. Not loading localized hint string.");
}
final String hint = getResources().getString(R.string.url_bar_default_text);
urlBar.setHint(hint);
// Allow onConfigurationChanged to take care of the rest.
onConfigurationChanged(getResources().getConfiguration());