summaryrefslogtreecommitdiff
path: root/app/src/main/java/se/leap/bitmaskclient/views/ProviderHeaderView.java
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2020-03-17 08:15:56 -0700
committercyberta <cyberta@riseup.net>2020-03-17 08:15:56 -0700
commite0fb2a88c633908bba9e465e1bf1e19a4a5686e6 (patch)
tree781613cce835be44ea86178f8af6cb60a84a703e /app/src/main/java/se/leap/bitmaskclient/views/ProviderHeaderView.java
parent05205190ee65a5fa14f18d12f86f5427368bea44 (diff)
parentcea55aaaab23a74dc790afca12671303fc344f97 (diff)
Merge branch 'androidx' into 'master'
Androidx See merge request leap/bitmask_android!103
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/views/ProviderHeaderView.java')
-rw-r--r--app/src/main/java/se/leap/bitmaskclient/views/ProviderHeaderView.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/views/ProviderHeaderView.java b/app/src/main/java/se/leap/bitmaskclient/views/ProviderHeaderView.java
index ab5d6bc8..4fa3771b 100644
--- a/app/src/main/java/se/leap/bitmaskclient/views/ProviderHeaderView.java
+++ b/app/src/main/java/se/leap/bitmaskclient/views/ProviderHeaderView.java
@@ -1,11 +1,11 @@
package se.leap.bitmaskclient.views;
import android.content.Context;
-import android.support.annotation.DrawableRes;
-import android.support.annotation.RequiresApi;
-import android.support.annotation.StringRes;
-import android.support.v7.widget.AppCompatImageView;
-import android.support.v7.widget.AppCompatTextView;
+import androidx.annotation.DrawableRes;
+import androidx.annotation.RequiresApi;
+import androidx.annotation.StringRes;
+import androidx.appcompat.widget.AppCompatImageView;
+import androidx.appcompat.widget.AppCompatTextView;
import android.util.AttributeSet;
import android.view.LayoutInflater;
import android.view.View;