diff options
| author | Youngsang Cho <youngsang@google.com> | 2014-07-22 13:55:26 -0700 |
|---|---|---|
| committer | Youngsang Cho <youngsang@google.com> | 2014-07-30 20:10:23 +0900 |
| commit | 260a255dc20bac67939564b8f2b07a8ef8fa8b21 (patch) | |
| tree | ec878716b0171402a4bb677ad8b491d9a527f72f /src | |
| parent | d82ca62a0fefaed41493540df7d622cfcfb2cb6c (diff) | |
| download | TV-260a255dc20bac67939564b8f2b07a8ef8fa8b21.tar.gz | |
Make keys consumed in TV app UI if TV app has any focusable view
Bug: 16486336
Change-Id: I48981b0d6d5998aaa33c66fe9e4827ad97287052
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/tv/TvActivity.java | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/com/android/tv/TvActivity.java b/src/com/android/tv/TvActivity.java index a27942b4..c4ee5333 100644 --- a/src/com/android/tv/TvActivity.java +++ b/src/com/android/tv/TvActivity.java @@ -124,6 +124,7 @@ public class TvActivity extends Activity implements AudioManager.OnAudioFocusCha private static final HashSet<String> AVAILABLE_DIALOG_TAGS = new HashSet<String>(); + private View mContentView; private TunableTvView mTvView; private LinearLayout mControlGuide; private MainMenuView mMainMenuView; @@ -190,6 +191,7 @@ public class TvActivity extends Activity implements AudioManager.OnAudioFocusCha super.onCreate(savedInstanceState); setContentView(R.layout.activity_tv); + mContentView = findViewById(android.R.id.content); mTvView = (TunableTvView) findViewById(R.id.main_tv_view); mTvView.setOnUnhandledInputEventListener(new OnUnhandledInputEventListener() { @Override @@ -716,8 +718,7 @@ public class TvActivity extends Activity implements AudioManager.OnAudioFocusCha @Override public boolean dispatchKeyEvent(KeyEvent event) { if (DEBUG) Log.d(TAG, "dispatchKeyEvent(" + event + ")"); - if (mMainMenuView.isShown() || mKeypadView.wantKeys() - || getFragmentManager().getBackStackEntryCount() > 0) { + if (mContentView.hasFocusable() || getFragmentManager().getBackStackEntryCount() > 0) { return super.dispatchKeyEvent(event); } int eventKeyCode = event.getKeyCode(); |