Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 19:35:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 887051 - Fix gamepad action key behavior in AwesomeScreen. r=kats

Browse Source
This commit is contained in:
Brian Nicholson 2013-06-26 16:42:49 -07:00
parent b3422100d6
commit 0d693e50c5
4 changed files with 3 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mobile/android/base/AwesomeBar.java
View File

@ -195,7 +195,7 @@ public class AwesomeBar extends GeckoActivity
mText.setOnKeyListener(new View.OnKeyListener() {
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) {
if (keyCode == KeyEvent.KEYCODE_ENTER || GamepadUtils.isActionKey(event)) {
if (keyCode == KeyEvent.KEYCODE_ENTER) {
if (event.getAction() != KeyEvent.ACTION_DOWN)
return true;
@ -463,7 +463,8 @@ public class AwesomeBar extends GeckoActivity
keyCode == KeyEvent.KEYCODE_DPAD_CENTER ||
keyCode == KeyEvent.KEYCODE_DEL ||
keyCode == KeyEvent.KEYCODE_VOLUME_UP ||
keyCode == KeyEvent.KEYCODE_VOLUME_DOWN) {
keyCode == KeyEvent.KEYCODE_VOLUME_DOWN ||
GamepadUtils.isActionKey(event)) {
return super.onKeyDown(keyCode, event);
} else if (keyCode == KeyEvent.KEYCODE_SEARCH) {
mText.setText("");

1
mobile/android/base/awesomebar/AllPagesTab.java
View File

@ -139,7 +139,6 @@ public class AllPagesTab extends AwesomeBarTab implements GeckoEventListener {
handleItemClick(parent, view, position, id);
}
});
list.setOnKeyListener(GamepadUtils.getListItemClickDispatcher());
AwesomeBarCursorAdapter adapter = getCursorAdapter();
list.setAdapter(adapter);

1
mobile/android/base/awesomebar/BookmarksTab.java
View File

@ -76,7 +76,6 @@ public class BookmarksTab extends AwesomeBarTab {
handleItemClick(parent, view, position, id);
}
});
list.setOnKeyListener(GamepadUtils.getListItemClickDispatcher());
if (mShowReadingList) {
String title = getResources().getString(R.string.bookmarks_folder_reading_list);

21
mobile/android/base/util/GamepadUtils.java
View File

@ -18,7 +18,6 @@ public final class GamepadUtils {
private static final int SONY_XPERIA_GAMEPAD_DEVICE_ID = 196611;
private static View.OnKeyListener sClickDispatcher;
private static View.OnKeyListener sListItemClickDispatcher;
private GamepadUtils() {
}
@ -81,26 +80,6 @@ public final class GamepadUtils {
return sClickDispatcher;
}
public static View.OnKeyListener getListItemClickDispatcher() {
if (sListItemClickDispatcher == null) {
sListItemClickDispatcher = new View.OnKeyListener() {
@Override
public boolean onKey(View v, int keyCode, KeyEvent event) {
if (isActionKeyDown(event) && (v instanceof ListView)) {
ListView view = (ListView)v;
AdapterView.OnItemClickListener listener = view.getOnItemClickListener();
if (listener != null) {
listener.onItemClick(view, view.getSelectedView(), view.getSelectedItemPosition(), view.getSelectedItemId());
return true;
}
}
return false;
}
};
}
return sListItemClickDispatcher;
}
public static KeyEvent translateSonyXperiaGamepadKeys(int keyCode, KeyEvent event) {
// The cross and circle button mappings may be swapped in the different regions so
// determine if they are swapped so the proper key codes can be mapped to the keys