From 65faab759f98bc54465a44a531bb620863ba1b93 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Mon, 10 Apr 2017 15:42:11 +0300 Subject: [PATCH 1/3] 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); From 6cf891fe760bd3b185f4c73ae2c31ee7d41001c5 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Mon, 10 Apr 2017 15:58:07 +0300 Subject: [PATCH 2/3] rollback changes --- app/src/main/AndroidManifest.xml | 1 - .../com/github/axet/audiorecorder/activities/MainActivity.java | 3 --- 2 files changed, 4 deletions(-) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 0bced9a..79186e9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -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"> 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 5edf32e..eaa0806 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,9 +66,6 @@ public class MainActivity extends AppCompatActivity { setAppTheme(getAppTheme(this)); super.onCreate(savedInstanceState); - getWindow().addFlags(WindowManager.LayoutParams.FLAG_SHOW_WHEN_LOCKED | - WindowManager.LayoutParams.FLAG_TURN_SCREEN_ON); - setContentView(R.layout.activity_main); storage = new Storage(this); From ed4e0db27c500ffc28b6a1dd6484c3149b057fe5 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Mon, 10 Apr 2017 15:58:14 +0300 Subject: [PATCH 3/3] Bump version audiorecorder-1.4.23 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 6bc6072..ac96d08 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -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 {