ionchy
/
QUOZ
1
0
Fork 0
Code

Fixing default volume rocker behaviour to change media volume

This commit is contained in:
Jonathan Chan 2016-08-07 14:22:01 -07:00
parent 9167ae2c91
commit 4fbdbabe21
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/main/java/nonphatic/quoz/MainActivity.java
View File

@ -7,6 +7,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.graphics.Color; import android.graphics.Color;
import android.media.AudioManager;
import android.media.MediaPlayer; import android.media.MediaPlayer;
import android.preference.PreferenceManager; import android.preference.PreferenceManager;
import android.support.design.widget.FloatingActionButton; import android.support.design.widget.FloatingActionButton;
@ -98,6 +99,7 @@ public class MainActivity extends AppCompatActivity {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main); setContentView(R.layout.activity_main);
setVolumeControlStream(AudioManager.STREAM_MUSIC);
getPreferences(); getPreferences();
mContentView = findViewById(R.id.fullscreen_content); mContentView = findViewById(R.id.fullscreen_content);
@ -313,7 +315,7 @@ public class MainActivity extends AppCompatActivity {
}); });
} }
}; };
timer.schedule(timerTask, 180, 425); timer.schedule(timerTask, 160, 425);
mediaPlayer = MediaPlayer.create(this, R.raw.nyan); mediaPlayer = MediaPlayer.create(this, R.raw.nyan);
mediaPlayer.setLooping(true); mediaPlayer.setLooping(true);
mediaPlayer.start(); mediaPlayer.start();

2
app/src/main/java/nonphatic/quoz/preferences/SettingsActivity.java
View File

@ -6,6 +6,7 @@ import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.SharedPreferences; import android.content.SharedPreferences;
import android.content.res.Configuration; import android.content.res.Configuration;
import android.media.AudioManager;
import android.net.Uri; import android.net.Uri;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
@ -104,6 +105,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity {
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
setupActionBar(); setupActionBar();
setVolumeControlStream(AudioManager.STREAM_MUSIC);
} }
/** /**