From 65faab759f98bc54465a44a531bb620863ba1b93 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Mon, 10 Apr 2017 15:42:11 +0300 Subject: [PATCH] cleanups --- .../axet/audiorecorder/activities/MainActivity.java | 7 +++---- .../axet/audiorecorder/activities/RecordingActivity.java | 9 ++++----- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java b/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java index edb10ff..5edf32e 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java +++ b/app/src/main/java/com/github/axet/audiorecorder/activities/MainActivity.java @@ -66,12 +66,11 @@ public class MainActivity extends AppCompatActivity { setAppTheme(getAppTheme(this)); super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - - getWindow().addFlags(WindowManager.LayoutParams.FLAG_DISMISS_KEYGUARD | - WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED | + getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED | WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON); + setContentView(R.layout.activity_main); + storage = new Storage(this); Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar); diff --git a/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java b/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java index c09dc36..9e68c00 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java +++ b/app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java @@ -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);