Move AudioManagerHelper to the tv/audio package

PiperOrigin-RevId: 224656992
Change-Id: I943341e8191db5eb21801b39a1e454408377a56e

2 files changed, 8 insertions, 7 deletions

diff --git a/src/com/android/tv/MainActivity.java b/src/com/android/tv/MainActivity.java
index 8727fb09..b9953247 100644
--- a/src/com/android/tv/MainActivity.java
+++ b/src/com/android/tv/MainActivity.java
@@ -69,6 +69,7 @@ import com.android.tv.MainActivity.MySingletons;
 import com.android.tv.analytics.SendChannelStatusRunnable;
 import com.android.tv.analytics.SendConfigInfoRunnable;
 import com.android.tv.analytics.Tracker;
+import com.android.tv.audio.AudioManagerHelper;
 import com.android.tv.audiotvservice.AudioOnlyTvServiceUtil;
 import com.android.tv.common.BuildConfig;
 import com.android.tv.common.CommonConstants;
diff --git a/src/com/android/tv/AudioManagerHelper.java b/src/com/android/tv/audio/AudioManagerHelper.java
index fca65841..4acff2d3 100644
--- a/src/com/android/tv/AudioManagerHelper.java
+++ b/src/com/android/tv/audio/AudioManagerHelper.java
@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.android.tv;
+package com.android.tv.audio;
 
 import android.app.Activity;
 import android.content.Context;
@@ -25,8 +25,8 @@ import android.support.annotation.Nullable;
 import com.android.tv.features.TvFeatures;
 import com.android.tv.ui.api.TunableTvViewPlayingApi;
 
-/** A helper class to help {@link MainActivity} to handle audio-related stuffs. */
-class AudioManagerHelper implements AudioManager.OnAudioFocusChangeListener {
+/** A helper class to help {@code Activities} to handle audio-related stuffs. */
+public class AudioManagerHelper implements AudioManager.OnAudioFocusChangeListener {
     private static final float AUDIO_MAX_VOLUME = 1.0f;
     private static final float AUDIO_MIN_VOLUME = 0.0f;
     private static final float AUDIO_DUCKING_VOLUME = 0.3f;
@@ -38,7 +38,7 @@ class AudioManagerHelper implements AudioManager.OnAudioFocusChangeListener {
 
     private int mAudioFocusStatus = AudioManager.AUDIOFOCUS_NONE;
 
-    AudioManagerHelper(Activity activity, TunableTvViewPlayingApi tvView) {
+    public AudioManagerHelper(Activity activity, TunableTvViewPlayingApi tvView) {
         mActivity = activity;
         mTvView = tvView;
         mAudioManager = (AudioManager) activity.getSystemService(Context.AUDIO_SERVICE);
@@ -70,7 +70,7 @@ class AudioManagerHelper implements AudioManager.OnAudioFocusChangeListener {
      * audio focus. If the focus status is {@link AudioManager#AUDIOFOCUS_LOSS} and the activity is
      * under PIP mode, this method will finish the activity.
      */
-    void setVolumeByAudioFocusStatus() {
+    public void setVolumeByAudioFocusStatus() {
         if (mTvView.isPlaying()) {
             switch (mAudioFocusStatus) {
                 case AudioManager.AUDIOFOCUS_GAIN:
@@ -111,7 +111,7 @@ class AudioManagerHelper implements AudioManager.OnAudioFocusChangeListener {
      * Tries to request audio focus from {@link AudioManager} and set volume according to the
      * returned result.
      */
-    void requestAudioFocus() {
+    public void requestAudioFocus() {
         int result;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             result = mAudioManager.requestAudioFocus(mFocusRequest);
@@ -128,7 +128,7 @@ class AudioManagerHelper implements AudioManager.OnAudioFocusChangeListener {
     }
 
     /** Abandons audio focus. */
-    void abandonAudioFocus() {
+    public void abandonAudioFocus() {
         mAudioFocusStatus = AudioManager.AUDIOFOCUS_LOSS;
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             mAudioManager.abandonAudioFocusRequest(mFocusRequest);