summaryrefslogtreecommitdiff
path: root/LoopbackApp
diff options
context:
space:
mode:
authorninatai <ninatai@google.com>2015-05-11 16:04:29 -0700
committerninatai <ninatai@google.com>2015-05-11 16:04:29 -0700
commit52c1ca141c8b79de11ed5e77a3995a99b5850b47 (patch)
tree66302af543edb0315b04302a5b8c114a42e55583 /LoopbackApp
parenta18e0eb0bd5e0a55b383072765418954d8ab92f6 (diff)
downloaddrrickorang-52c1ca141c8b79de11ed5e77a3995a99b5850b47.tar.gz
Add About page to show relevant information about this app
Diffstat (limited to 'LoopbackApp')
-rw-r--r--LoopbackApp/app/src/main/AndroidManifest.xml10
-rw-r--r--LoopbackApp/app/src/main/java/org/drrickorang/loopback/AboutActivity.java31
-rw-r--r--LoopbackApp/app/src/main/java/org/drrickorang/loopback/LoopbackActivity.java14
-rw-r--r--LoopbackApp/app/src/main/res/layout/main_activity.xml7
-rw-r--r--LoopbackApp/app/src/main/res/values/strings.xml2
5 files changed, 63 insertions, 1 deletions
diff --git a/LoopbackApp/app/src/main/AndroidManifest.xml b/LoopbackApp/app/src/main/AndroidManifest.xml
index 9f6aa7c..cc57817 100644
--- a/LoopbackApp/app/src/main/AndroidManifest.xml
+++ b/LoopbackApp/app/src/main/AndroidManifest.xml
@@ -60,5 +60,15 @@
android:value="org.drrickorang.loopback.LoopbackActivity"/>
</activity>
+ <activity
+ android:name="org.drrickorang.loopback.AboutActivity"
+ android:label="About"
+ android:parentActivityName="org.drrickorang.loopback.LoopbackActivity"
+ android:theme="@android:style/Theme.Holo.Light">
+ <meta-data
+ android:name="android.support.PARENT_ACTIVITY"
+ android:value="org.drrickorang.loopback.LoopbackActivity" />
+ </activity>
+
</application>
</manifest>
diff --git a/LoopbackApp/app/src/main/java/org/drrickorang/loopback/AboutActivity.java b/LoopbackApp/app/src/main/java/org/drrickorang/loopback/AboutActivity.java
new file mode 100644
index 0000000..f968202
--- /dev/null
+++ b/LoopbackApp/app/src/main/java/org/drrickorang/loopback/AboutActivity.java
@@ -0,0 +1,31 @@
+package org.drrickorang.loopback;
+
+import android.app.Activity;
+import android.content.Intent;
+import android.os.Bundle;
+import android.widget.TextView;
+
+/**
+ * Created by ninatai on 5/11/15.
+ */
+public class AboutActivity extends Activity {
+ public void onCreate(Bundle savedInstanceState) {
+
+ super.onCreate(savedInstanceState);
+
+ Intent intent = getIntent();
+ String message = "Audio latency testing app using the Dr. Rick O'Rang audio loopback dongle.\n\n" +
+ "Author: Ricardo Garcia\n\n" +
+ "Open source project on: https://github.com/gkasten/drrickorang\n\n" +
+ "References: https://source.android.com/devices/audio/loopback.html\n" +
+ "https://source.android.com/devices/audio/latency_measure.html#loopback";
+
+ // Create the text view
+ TextView textView = new TextView(this);
+ textView.setTextSize(20);
+ textView.setText(message);
+
+ // Set the text view as the activity layout
+ setContentView(textView);
+ }
+}
diff --git a/LoopbackApp/app/src/main/java/org/drrickorang/loopback/LoopbackActivity.java b/LoopbackApp/app/src/main/java/org/drrickorang/loopback/LoopbackActivity.java
index ec8ff96..97cbb78 100644
--- a/LoopbackApp/app/src/main/java/org/drrickorang/loopback/LoopbackActivity.java
+++ b/LoopbackApp/app/src/main/java/org/drrickorang/loopback/LoopbackActivity.java
@@ -34,6 +34,7 @@ import android.util.Log;
import android.view.Gravity;
import android.view.View;
import android.widget.Button;
+import android.widget.EditText;
import android.widget.LinearLayout;
import android.widget.SeekBar;
import android.widget.Toast;
@@ -58,6 +59,7 @@ public class LoopbackActivity extends Activity {
private static final int SAVE_TO_PNG_REQUEST = 43;
private static final int SETTINGS_ACTIVITY_REQUEST_CODE = 44;
+ private static final int ABOUT_ACTIVITY_REQUEST_CODE = 45;
LoopbackAudioThread audioThread = null;
NativeAudioThread nativeAudioThread = null;
private WavePlotView mWavePlotView;
@@ -324,7 +326,7 @@ public class LoopbackActivity extends Activity {
//create filename with date
String date = mCurrentTime; // the time the plot is acquired
- String micSource = getApp().getMicSourceString( getApp().getMicSource());
+ String micSource = getApp().getMicSourceString(getApp().getMicSource());
String fileName = micSource+"_"+date;
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) {
@@ -427,6 +429,8 @@ public class LoopbackActivity extends Activity {
mWavePlotView.refreshGraph();
}
+
+
/** Called when the user clicks the button */
public void onButtonZoomIn(View view) {
@@ -447,6 +451,14 @@ public class LoopbackActivity extends Activity {
}
*/
+ public void onButtonAbout(View view) {
+ if(!isBusy()) {
+ Intent aboutIntent = new Intent(this, AboutActivity.class);
+ startActivity(aboutIntent);
+ } else
+ showToast("Test in progress... please wait");
+ }
+
/** Called when the user clicks the button */
public void onButtonSettings(View view) {
diff --git a/LoopbackApp/app/src/main/res/layout/main_activity.xml b/LoopbackApp/app/src/main/res/layout/main_activity.xml
index 70a7093..00ee4d0 100644
--- a/LoopbackApp/app/src/main/res/layout/main_activity.xml
+++ b/LoopbackApp/app/src/main/res/layout/main_activity.xml
@@ -92,6 +92,13 @@
android:layout_height="wrap_content"
android:text="@string/buttonZoomOutFull"
android:onClick="onButtonZoomOutFull"/>
+ <Button
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/buttonAbout"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/buttonAbout"
+ android:onClick="onButtonAbout"/>
</LinearLayout>
diff --git a/LoopbackApp/app/src/main/res/values/strings.xml b/LoopbackApp/app/src/main/res/values/strings.xml
index 433a620..a3a5173 100644
--- a/LoopbackApp/app/src/main/res/values/strings.xml
+++ b/LoopbackApp/app/src/main/res/values/strings.xml
@@ -26,6 +26,7 @@
<string name="buttonZoomOutFull">Unzoom</string>
<string name="buttonZoomOut">Zoom Out</string>
<string name="buttonZoomIn"> Zoom In</string>
+ <string name="buttonAbout">About</string>
<!-- disabled -->
<string name="buttonZoomInFull">In Full</string>
@@ -44,6 +45,7 @@
<string name="labelInfo">Info...</string>
<string name="labelSettings">SETTINGS</string>
+ <string name="labelAbout">About</string>
<string name="labelSamplingRate">Sampling Rate</string>
<!-- spinnerSamplingRate Options -->