rixty
/
Amadeus
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix Merging Error

This commit is contained in:
Yink 2017-03-05 02:17:31 +01:00
parent 78ad678857
commit 19f53b389a
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/src/main/java/com/example/yink/amadeus/MainActivity.java
View File

@ -47,6 +47,7 @@ public class MainActivity extends AppCompatActivity {
kurisu = (ImageView) findViewById(R.id.imageView_kurisu);
handler = new Handler();
setupLines();
speak(voiceLines.get(0));
if (Build.VERSION.SDK_INT >= 23) {
ActivityCompat.requestPermissions(MainActivity.this, new String[]{Manifest.permission.RECORD_AUDIO}, REQUEST_PERMISSION_RECORD_AUDIO);