bitPickups/android-audio-recorder
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'audiorecorder-1.0.16'

Browse source
This commit is contained in:
Alexey Kuznetsov 2016-03-15 21:00:09 +03:00
commit b4d2b67711
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
app/build.gradle
View file

@ -8,8 +8,8 @@ android {
applicationId "com.github.axet.audiorecorder"
minSdkVersion 16
targetSdkVersion 23
versionCode 16
versionName "1.0.15"
versionCode 17
versionName "1.0.16"
}
signingConfigs {
release {
@ -33,7 +33,6 @@ dependencies {
testCompile 'junit:junit:4.12'
compile 'com.android.support:appcompat-v7:23.2.0'
compile 'com.android.support:support-v4:23.2.0'
compile 'com.android.support:support-v13:23.2.0'
compile 'com.android.support:preference-v14:23.2.0'
compile 'com.android.support:design:23.2.0'
}

10
app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java
View file

@ -2,7 +2,6 @@ package com.github.axet.audiorecorder.activities;
import android.Manifest;
import android.app.AlertDialog;
import android.app.Notification;
import android.app.NotificationManager;
import android.app.PendingIntent;
import android.app.ProgressDialog;
@ -20,6 +19,7 @@ import android.media.MediaRecorder;
import android.os.*;
import android.preference.PreferenceManager;
import android.support.v4.app.ActivityCompat;
import android.support.v4.app.NotificationCompat;
import android.support.v4.content.ContextCompat;
import android.support.v7.app.AppCompatActivity;
import android.telephony.PhoneStateListener;
@ -175,7 +175,7 @@ public class RecordingActivity extends AppCompatActivity {
sampleRate = Integer.parseInt(shared.getString(MainApplication.PREFERENCE_RATE, ""));
if (isEmulator() && Build.VERSION.SDK_INT < 23) {
if (Build.VERSION.SDK_INT < 23 && isEmulator()) {
Toast.makeText(this, "Emulator Detected. Reducing Sample Rate to 8000 Hz", Toast.LENGTH_SHORT).show();
sampleRate = 8000;
}
@ -224,7 +224,7 @@ public class RecordingActivity extends AppCompatActivity {
}
boolean isEmulator() {
return Build.FINGERPRINT.contains("generic");
return "goldfish".equals(Build.HARDWARE);
}
@Override
@ -526,14 +526,14 @@ public class RecordingActivity extends AppCompatActivity {
view.setOnClickPendingIntent(R.id.notification_pause, pe);
view.setImageViewResource(R.id.notification_pause, thread == null ? R.drawable.play : R.drawable.pause);
Notification.Builder builder = new Notification.Builder(this)
NotificationCompat.Builder builder = new NotificationCompat.Builder(this)
.setOngoing(true)
.setContentTitle("Recording")
.setSmallIcon(R.drawable.ic_mic_24dp)
.setContent(view);
if (Build.VERSION.SDK_INT >= 21)
builder.setVisibility(Notification.VISIBILITY_PUBLIC);
builder.setVisibility(NotificationCompat.VISIBILITY_PUBLIC);
notificationManager.notify(NOTIFICATION_RECORDING_ICON, builder.build());
}