-
Notifications
You must be signed in to change notification settings - Fork 31
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'm-abboud-realtime_pitch_graph'
- Loading branch information
Showing
64 changed files
with
1,493 additions
and
295 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
46 changes: 46 additions & 0 deletions
46
app/src/main/java/de/lilithwittmann/voicepitchanalyzer/activities/ProgressActivity.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,46 @@ | ||
| package de.lilithwittmann.voicepitchanalyzer.activities; | ||
|
|
||
| import android.content.Intent; | ||
| import android.os.Bundle; | ||
| import android.support.v7.app.AppCompatActivity; | ||
| import android.view.Menu; | ||
| import android.view.MenuItem; | ||
|
|
||
| import de.lilithwittmann.voicepitchanalyzer.R; | ||
|
|
||
| public class ProgressActivity extends AppCompatActivity | ||
| { | ||
| @Override | ||
| protected void onCreate(Bundle savedInstanceState) | ||
| { | ||
| super.onCreate(savedInstanceState); | ||
| setContentView(R.layout.activity_progress); | ||
| } | ||
|
|
||
| @Override | ||
| public boolean onCreateOptionsMenu(Menu menu) | ||
| { | ||
| // Inflate the menu; this adds items to the action bar if it is present. | ||
| getMenuInflater().inflate(R.menu.menu_about, menu); | ||
| return true; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean onOptionsItemSelected(MenuItem item) | ||
| { | ||
| switch (item.getItemId()) | ||
| { | ||
| case android.R.id.home: | ||
| { | ||
| this.onBackPressed(); | ||
| } | ||
|
|
||
| case R.id.action_record: | ||
| { | ||
| startActivity(new Intent(this, RecordingActivity.class)); | ||
| } | ||
| } | ||
|
|
||
| return super.onOptionsItemSelected(item); | ||
| } | ||
| } |
Oops, something went wrong.