sum7/Conversations
sum7
/
Conversations
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #344 from 1nsan3/development 

Hardware search button
This commit is contained in:
Daniel Gultsch 2014-08-11 12:52:03 +02:00
parent b35aa3ed07 70423204f4
commit 9960cb819e
1 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/eu/siacs/conversations/ui/StartConversationActivity.java
View File

@ -21,6 +21,7 @@ import android.text.Editable;
import android.text.TextWatcher; import android.text.TextWatcher;
import android.view.ContextMenu; import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo; import android.view.ContextMenu.ContextMenuInfo;
import android.view.KeyEvent;
import android.view.Menu; import android.view.Menu;
import android.view.MenuItem; import android.view.MenuItem;
import android.view.View; import android.view.View;
@ -63,6 +64,7 @@ public class StartConversationActivity extends XmppActivity {
private List<String> mKnownHosts; private List<String> mKnownHosts;
private List<String> mKnownConferenceHosts; private List<String> mKnownConferenceHosts;
private Menu mOptionsMenu;
private EditText mSearchEditText; private EditText mSearchEditText;
public int conference_context_id; public int conference_context_id;
@ -432,6 +434,7 @@ public class StartConversationActivity extends XmppActivity {
@Override @Override
public boolean onCreateOptionsMenu(Menu menu) { public boolean onCreateOptionsMenu(Menu menu) {
this.mOptionsMenu = menu;
getMenuInflater().inflate(R.menu.start_conversation, menu); getMenuInflater().inflate(R.menu.start_conversation, menu);
MenuItem menuCreateContact = (MenuItem) menu MenuItem menuCreateContact = (MenuItem) menu
.findItem(R.id.action_create_contact); .findItem(R.id.action_create_contact);
@ -463,6 +466,17 @@ public class StartConversationActivity extends XmppActivity {
} }
return super.onOptionsItemSelected(item); return super.onOptionsItemSelected(item);
} }
@Override
public boolean onKeyUp(int keyCode, KeyEvent event)
{
if(keyCode == KeyEvent.KEYCODE_SEARCH && !event.isLongPress())
{
mOptionsMenu.findItem(R.id.action_search).expandActionView();
return true;
}
return super.onKeyUp(keyCode, event);
}
@Override @Override
void onBackendConnected() { void onBackendConnected() {