From a9f1f48762c6e1b82cb21cf29042d12cfc236cd8 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 15 May 2019 16:31:19 +0300 Subject: [PATCH 1/7] new PersistentService --- .../services/RecordingService.java | 116 ++++++++---------- 1 file changed, 51 insertions(+), 65 deletions(-) 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 b0df5d0..957568c 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 @@ -3,7 +3,6 @@ package com.github.axet.audiorecorder.services; import android.annotation.SuppressLint; import android.app.Notification; import android.app.PendingIntent; -import android.app.Service; import android.content.ContentResolver; import android.content.Context; import android.content.Intent; @@ -18,7 +17,7 @@ import android.view.View; import android.widget.RemoteViews; import com.github.axet.androidlibrary.app.AlarmManager; -import com.github.axet.androidlibrary.app.NotificationManagerCompat; +import com.github.axet.androidlibrary.services.PersistentService; import com.github.axet.androidlibrary.widgets.OptimizationPreferenceCompat; import com.github.axet.androidlibrary.widgets.ProximityShader; import com.github.axet.androidlibrary.widgets.RemoteNotificationCompat; @@ -34,7 +33,7 @@ import java.io.File; /** * Sometimes RecordingActivity started twice when launched from lockscreen. We need service and move recording into Application object. */ -public class RecordingService extends Service { +public class RecordingService extends PersistentService { public static final String TAG = RecordingService.class.getSimpleName(); public static final int NOTIFICATION_RECORDING_ICON = 1; @@ -43,10 +42,15 @@ public class RecordingService extends Service { public static String PAUSE_BUTTON = RecordingService.class.getCanonicalName() + ".PAUSE_BUTTON"; public static String RECORD_BUTTON = RecordingService.class.getCanonicalName() + ".RECORD_BUTTON"; + static { + OptimizationPreferenceCompat.REFRESH = AlarmManager.MIN1; + NOTIFICATION_PERSISTENT_ICON = NOTIFICATION_RECORDING_ICON; + PREFERENCE_OPTIMIZATION = AudioApplication.PREFERENCE_OPTIMIZATION; + PREFERENCE_NEXT = AudioApplication.PREFERENCE_NEXT; + } + Storage storage; // for storage path - Notification notification; Intent notificationIntent; - OptimizationPreferenceCompat.ServiceReceiver optimization; public static void startIfEnabled(Context context) { SharedPreferences shared = PreferenceManager.getDefaultSharedPreferences(context); @@ -79,7 +83,7 @@ public class RecordingService extends Service { } public static void start(Context context) { - OptimizationPreferenceCompat.startService(context, new Intent(context, RecordingService.class)); + start(context, new Intent(context, RecordingService.class)); } public static void startService(Context context, String targetFile, boolean recording, boolean encoding, String duration) { @@ -101,20 +105,28 @@ public class RecordingService extends Service { } public static void stopService(Context context) { - context.stopService(new Intent(context, RecordingService.class)); + stop(context, new Intent(context, RecordingService.class)); } public RecordingService() { } + @Override + protected void attachBaseContext(Context base) { + super.attachBaseContext(base); + CHANNEL_STATUS = AudioApplication.from(base).channelStatus; + storage = new Storage(base); + } + @Override public void onCreate() { super.onCreate(); Log.d(TAG, "onCreate"); - storage = new Storage(this); - showNotification(new Intent()); - OptimizationPreferenceCompat.REFRESH = AlarmManager.MIN1; - optimization = new OptimizationPreferenceCompat.ServiceReceiver(this, getClass(), AudioApplication.PREFERENCE_OPTIMIZATION) { + } + + @Override + public ServiceReceiver createOptimization() { + PersistentService.ServiceReceiver optimization = new PersistentService.ServiceReceiver(this, getClass(), AudioApplication.PREFERENCE_OPTIMIZATION) { @Override public void register() { // do not call super next(); @@ -129,35 +141,26 @@ public class RecordingService extends Service { } }; optimization.create(); + return optimization; } @Override - public int onStartCommand(Intent intent, int flags, int startId) { - Log.d(TAG, "onStartCommand"); - - if (optimization.onStartCommand(intent, flags, startId)) { - Log.d(TAG, "onStartCommand restart"); + public void onStartCommand(Intent intent) { + String a = intent.getAction(); + if (a == null) { + updateIcon(intent); + } else if (a.equals(PAUSE_BUTTON)) { + Intent i = new Intent(RecordingActivity.PAUSE_BUTTON); + sendBroadcast(i); + } else if (a.equals(RECORD_BUTTON)) { + RecordingActivity.startActivity(this, false); + } else if (a.equals(SHOW_ACTIVITY)) { + ProximityShader.closeSystemDialogs(this); + if (intent.getStringExtra("targetFile") == null) + MainActivity.startActivity(this); + else + RecordingActivity.startActivity(this, !intent.getBooleanExtra("recording", false)); } - - if (intent != null) { - String a = intent.getAction(); - if (a == null) { - showNotification(intent); - } else if (a.equals(PAUSE_BUTTON)) { - Intent i = new Intent(RecordingActivity.PAUSE_BUTTON); - sendBroadcast(i); - } else if (a.equals(RECORD_BUTTON)) { - RecordingActivity.startActivity(this, false); - } else if (a.equals(SHOW_ACTIVITY)) { - ProximityShader.closeSystemDialogs(this); - if (intent.getStringExtra("targetFile") == null) - MainActivity.startActivity(this); - else - RecordingActivity.startActivity(this, !intent.getBooleanExtra("recording", false)); - } - } - - return super.onStartCommand(intent, flags, startId); } @Nullable @@ -169,13 +172,11 @@ public class RecordingService extends Service { @Override public void onDestroy() { super.onDestroy(); - Log.d(TAG, "onDestroy"); - showNotification(null); + } - if (optimization != null) { - optimization.close(); - optimization = null; - } + @Override + public int getAppTheme() { + return AudioApplication.getTheme(this, R.style.RecThemeLight, R.style.RecThemeDark); } @SuppressLint("RestrictedApi") @@ -252,8 +253,8 @@ public class RecordingService extends Service { builder.setImageViewResource(R.id.notification_pause, !recording ? R.drawable.ic_play_arrow_black_24dp : R.drawable.ic_pause_black_24dp); builder.setContentDescription(R.id.notification_pause, getString(!recording ? R.string.record_button : R.string.pause_button)); - builder.setTheme(AudioApplication.getTheme(this, R.style.RecThemeLight, R.style.RecThemeDark)) - .setChannel(AudioApplication.from(this).channelStatus) + builder.setTheme(getAppTheme()) + .setChannel(CHANNEL_STATUS) .setImageViewTint(R.id.icon_circle, builder.getThemeColor(R.attr.colorButtonNormal)) .setTitle(title) .setText(text) @@ -265,29 +266,14 @@ public class RecordingService extends Service { return builder.build(); } - public void showNotification(Intent intent) { - NotificationManagerCompat nm = NotificationManagerCompat.from(this); - if (intent == null) { - stopForeground(false); - nm.cancel(NOTIFICATION_RECORDING_ICON); - notification = null; - notificationIntent = null; - } else { - Notification n = build(intent); - if (notification == null) { - startForeground(NOTIFICATION_RECORDING_ICON, n); - } else { - nm.notify(NOTIFICATION_RECORDING_ICON, n); - } - notification = n; - notificationIntent = intent; - } + @Override + public void updateIcon() { + super.updateIcon(new Intent()); } @Override - public void onTaskRemoved(Intent rootIntent) { - super.onTaskRemoved(rootIntent); - Log.d(TAG, "onTaskRemoved"); - optimization.onTaskRemoved(rootIntent); + public void updateIcon(Intent intent) { + super.updateIcon(intent); + notificationIntent = intent; } } From 11252332c67acc048535e5b32e39079b7109fd19 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 15 May 2019 19:04:00 +0300 Subject: [PATCH 2/7] cleanups --- .../services/RecordingService.java | 26 ++++++------------- 1 file changed, 8 insertions(+), 18 deletions(-) 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 957568c..883075f 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 @@ -18,6 +18,7 @@ import android.widget.RemoteViews; import com.github.axet.androidlibrary.app.AlarmManager; import com.github.axet.androidlibrary.services.PersistentService; +import com.github.axet.androidlibrary.widgets.NotificationChannelCompat; import com.github.axet.androidlibrary.widgets.OptimizationPreferenceCompat; import com.github.axet.androidlibrary.widgets.ProximityShader; import com.github.axet.androidlibrary.widgets.RemoteNotificationCompat; @@ -111,13 +112,6 @@ public class RecordingService extends PersistentService { public RecordingService() { } - @Override - protected void attachBaseContext(Context base) { - super.attachBaseContext(base); - CHANNEL_STATUS = AudioApplication.from(base).channelStatus; - storage = new Storage(base); - } - @Override public void onCreate() { super.onCreate(); @@ -125,8 +119,8 @@ public class RecordingService extends PersistentService { } @Override - public ServiceReceiver createOptimization() { - PersistentService.ServiceReceiver optimization = new PersistentService.ServiceReceiver(this, getClass(), AudioApplication.PREFERENCE_OPTIMIZATION) { + public void onCreateOptimization() { + optimization = new PersistentService.ServiceReceiver(this, getClass(), AudioApplication.PREFERENCE_OPTIMIZATION) { @Override public void register() { // do not call super next(); @@ -141,7 +135,8 @@ public class RecordingService extends PersistentService { } }; optimization.create(); - return optimization; + + storage = new Storage(this); } @Override @@ -174,11 +169,6 @@ public class RecordingService extends PersistentService { super.onDestroy(); } - @Override - public int getAppTheme() { - return AudioApplication.getTheme(this, R.style.RecThemeLight, R.style.RecThemeDark); - } - @SuppressLint("RestrictedApi") public Notification build(Intent intent) { String targetFile = intent.getStringExtra("targetFile"); @@ -253,8 +243,8 @@ public class RecordingService extends PersistentService { builder.setImageViewResource(R.id.notification_pause, !recording ? R.drawable.ic_play_arrow_black_24dp : R.drawable.ic_pause_black_24dp); builder.setContentDescription(R.id.notification_pause, getString(!recording ? R.string.record_button : R.string.pause_button)); - builder.setTheme(getAppTheme()) - .setChannel(CHANNEL_STATUS) + builder.setTheme(AudioApplication.getTheme(this, R.style.RecThemeLight, R.style.RecThemeDark)) + .setChannel(AudioApplication.from(this).channelStatus) .setImageViewTint(R.id.icon_circle, builder.getThemeColor(R.attr.colorButtonNormal)) .setTitle(title) .setText(text) @@ -268,7 +258,7 @@ public class RecordingService extends PersistentService { @Override public void updateIcon() { - super.updateIcon(new Intent()); + updateIcon(new Intent()); } @Override From 158e7acc2b6526e7f06af57d2cb220eba79943f4 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Sun, 19 May 2019 19:26:47 +0300 Subject: [PATCH 3/7] add adaptive icons --- app/src/main/AndroidManifest.xml | 3 +- .../audiorecorder/app/AudioApplication.java | 2 +- .../services/RecordingService.java | 8 +- ...c_mic.png => ic_launcher_notification.png} | Bin ...c_mic.png => ic_launcher_notification.png} | Bin ...c_mic.png => ic_launcher_notification.png} | Bin ...c_mic.png => ic_launcher_notification.png} | Bin ...c_mic.png => ic_launcher_notification.png} | Bin ...c_mic.png => ic_launcher_notification.png} | Bin ...c_mic.png => ic_launcher_notification.png} | Bin ...c_mic.png => ic_launcher_notification.png} | Bin .../res/drawable/ic_launcher_background.xml | 170 ++++++++++++++++++ .../res/drawable/ic_launcher_foreground.xml | 15 ++ .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 + build.gradle | 2 +- 15 files changed, 198 insertions(+), 7 deletions(-) rename app/src/main/res/drawable-hdpi-v11/{ic_mic.png => ic_launcher_notification.png} (100%) rename app/src/main/res/drawable-hdpi/{ic_mic.png => ic_launcher_notification.png} (100%) rename app/src/main/res/drawable-mdpi-v11/{ic_mic.png => ic_launcher_notification.png} (100%) rename app/src/main/res/drawable-mdpi/{ic_mic.png => ic_launcher_notification.png} (100%) rename app/src/main/res/drawable-xhdpi-v11/{ic_mic.png => ic_launcher_notification.png} (100%) rename app/src/main/res/drawable-xhdpi/{ic_mic.png => ic_launcher_notification.png} (100%) rename app/src/main/res/drawable-xxhdpi-v11/{ic_mic.png => ic_launcher_notification.png} (100%) rename app/src/main/res/drawable-xxhdpi/{ic_mic.png => ic_launcher_notification.png} (100%) create mode 100644 app/src/main/res/drawable/ic_launcher_background.xml create mode 100644 app/src/main/res/drawable/ic_launcher_foreground.xml create mode 100644 app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8b35467..f96d923 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -19,13 +19,14 @@ android:allowBackup="true" android:icon="@mipmap/ic_launcher" android:label="@string/app_name" + android:roundIcon="@mipmap/ic_launcher" android:supportsRtl="true" android:theme="@style/RecThemeLight"> diff --git a/app/src/main/java/com/github/axet/audiorecorder/app/AudioApplication.java b/app/src/main/java/com/github/axet/audiorecorder/app/AudioApplication.java index e0b9d5d..5d521a3 100644 --- a/app/src/main/java/com/github/axet/audiorecorder/app/AudioApplication.java +++ b/app/src/main/java/com/github/axet/audiorecorder/app/AudioApplication.java @@ -437,7 +437,7 @@ public class AudioApplication extends com.github.axet.audiolibrary.app.MainAppli .setText(text) .setMainIntent(main) .setChannel(channelStatus) - .setSmallIcon(R.drawable.ic_mic); + .setSmallIcon(R.drawable.ic_launcher_notification); NotificationManagerCompat nm = NotificationManagerCompat.from(this); nm.notify((int) System.currentTimeMillis(), builder.build()); } 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 883075f..ee84eda 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 @@ -18,7 +18,6 @@ import android.widget.RemoteViews; import com.github.axet.androidlibrary.app.AlarmManager; import com.github.axet.androidlibrary.services.PersistentService; -import com.github.axet.androidlibrary.widgets.NotificationChannelCompat; import com.github.axet.androidlibrary.widgets.OptimizationPreferenceCompat; import com.github.axet.androidlibrary.widgets.ProximityShader; import com.github.axet.androidlibrary.widgets.RemoteNotificationCompat; @@ -88,7 +87,7 @@ public class RecordingService extends PersistentService { } public static void startService(Context context, String targetFile, boolean recording, boolean encoding, String duration) { - OptimizationPreferenceCompat.startService(context, new Intent(context, RecordingService.class) + start(context, new Intent(context, RecordingService.class) .putExtra("targetFile", targetFile) .putExtra("recording", recording) .putExtra("encoding", encoding) @@ -250,8 +249,9 @@ public class RecordingService extends PersistentService { .setText(text) .setWhen(notification) .setMainIntent(main) - .setOngoing(true) - .setSmallIcon(R.drawable.ic_mic); + .setAdaptiveIcon(R.drawable.ic_launcher_foreground) + .setSmallIcon(R.drawable.ic_launcher_notification) + .setOngoing(true); return builder.build(); } diff --git a/app/src/main/res/drawable-hdpi-v11/ic_mic.png b/app/src/main/res/drawable-hdpi-v11/ic_launcher_notification.png similarity index 100% rename from app/src/main/res/drawable-hdpi-v11/ic_mic.png rename to app/src/main/res/drawable-hdpi-v11/ic_launcher_notification.png diff --git a/app/src/main/res/drawable-hdpi/ic_mic.png b/app/src/main/res/drawable-hdpi/ic_launcher_notification.png similarity index 100% rename from app/src/main/res/drawable-hdpi/ic_mic.png rename to app/src/main/res/drawable-hdpi/ic_launcher_notification.png diff --git a/app/src/main/res/drawable-mdpi-v11/ic_mic.png b/app/src/main/res/drawable-mdpi-v11/ic_launcher_notification.png similarity index 100% rename from app/src/main/res/drawable-mdpi-v11/ic_mic.png rename to app/src/main/res/drawable-mdpi-v11/ic_launcher_notification.png diff --git a/app/src/main/res/drawable-mdpi/ic_mic.png b/app/src/main/res/drawable-mdpi/ic_launcher_notification.png similarity index 100% rename from app/src/main/res/drawable-mdpi/ic_mic.png rename to app/src/main/res/drawable-mdpi/ic_launcher_notification.png diff --git a/app/src/main/res/drawable-xhdpi-v11/ic_mic.png b/app/src/main/res/drawable-xhdpi-v11/ic_launcher_notification.png similarity index 100% rename from app/src/main/res/drawable-xhdpi-v11/ic_mic.png rename to app/src/main/res/drawable-xhdpi-v11/ic_launcher_notification.png diff --git a/app/src/main/res/drawable-xhdpi/ic_mic.png b/app/src/main/res/drawable-xhdpi/ic_launcher_notification.png similarity index 100% rename from app/src/main/res/drawable-xhdpi/ic_mic.png rename to app/src/main/res/drawable-xhdpi/ic_launcher_notification.png diff --git a/app/src/main/res/drawable-xxhdpi-v11/ic_mic.png b/app/src/main/res/drawable-xxhdpi-v11/ic_launcher_notification.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi-v11/ic_mic.png rename to app/src/main/res/drawable-xxhdpi-v11/ic_launcher_notification.png diff --git a/app/src/main/res/drawable-xxhdpi/ic_mic.png b/app/src/main/res/drawable-xxhdpi/ic_launcher_notification.png similarity index 100% rename from app/src/main/res/drawable-xxhdpi/ic_mic.png rename to app/src/main/res/drawable-xxhdpi/ic_launcher_notification.png diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml new file mode 100644 index 0000000..0d025f9 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_background.xml @@ -0,0 +1,170 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..6bc81af --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,15 @@ + + + + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml new file mode 100644 index 0000000..eca70cf --- /dev/null +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/build.gradle b/build.gradle index 6345f44..c2fb838 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.4.0' + classpath 'com.android.tools.build:gradle:3.4.1' classpath 'com.github.axet:gradle-android-dx:0.0.4' } } From 17a2c977434d9584d5a57af12a38fa498b4ef6de Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Mon, 20 May 2019 17:31:09 +0300 Subject: [PATCH 4/7] cleanups --- app/src/main/res/layout/remoteview_header.xml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/src/main/res/layout/remoteview_header.xml b/app/src/main/res/layout/remoteview_header.xml index 9abe339..6e4ee3f 100644 --- a/app/src/main/res/layout/remoteview_header.xml +++ b/app/src/main/res/layout/remoteview_header.xml @@ -18,6 +18,7 @@ android:id="@+id/icon_circle" android:layout_width="match_parent" android:layout_height="match_parent" + android:layout_gravity="center" android:src="@drawable/ic_circle" /> Date: Wed, 22 May 2019 08:12:55 +0300 Subject: [PATCH 5/7] restore bw icon --- .../res/drawable/ic_launcher_background.xml | 170 ------------------ .../res/drawable/ic_launcher_foreground.xml | 2 +- .../res/mipmap-anydpi-v26/ic_launcher.xml | 2 +- 3 files changed, 2 insertions(+), 172 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_launcher_background.xml diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml deleted file mode 100644 index 0d025f9..0000000 --- a/app/src/main/res/drawable/ic_launcher_background.xml +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index 6bc81af..1cd0dd2 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -9,7 +9,7 @@ android:scaleX="0.6" android:scaleY="0.6"> diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index eca70cf..b3e51b2 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,5 +1,5 @@ - + \ No newline at end of file From 4fbcde7a26f7a20378a113bed3b77bef9366aed2 Mon Sep 17 00:00:00 2001 From: Alexey Kuznetsov Date: Wed, 22 May 2019 17:44:12 +0300 Subject: [PATCH 6/7] ceanups --- app/build.gradle | 4 ++-- .../github/axet/audiorecorder/activities/MainActivity.java | 2 +- app/src/main/res/menu/menu_main.xml | 2 +- app/src/main/res/{values-zh-rCH => values-zh-rCN}/strings.xml | 0 4 files changed, 4 insertions(+), 4 deletions(-) rename app/src/main/res/{values-zh-rCH => values-zh-rCN}/strings.xml (100%) diff --git a/app/build.gradle b/app/build.gradle index 99df9c5..67fbe92 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -53,6 +53,6 @@ android { dependencies { testImplementation 'junit:junit:4.12' - implementation 'com.github.axet:android-audio-library:1.0.152' // implementation project(':android-audio-library') - assets('com.google.android.exoplayer:exoplayer:2.7.3') { exclude group: 'com.android.support' } + implementation 'com.github.axet:android-audio-library:1.0.153' // implementation project(':android-audio-library') + assets('com.google.android.exoplayer:exoplayer:2.8.4') { exclude group: 'com.android.support' } } 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 96798b6..3f56fe9 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 @@ -152,7 +152,7 @@ public class MainActivity extends AppCompatThemeActivity { MenuItem search = menu.findItem(R.id.action_search); final SearchView searchView = (SearchView) MenuItemCompat.getActionView(search); - searchView.setOnQueryTextListener(new android.support.v7.widget.SearchView.OnQueryTextListener() { + searchView.setOnQueryTextListener(new SearchView.OnQueryTextListener() { @Override public boolean onQueryTextSubmit(String query) { searchView.clearFocus(); diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml index 52dc26b..2fe9746 100644 --- a/app/src/main/res/menu/menu_main.xml +++ b/app/src/main/res/menu/menu_main.xml @@ -7,7 +7,7 @@ android:icon="@drawable/ic_search_white_24dp" android:title="@string/menu_search" app:actionViewClass="com.github.axet.androidlibrary.widgets.SearchView" - app:showAsAction="collapseActionView|ifRoom" /> + app:showAsAction="collapseActionView|always" /> Date: Wed, 22 May 2019 17:44:20 +0300 Subject: [PATCH 7/7] Bump version audiorecorder-3.2.63 --- app/build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 67fbe92..7f5f1a1 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,8 +9,8 @@ android { applicationId "com.github.axet.audiorecorder" minSdkVersion 9 targetSdkVersion 26 - versionCode 320 - versionName "3.2.62" + versionCode 321 + versionName "3.2.63" } signingConfigs { release {