mirror of
https://gitlab.winehq.org/wine/wine-gecko.git
synced 2024-09-13 09:24:08 -07:00
Bug 695307 - Factor our method to open URL and close awesome bar (r=mfinkle)
This commit is contained in:
parent
f9db88cf70
commit
ae52926b92
@ -76,12 +76,7 @@ public class AwesomeBar extends Activity {
|
||||
mAwesomeTabs = (AwesomeBarTabs) findViewById(R.id.awesomebar_tabs);
|
||||
mAwesomeTabs.setOnUrlOpenListener(new AwesomeBarTabs.OnUrlOpenListener() {
|
||||
public void onUrlOpen(AwesomeBarTabs tabs, String url) {
|
||||
Intent resultIntent = new Intent();
|
||||
resultIntent.putExtra(URL_KEY, url);
|
||||
resultIntent.putExtra(TYPE_KEY, mType);
|
||||
|
||||
setResult(Activity.RESULT_OK, resultIntent);
|
||||
finish();
|
||||
openUrlAndFinish(url);
|
||||
}
|
||||
});
|
||||
|
||||
@ -117,11 +112,7 @@ public class AwesomeBar extends Activity {
|
||||
if (event.getAction() != KeyEvent.ACTION_DOWN)
|
||||
return true;
|
||||
|
||||
Intent resultIntent = new Intent();
|
||||
resultIntent.putExtra(URL_KEY, text.getText().toString());
|
||||
resultIntent.putExtra(TYPE_KEY, mType);
|
||||
setResult(Activity.RESULT_OK, resultIntent);
|
||||
finish();
|
||||
openUrlAndFinish(text.getText().toString());
|
||||
return true;
|
||||
} else {
|
||||
return false;
|
||||
@ -130,6 +121,15 @@ public class AwesomeBar extends Activity {
|
||||
});
|
||||
}
|
||||
|
||||
private void openUrlAndFinish(String url) {
|
||||
Intent resultIntent = new Intent();
|
||||
resultIntent.putExtra(URL_KEY, url);
|
||||
resultIntent.putExtra(TYPE_KEY, mType);
|
||||
|
||||
setResult(Activity.RESULT_OK, resultIntent);
|
||||
finish();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDestroy() {
|
||||
super.onDestroy();
|
||||
|
Loading…
Reference in New Issue
Block a user