Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 20776b1c authored by stefan-niedermann's avatar stefan-niedermann
Browse files

Merge remote-tracking branch 'origin/androidx'

# Conflicts:
#	app/src/main/java/it/niedermann/owncloud/notes/android/fragment/BaseNoteFragment.java
parents e3d4e87d 7845ea87
Loading
Loading
Loading
Loading
+3 MiB

File added.

No diff preview for this file type.

+1 −0
Original line number Diff line number Diff line
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":37,"versionName":"0.22.3","enabled":true,"outputFile":"app-release.apk","fullName":"release","baseName":"release"},"path":"app-release.apk","properties":{}}]
 No newline at end of file
+3 −0
Original line number Diff line number Diff line
@@ -8,6 +8,9 @@ import android.os.Build;
import android.os.Bundle;
import android.text.SpannableString;
import android.text.TextUtils;
import androidx.annotation.Nullable;
import androidx.core.view.MenuItemCompat;
import androidx.appcompat.widget.ShareActionProvider;
import android.util.Log;
import android.view.Menu;
import android.view.MenuInflater;