diff options
author | cyberta <cyberta@riseup.net> | 2020-03-17 08:15:56 -0700 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2020-03-17 08:15:56 -0700 |
commit | e0fb2a88c633908bba9e465e1bf1e19a4a5686e6 (patch) | |
tree | 781613cce835be44ea86178f8af6cb60a84a703e /app/src/main/java/se/leap/bitmaskclient/MainActivity.java | |
parent | 05205190ee65a5fa14f18d12f86f5427368bea44 (diff) | |
parent | cea55aaaab23a74dc790afca12671303fc344f97 (diff) |
Merge branch 'androidx' into 'master'
Androidx
See merge request leap/bitmask_android!103
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/MainActivity.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/MainActivity.java | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java index 39c4a8f1..4239a3e4 100644 --- a/app/src/main/java/se/leap/bitmaskclient/MainActivity.java +++ b/app/src/main/java/se/leap/bitmaskclient/MainActivity.java @@ -20,12 +20,12 @@ package se.leap.bitmaskclient; import android.content.Intent; import android.content.SharedPreferences; import android.os.Bundle; -import android.support.annotation.StringRes; -import android.support.v4.app.DialogFragment; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentTransaction; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatActivity; +import androidx.annotation.StringRes; +import androidx.fragment.app.DialogFragment; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; +import androidx.appcompat.app.ActionBar; +import androidx.appcompat.app.AppCompatActivity; import android.util.Log; import org.json.JSONException; |