diff options
| author | Youngsang Cho <youngsang@google.com> | 2014-07-30 11:15:18 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-24 16:04:26 +0000 |
| commit | 992c52901be421eeb67728d9db2ad613c8db445d (patch) | |
| tree | 1ee52af44fcfe100987272a743476f38a1df4a76 /src | |
| parent | c91a6ff8aca631d682764bc7a771cc79fbd41c75 (diff) | |
| parent | 260a255dc20bac67939564b8f2b07a8ef8fa8b21 (diff) | |
| download | TV-992c52901be421eeb67728d9db2ad613c8db445d.tar.gz | |
Merge "Make keys consumed in TV app UI if TV app has any focusable view" into lmp-dev
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(); |