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

Merge branch 'audiorecorder-1.4.23'

Browse source
This commit is contained in:
Alexey Kuznetsov 2017-04-10 15:58:14 +03:00
commit 615ff4f73f
4 changed files with 6 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -8,8 +8,8 @@ android {
applicationId "com.github.axet.audiorecorder"
minSdkVersion 9
targetSdkVersion 23
versionCode 124
versionName "1.4.22"
versionCode 125
versionName "1.4.23"
}
signingConfigs {
release {

1
app/src/main/AndroidManifest.xml
View file

@ -25,7 +25,6 @@
android:configChanges="orientation|keyboardHidden|screenSize"
android:label="@string/app_name"
android:launchMode="singleInstance"
android:showOnLockScreen="true"
android:theme="@style/RecThemeLight.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

4
app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java
View file

@ -68,10 +68,6 @@ public class MainActivity extends AppCompatActivity {
setContentView(R.layout.activity_main);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD |
WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED |
WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
storage = new Storage(this);
Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);

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

@ -148,6 +148,10 @@ public class RecordingActivity extends AppCompatActivity {
setTheme(((MainApplication) getApplication()).getUserTheme());
super.onCreate(savedInstanceState);
getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON |
WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED |
WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
setContentView(R.layout.activity_recording);
setupActionBar();
@ -179,11 +183,6 @@ public class RecordingActivity extends AppCompatActivity {
tm.listen(pscl, PhoneStateListener.LISTEN_CALL_STATE);
}
getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON |
WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD |
WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED |
WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON);
sampleRate = Integer.parseInt(shared.getString(MainApplication.PREFERENCE_RATE, ""));
sampleRate = Sound.getValidRecordRate(MainApplication.getMode(this), sampleRate);
samplesUpdate = (int) (pitch.getPitchTime() * sampleRate / 1000.0);