pi/babyphone
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge pull request #2 from brarcher/staging

Browse Source 
Improve usability - volume control, survive screen rotation, screen stays on
This commit is contained in:
brarcher
2015-12-27 20:52:41 -05:00
parent 133baf9a48 6af9dff004
commit 14118499fa
3 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
AndroidManifest.xml
View File

@@ -18,6 +18,7 @@
<activity <activity
android:name="protect.babymonitor.StartActivity" android:name="protect.babymonitor.StartActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:configChanges="orientation|screenSize"
> >
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
@@ -27,16 +28,19 @@
<activity <activity
android:name="protect.babymonitor.MonitorActivity" android:name="protect.babymonitor.MonitorActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:configChanges="orientation|screenSize"
android:parentActivityName="protect.babymonitor.StartActivity" android:parentActivityName="protect.babymonitor.StartActivity"
/> />
<activity <activity
android:name="protect.babymonitor.DiscoverActivity" android:name="protect.babymonitor.DiscoverActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:configChanges="orientation|screenSize"
android:parentActivityName="protect.babymonitor.StartActivity" android:parentActivityName="protect.babymonitor.StartActivity"
/> />
<activity <activity
android:name="protect.babymonitor.ListenActivity" android:name="protect.babymonitor.ListenActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:configChanges="orientation|screenSize"
android:parentActivityName="protect.babymonitor.DiscoverActivity" android:parentActivityName="protect.babymonitor.DiscoverActivity"
/> />
</application> </application>

1
res/layout/activity_monitor.xml
View File

@@ -8,6 +8,7 @@
android:paddingLeft="@dimen/activity_horizontal_margin" android:paddingLeft="@dimen/activity_horizontal_margin"
android:paddingRight="@dimen/activity_horizontal_margin" android:paddingRight="@dimen/activity_horizontal_margin"
android:paddingTop="@dimen/activity_vertical_margin" android:paddingTop="@dimen/activity_vertical_margin"
android:keepScreenOn="true"
tools:context="protect.babymonitor.MonitorActivity" > tools:context="protect.babymonitor.MonitorActivity" >
<TextView <TextView

4
src/protect/babymonitor/ListenActivity.java
View File

@@ -50,7 +50,7 @@ public class ListenActivity extends Activity
int audioEncoding = AudioFormat.ENCODING_PCM_16BIT; int audioEncoding = AudioFormat.ENCODING_PCM_16BIT;
int bufferSize = AudioTrack.getMinBufferSize(frequency, channelConfiguration, audioEncoding); int bufferSize = AudioTrack.getMinBufferSize(frequency, channelConfiguration, audioEncoding);
final AudioTrack audioTrack = new AudioTrack(AudioManager.STREAM_VOICE_CALL, final AudioTrack audioTrack = new AudioTrack(AudioManager.STREAM_MUSIC,
frequency, frequency,
channelConfiguration, channelConfiguration,
audioEncoding, audioEncoding,
@@ -63,6 +63,8 @@ public class ListenActivity extends Activity
Thread playThread = new Thread(audioPlayer); Thread playThread = new Thread(audioPlayer);
playThread.start(); playThread.start();
setVolumeControlStream(AudioManager.STREAM_MUSIC);
InputStream is = socket.getInputStream(); InputStream is = socket.getInputStream();
int read = 0; int read = 0;