diff options
author | Youngsang Cho <youngsang@google.com> | 2014-07-18 18:42:45 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-17 17:59:02 +0000 |
commit | 8a42f112a32ea266bef4fd5b3f0515c36bf6d76c (patch) | |
tree | 9adb79840ab789fed98dc64126913b43a8ff64d2 /src | |
parent | e08dee8c8613aa52183d710dbcda28acd3dfa5c8 (diff) | |
parent | 3744981a3393d7400153a519e7ed87e9db2362eb (diff) | |
download | TV-8a42f112a32ea266bef4fd5b3f0515c36bf6d76c.tar.gz |
Merge "Apply name change in TvInputManager.TvInputCallback" into lmp-dev
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/tv/util/TvInputManagerHelper.java | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/src/com/android/tv/util/TvInputManagerHelper.java b/src/com/android/tv/util/TvInputManagerHelper.java index 6e152970..4a8f4a13 100644 --- a/src/com/android/tv/util/TvInputManagerHelper.java +++ b/src/com/android/tv/util/TvInputManagerHelper.java @@ -18,7 +18,7 @@ package com.android.tv.util; import android.media.tv.TvInputInfo; import android.media.tv.TvInputManager; -import android.media.tv.TvInputManager.TvInputListener; +import android.media.tv.TvInputManager.TvInputCallback; import android.os.Handler; import android.util.Log; @@ -41,19 +41,19 @@ public class TvInputManagerHelper { new HashMap<String, Integer>(); private final Map<String, TvInputInfo> mInputMap = new HashMap<String, TvInputInfo>(); - private final TvInputListener mInternalListener = - new TvInputListener() { + private final TvInputCallback mInternalCallback = + new TvInputCallback() { @Override public void onInputStateChanged(String inputId, int state) { mInputStateMap.put(inputId, state); - for (TvInputListener listener : mListeners) { + for (TvInputCallback listener : mCallbacks) { listener.onInputStateChanged(inputId, state); } } }; private final Handler mHandler = new Handler(); private boolean mStarted; - private final HashSet<TvInputListener> mListeners = new HashSet<TvInputListener>(); + private final HashSet<TvInputCallback> mCallbacks = new HashSet<TvInputCallback>(); public TvInputManagerHelper(TvInputManager tvInputManager) { mTvInputManager = tvInputManager; @@ -68,7 +68,7 @@ public class TvInputManagerHelper { if (inputs.size() < 1) { return; } - mTvInputManager.registerListener(mInternalListener, mHandler); + mTvInputManager.registerCallback(mInternalCallback, mHandler); update(); } @@ -93,7 +93,7 @@ public class TvInputManagerHelper { if (!mStarted) { return; } - mTvInputManager.unregisterListener(mInternalListener); + mTvInputManager.unregisterCallback(mInternalCallback); mStarted = false; mInputStateMap.clear(); mInputMap.clear(); @@ -155,11 +155,11 @@ public class TvInputManagerHelper { return state; } - public void addListener(TvInputListener listener) { - mListeners.add(listener); + public void addCallback(TvInputCallback listener) { + mCallbacks.add(listener); } - public void removeListener(TvInputListener listener) { - mListeners.remove(listener); + public void removeCallback(TvInputCallback listener) { + mCallbacks.remove(listener); } } |