diff --git a/app/build.gradle b/app/build.gradle
index dfcbf5c..364ea73 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -6,7 +6,7 @@ android {
defaultConfig {
applicationId "com.github.axet.audiorecorder"
- minSdkVersion 16
+ minSdkVersion 9
targetSdkVersion 23
versionCode 89
versionName "1.2.1"
@@ -38,11 +38,10 @@ android {
dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
testCompile 'junit:junit:4.12'
- compile 'com.android.support:appcompat-v7:25.0.1'
- compile 'com.android.support:support-v4:25.0.1'
- compile 'com.android.support:preference-v14:25.0.1'
- compile 'com.android.support:design:25.0.1'
+ compile 'com.android.support:appcompat-v7:25.1.0'
+ compile 'com.android.support:support-v4:25.1.0'
+ compile 'com.android.support:design:25.1.0'
compile 'com.google.android.gms:play-services-appindexing:9.8.0'
compile 'org.apache.commons:commons-math3:3.6.1'
- compile 'com.github.axet:android-library:1.6.7' // project(':android-library')
+ compile 'com.github.axet:android-library:1.6.8' // compile project(':android-library')
}
diff --git a/app/src/main/java/com/github/axet/audiorecorder/activities/SettingsActivity.java b/app/src/main/java/com/github/axet/audiorecorder/activities/SettingsActivity.java
index 48c24a9..f23ae06 100644
--- a/app/src/main/java/com/github/axet/audiorecorder/activities/SettingsActivity.java
+++ b/app/src/main/java/com/github/axet/audiorecorder/activities/SettingsActivity.java
@@ -130,7 +130,19 @@ public class SettingsActivity extends AppCompatPreferenceActivity implements Sha
final SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(this);
shared.registerOnSharedPreferenceChangeListener(this);
- getFragmentManager().beginTransaction().replace(android.R.id.content, new GeneralPreferenceFragment()).commit();
+ if (Build.VERSION.SDK_INT < 11) {
+ addPreferencesFromResource(R.xml.pref_general);
+ bindPreferenceSummaryToValue(findPreference(MainApplication.PREFERENCE_STORAGE));
+
+ Preference rate = findPreference(MainApplication.PREFERENCE_ENCODING);
+ getPreferenceScreen().removePreference(rate);
+
+ bindPreferenceSummaryToValue(findPreference(MainApplication.PREFERENCE_RATE));
+ bindPreferenceSummaryToValue(findPreference(MainApplication.PREFERENCE_THEME));
+ bindPreferenceSummaryToValue(findPreference(MainApplication.PREFERENCE_CHANNELS));
+ } else {
+ getFragmentManager().beginTransaction().replace(android.R.id.content, new GeneralPreferenceFragment()).commit();
+ }
}
/**
@@ -230,7 +242,7 @@ public class SettingsActivity extends AppCompatPreferenceActivity implements Sha
* This fragment shows general preferences only. It is used when the
* activity is showing a two-pane settings UI.
*/
- @TargetApi(Build.VERSION_CODES.HONEYCOMB)
+ @TargetApi(11)
public static class GeneralPreferenceFragment extends PreferenceFragment {
public GeneralPreferenceFragment() {
}
diff --git a/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java b/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java
index 92d3cbe..5155167 100644
--- a/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java
+++ b/app/src/main/java/com/github/axet/audiorecorder/services/RecordingService.java
@@ -5,11 +5,8 @@ import android.app.PendingIntent;
import android.app.Service;
import android.content.BroadcastReceiver;
import android.content.Context;
-import android.content.ContextWrapper;
import android.content.Intent;
import android.content.IntentFilter;
-import android.content.pm.PackageManager;
-import android.content.res.Resources;
import android.os.Build;
import android.os.IBinder;
import android.support.annotation.Nullable;
@@ -153,6 +150,10 @@ public class RecordingService extends Service {
.setSmallIcon(R.drawable.ic_mic_24dp)
.setContent(view);
+ if (Build.VERSION.SDK_INT < 11) {
+ builder.setContentIntent(main);
+ }
+
if (Build.VERSION.SDK_INT >= 21)
builder.setVisibility(NotificationCompat.VISIBILITY_PUBLIC);
diff --git a/app/src/main/res/xml-ru-v14/pref_general.xml b/app/src/main/res/xml-ru-v14/pref_general.xml
new file mode 100644
index 0000000..7ac692e
--- /dev/null
+++ b/app/src/main/res/xml-ru-v14/pref_general.xml
@@ -0,0 +1,61 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/xml-ru/pref_general.xml b/app/src/main/res/xml-ru/pref_general.xml
index 7ac692e..639521d 100644
--- a/app/src/main/res/xml-ru/pref_general.xml
+++ b/app/src/main/res/xml-ru/pref_general.xml
@@ -36,13 +36,13 @@
android:summary="Режим записи"
android:title="Режим" />
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml
index 6ad2b71..74fd373 100644
--- a/app/src/main/res/xml/pref_general.xml
+++ b/app/src/main/res/xml/pref_general.xml
@@ -36,13 +36,13 @@
android:summary="Recording channels"
android:title="Mode" />
-
-