diff options
author | Nick Chalko <nchalko@google.com> | 2017-05-04 14:37:34 -0700 |
---|---|---|
committer | Nick Chalko <nchalko@google.com> | 2017-05-05 06:18:44 -0700 |
commit | 3dfa929b24f38ac7836450176d88ceab41dc6ac5 (patch) | |
tree | 675a324760c582713e2e0080775ea17357f75b65 /src/com/android/tv/dialog/SafeDismissDialogFragment.java | |
parent | fddf3fd148c1fc94c48ee5684e47dbb56512e758 (diff) | |
download | TV-3dfa929b24f38ac7836450176d88ceab41dc6ac5.tar.gz |
Sync to ub-tv-dev at f0024d79653da8c8999a91f995431a645a6ff4a2
Change-Id: I4199ec04cacb4a78be58b85302a39d917658dc28
Diffstat (limited to 'src/com/android/tv/dialog/SafeDismissDialogFragment.java')
-rw-r--r-- | src/com/android/tv/dialog/SafeDismissDialogFragment.java | 26 |
1 files changed, 0 insertions, 26 deletions
diff --git a/src/com/android/tv/dialog/SafeDismissDialogFragment.java b/src/com/android/tv/dialog/SafeDismissDialogFragment.java index f671a87d..e3390b0a 100644 --- a/src/com/android/tv/dialog/SafeDismissDialogFragment.java +++ b/src/com/android/tv/dialog/SafeDismissDialogFragment.java @@ -17,11 +17,7 @@ package com.android.tv.dialog; import android.app.Activity; -import android.app.Dialog; import android.app.DialogFragment; -import android.content.Context; -import android.os.Bundle; -import android.view.KeyEvent; import com.android.tv.MainActivity; import com.android.tv.TvApplication; @@ -39,11 +35,6 @@ public abstract class SafeDismissDialogFragment extends DialogFragment private Tracker mTracker; @Override - public Dialog onCreateDialog(Bundle savedInstanceState) { - return new TvDialog(getActivity(), getTheme()); - } - - @Override public void onAttach(Activity activity) { super.onAttach(activity); mAttached = true; @@ -92,21 +83,4 @@ public abstract class SafeDismissDialogFragment extends DialogFragment super.dismiss(); } } - - protected class TvDialog extends Dialog { - public TvDialog(Context context, int theme) { - super(context, theme); - } - - @Override - public boolean onKeyUp(int keyCode, KeyEvent event) { - // When a dialog is showing, key events are handled by the dialog instead of - // MainActivity. Therefore, unless a key is a global key, it should be handled here. - if (mAttached && keyCode == KeyEvent.KEYCODE_SEARCH && mActivity != null) { - mActivity.showSearchActivity(); - return true; - } - return super.onKeyUp(keyCode, event); - } - } } |