From be9ed3ffc9b00c97e8513bbfab23b8e16329bc4b Mon Sep 17 00:00:00 2001 From: Mike Beattie Date: Thu, 19 Sep 2019 10:25:09 +1200 Subject: [PATCH] Convert to AndroidX from support_v4 Signed-off-by: Mike Beattie --- .../main/java/org/altusmetrum/AltosDroid/AltosDroid.java | 4 ++-- .../java/org/altusmetrum/AltosDroid/AltosDroidTab.java | 4 ++-- .../java/org/altusmetrum/AltosDroid/AltosViewPager.java | 2 +- .../main/java/org/altusmetrum/AltosDroid/TabsAdapter.java | 8 ++++---- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroid.java index 52902127..f2e0acd7 100644 --- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroid.java +++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroid.java @@ -35,8 +35,8 @@ import android.os.Handler; import android.os.Message; import android.os.Messenger; import android.os.RemoteException; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentManager; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentManager; import android.view.*; import android.widget.*; import android.app.AlertDialog; diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidTab.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidTab.java index 5a0ce219..4f0fb1fa 100644 --- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidTab.java +++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosDroidTab.java @@ -21,8 +21,8 @@ package org.altusmetrum.AltosDroid; import org.altusmetrum.altoslib_13.*; import android.location.Location; import android.app.Activity; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentTransaction; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentTransaction; import android.widget.TextView; public abstract class AltosDroidTab extends Fragment implements AltosUnitsListener { diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosViewPager.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosViewPager.java index 039ba149..abe3a454 100644 --- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosViewPager.java +++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/AltosViewPager.java @@ -19,7 +19,7 @@ package org.altusmetrum.AltosDroid; import android.content.Context; -import android.support.v4.view.ViewPager; +import androidx.viewpager.widget.ViewPager; import android.util.AttributeSet; import android.view.View; diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabsAdapter.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabsAdapter.java index aaa7d3c9..31580801 100644 --- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabsAdapter.java +++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabsAdapter.java @@ -20,10 +20,10 @@ import java.util.ArrayList; import android.content.Context; import android.os.Bundle; -import android.support.v4.app.Fragment; -import android.support.v4.app.FragmentActivity; -import android.support.v4.app.FragmentPagerAdapter; -import android.support.v4.view.ViewPager; +import androidx.fragment.app.Fragment; +import androidx.fragment.app.FragmentActivity; +import androidx.fragment.app.FragmentPagerAdapter; +import androidx.viewpager.widget.ViewPager; import android.view.View; import android.view.ViewGroup; import android.widget.TabHost; -- 2.30.2