Fix Merging Error
This commit is contained in:
parent
78ad678857
commit
19f53b389a
|
@ -47,6 +47,7 @@ public class MainActivity extends AppCompatActivity {
|
||||||
kurisu = (ImageView) findViewById(R.id.imageView_kurisu);
|
kurisu = (ImageView) findViewById(R.id.imageView_kurisu);
|
||||||
handler = new Handler();
|
handler = new Handler();
|
||||||
setupLines();
|
setupLines();
|
||||||
|
speak(voiceLines.get(0));
|
||||||
|
|
||||||
if (Build.VERSION.SDK_INT >= 23) {
|
if (Build.VERSION.SDK_INT >= 23) {
|
||||||
ActivityCompat.requestPermissions(MainActivity.this, new String[]{Manifest.permission.RECORD_AUDIO}, REQUEST_PERMISSION_RECORD_AUDIO);
|
ActivityCompat.requestPermissions(MainActivity.this, new String[]{Manifest.permission.RECORD_AUDIO}, REQUEST_PERMISSION_RECORD_AUDIO);
|
||||||
|
|
Loading…
Reference in New Issue