From 30c7ce71a956f291dcec49e50bb9b3ad9d2233cc Mon Sep 17 00:00:00 2001
From: ToadKing <toadking@toadking.com>
Date: Mon, 28 Jan 2013 20:37:13 -0500
Subject: [PATCH] (Android) control media volume in menu

---
 .../phoenix/src/org/retroarch/browser/DirectoryActivity.java   | 2 ++
 android/phoenix/src/org/retroarch/browser/RetroArch.java       | 3 +++
 .../phoenix/src/org/retroarch/browser/SettingsActivity.java    | 2 ++
 3 files changed, 7 insertions(+)

diff --git a/android/phoenix/src/org/retroarch/browser/DirectoryActivity.java b/android/phoenix/src/org/retroarch/browser/DirectoryActivity.java
index 71aa2d371c..96bdfb0b36 100644
--- a/android/phoenix/src/org/retroarch/browser/DirectoryActivity.java
+++ b/android/phoenix/src/org/retroarch/browser/DirectoryActivity.java
@@ -7,6 +7,7 @@ import java.io.*;
 
 import android.content.*;
 import android.app.*;
+import android.media.AudioManager;
 import android.os.*;
 import android.preference.PreferenceManager;
 import android.widget.*;
@@ -163,6 +164,7 @@ public class DirectoryActivity extends Activity implements
 		}
 
 		wrapFiles();
+		this.setVolumeControlStream(AudioManager.STREAM_MUSIC);
 	}
 
 	@Override
diff --git a/android/phoenix/src/org/retroarch/browser/RetroArch.java b/android/phoenix/src/org/retroarch/browser/RetroArch.java
index c54e03fc5b..ebdbe29481 100644
--- a/android/phoenix/src/org/retroarch/browser/RetroArch.java
+++ b/android/phoenix/src/org/retroarch/browser/RetroArch.java
@@ -7,6 +7,7 @@ import java.io.*;
 import android.content.*;
 import android.content.res.AssetManager;
 import android.app.*;
+import android.media.AudioManager;
 import android.net.Uri;
 import android.os.*;
 import android.preference.PreferenceManager;
@@ -230,6 +231,8 @@ public class RetroArch extends Activity implements
 				}
 			}
 		}
+		
+		this.setVolumeControlStream(AudioManager.STREAM_MUSIC);
 	}
 
 	@Override
diff --git a/android/phoenix/src/org/retroarch/browser/SettingsActivity.java b/android/phoenix/src/org/retroarch/browser/SettingsActivity.java
index 770e1dd430..0c82eaddec 100644
--- a/android/phoenix/src/org/retroarch/browser/SettingsActivity.java
+++ b/android/phoenix/src/org/retroarch/browser/SettingsActivity.java
@@ -3,6 +3,7 @@ package org.retroarch.browser;
 import org.retroarch.R;
 
 import android.app.Activity;
+import android.media.AudioManager;
 import android.os.Bundle;
 import android.preference.PreferenceFragment;
 import android.preference.PreferenceManager;
@@ -14,6 +15,7 @@ public class SettingsActivity extends Activity {
 		getFragmentManager().beginTransaction().
 			replace(android.R.id.content, new SettingsFragment()).commit();
 		PreferenceManager.setDefaultValues(this, R.xml.prefs, false);
+		this.setVolumeControlStream(AudioManager.STREAM_MUSIC);
 	}
 	
 	public static class SettingsFragment extends PreferenceFragment {