From c4a202f4e8f36233d696d38a7680e8c8e0d9be63 Mon Sep 17 00:00:00 2001 From: Anthony Chen Date: Mon, 16 Apr 2018 16:20:44 -0700 Subject: Migrate to androidx namespace for support library. Fixes: 77483560 Test: build KitchenSink, deploy and test through fragments Test: build and launch UxRestrictionsSample Change-Id: I539c71464f5a486c9a9373bbbcae8ac14d24e477 Merged-In: I539c71464f5a486c9a9373bbbcae8ac14d24e477 (cherry picked from commit d12cd7712b0498fac816bc1fa10299a1127f711b) --- tests/EmbeddedKitchenSinkApp/Android.mk | 2 +- .../src/com/google/android/car/kitchensink/KitchenSinkActivity.java | 2 +- .../car/kitchensink/activityview/ActivityViewTestFragment.java | 5 +++-- .../android/car/kitchensink/alertdialog/AlertDialogTestFragment.java | 3 ++- .../android/car/kitchensink/assistant/CarAssistantFragment.java | 5 +++-- .../com/google/android/car/kitchensink/audio/AudioTestFragment.java | 3 ++- .../android/car/kitchensink/bluetooth/BluetoothHeadsetFragment.java | 5 +++-- .../google/android/car/kitchensink/bluetooth/MapMceTestFragment.java | 5 +++-- .../android/car/kitchensink/cluster/InstrumentClusterFragment.java | 5 +++-- .../android/car/kitchensink/connectivity/ConnectivityFragment.java | 3 ++- .../com/google/android/car/kitchensink/cube/CubesTestFragment.java | 3 ++- .../android/car/kitchensink/diagnostic/DiagnosticTestFragment.java | 3 ++- .../android/car/kitchensink/displayinfo/DisplayInfoFragment.java | 3 ++- .../com/google/android/car/kitchensink/hvac/HvacTestFragment.java | 3 ++- .../com/google/android/car/kitchensink/input/InputTestFragment.java | 4 ++-- .../com/google/android/car/kitchensink/job/JobSchedulerFragment.java | 5 +++-- .../android/car/kitchensink/notification/NotificationFragment.java | 3 ++- .../android/car/kitchensink/orientation/OrientationTestFragment.java | 5 +++-- .../com/google/android/car/kitchensink/power/PowerTestFragment.java | 3 ++- .../android/car/kitchensink/property/PropertyTestFragment.java | 3 ++- .../google/android/car/kitchensink/sensor/SensorsTestFragment.java | 3 ++- .../car/kitchensink/storagelifetime/StorageLifetimeFragment.java | 3 ++- .../com/google/android/car/kitchensink/touch/TouchTestFragment.java | 3 ++- .../com/google/android/car/kitchensink/vhal/VehicleHalFragment.java | 3 ++- .../google/android/car/kitchensink/volume/VolumeTestFragment.java | 5 +++-- 25 files changed, 56 insertions(+), 34 deletions(-) diff --git a/tests/EmbeddedKitchenSinkApp/Android.mk b/tests/EmbeddedKitchenSinkApp/Android.mk index 7a8c1459..71adf6b3 100644 --- a/tests/EmbeddedKitchenSinkApp/Android.mk +++ b/tests/EmbeddedKitchenSinkApp/Android.mk @@ -41,7 +41,7 @@ LOCAL_PROGUARD_ENABLED := disabled LOCAL_DEX_PREOPT := false LOCAL_STATIC_ANDROID_LIBRARIES += \ - android-support-car \ + androidx.car_car \ car-service-lib-for-test LOCAL_STATIC_JAVA_LIBRARIES += \ diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java index caca03af..9453bf71 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java @@ -30,12 +30,12 @@ import android.support.car.Car; import android.support.car.CarAppFocusManager; import android.support.car.CarConnectionCallback; import android.support.car.CarNotConnectedException; -import android.support.v4.app.Fragment; import android.util.Log; import androidx.car.drawer.CarDrawerActivity; import androidx.car.drawer.CarDrawerAdapter; import androidx.car.drawer.DrawerItemViewHolder; +import androidx.fragment.app.Fragment; import com.google.android.car.kitchensink.activityview.ActivityViewTestFragment; import com.google.android.car.kitchensink.alertdialog.AlertDialogTestFragment; diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/activityview/ActivityViewTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/activityview/ActivityViewTestFragment.java index 2df0b07d..a41427db 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/activityview/ActivityViewTestFragment.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/activityview/ActivityViewTestFragment.java @@ -21,12 +21,13 @@ import android.content.ComponentName; import android.content.Intent; import android.os.Bundle; import android.os.SystemClock; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + import com.google.android.car.kitchensink.R; import java.util.Random; diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/alertdialog/AlertDialogTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/alertdialog/AlertDialogTestFragment.java index f2f5712e..324df020 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/alertdialog/AlertDialogTestFragment.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/alertdialog/AlertDialogTestFragment.java @@ -19,12 +19,13 @@ import android.annotation.Nullable; import android.app.AlertDialog; import android.content.DialogInterface; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import androidx.fragment.app.Fragment; + import com.google.android.car.kitchensink.R; /** diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/assistant/CarAssistantFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/assistant/CarAssistantFragment.java index 4bee4532..9f3ab1a8 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/assistant/CarAssistantFragment.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/assistant/CarAssistantFragment.java @@ -18,8 +18,6 @@ package com.google.android.car.kitchensink.assistant; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.view.HapticFeedbackConstants; import android.view.LayoutInflater; import android.view.View; @@ -27,6 +25,9 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.Toast; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + import com.google.android.car.kitchensink.R; public class CarAssistantFragment extends Fragment { diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/audio/AudioTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/audio/AudioTestFragment.java index 626dc2a3..6325512a 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/audio/AudioTestFragment.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/audio/AudioTestFragment.java @@ -31,7 +31,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.IBinder; import android.os.Looper; -import android.support.v4.app.Fragment; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -42,6 +41,8 @@ import android.widget.TextView; import android.widget.Toast; import android.widget.ToggleButton; +import androidx.fragment.app.Fragment; + import com.google.android.car.kitchensink.CarEmulator; import com.google.android.car.kitchensink.R; diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/bluetooth/BluetoothHeadsetFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/bluetooth/BluetoothHeadsetFragment.java index a98d49e0..2d57d28a 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/bluetooth/BluetoothHeadsetFragment.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/bluetooth/BluetoothHeadsetFragment.java @@ -26,8 +26,6 @@ import android.content.Context; import android.content.Intent; import android.content.IntentFilter; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -35,6 +33,9 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + import com.google.android.car.kitchensink.R; public class BluetoothHeadsetFragment extends Fragment { diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/bluetooth/MapMceTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/bluetooth/MapMceTestFragment.java index 6a724282..2d9df69b 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/bluetooth/MapMceTestFragment.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/bluetooth/MapMceTestFragment.java @@ -32,8 +32,6 @@ import android.content.pm.PackageManager; import android.net.Uri; import android.os.Build; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.telecom.PhoneAccount; import android.util.Log; import android.view.LayoutInflater; @@ -45,6 +43,9 @@ import android.widget.EditText; import android.widget.TextView; import android.widget.Toast; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + import com.google.android.car.kitchensink.KitchenSinkActivity; import com.google.android.car.kitchensink.R; diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cluster/InstrumentClusterFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cluster/InstrumentClusterFragment.java index 748ea68f..8e4483e4 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cluster/InstrumentClusterFragment.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cluster/InstrumentClusterFragment.java @@ -20,19 +20,20 @@ import android.car.cluster.CarInstrumentClusterManager; import android.content.Intent; import android.content.pm.PackageManager; import android.os.Bundle; -import android.support.annotation.Nullable; import android.support.car.Car; import android.support.car.CarAppFocusManager; import android.support.car.CarConnectionCallback; import android.support.car.CarNotConnectedException; import android.support.car.navigation.CarNavigationStatusManager; -import android.support.v4.app.Fragment; import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Toast; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + import com.google.android.car.kitchensink.R; /** diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/connectivity/ConnectivityFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/connectivity/ConnectivityFragment.java index 0ffa6bf3..3c04bcbf 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/connectivity/ConnectivityFragment.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/connectivity/ConnectivityFragment.java @@ -26,7 +26,6 @@ import android.net.NetworkInfo; import android.net.NetworkRequest; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.Fragment; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -35,6 +34,8 @@ import android.widget.ArrayAdapter; import android.widget.ListView; import android.widget.Toast; +import androidx.fragment.app.Fragment; + import com.google.android.car.kitchensink.R; import java.util.ArrayList; diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cube/CubesTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cube/CubesTestFragment.java index b149df57..209d98d1 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cube/CubesTestFragment.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cube/CubesTestFragment.java @@ -18,12 +18,13 @@ package com.google.android.car.kitchensink.cube; import android.opengl.GLSurfaceView; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.MotionEvent; import android.view.View; import android.view.ViewGroup; +import androidx.fragment.app.Fragment; + import com.google.android.car.kitchensink.R; public class CubesTestFragment extends Fragment { diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/diagnostic/DiagnosticTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/diagnostic/DiagnosticTestFragment.java index e2b452c8..55698482 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/diagnostic/DiagnosticTestFragment.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/diagnostic/DiagnosticTestFragment.java @@ -24,13 +24,14 @@ import android.car.diagnostic.CarDiagnosticManager.OnDiagnosticEventListener; import android.graphics.Color; import android.os.Bundle; import android.support.car.hardware.CarSensorManager; -import android.support.v4.app.Fragment; import android.util.Log; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.fragment.app.Fragment; + import com.google.android.car.kitchensink.KitchenSinkActivity; import com.google.android.car.kitchensink.R; diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/displayinfo/DisplayInfoFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/displayinfo/DisplayInfoFragment.java index bae2253a..ac0bdae9 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/displayinfo/DisplayInfoFragment.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/displayinfo/DisplayInfoFragment.java @@ -20,7 +20,6 @@ import android.content.Context; import android.content.res.Resources; import android.graphics.Point; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.util.DisplayMetrics; import android.view.LayoutInflater; import android.view.View; @@ -28,6 +27,8 @@ import android.view.ViewGroup; import android.widget.LinearLayout; import android.widget.TextView; +import androidx.fragment.app.Fragment; + import com.google.android.car.kitchensink.R; /** diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/hvac/HvacTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/hvac/HvacTestFragment.java index c7b80e84..f56b4870 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/hvac/HvacTestFragment.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/hvac/HvacTestFragment.java @@ -26,7 +26,6 @@ import android.hardware.automotive.vehicle.V2_0.VehicleAreaSeat; import android.hardware.automotive.vehicle.V2_0.VehicleAreaWindow; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.Fragment; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -37,6 +36,8 @@ import android.widget.RadioGroup; import android.widget.TextView; import android.widget.ToggleButton; +import androidx.fragment.app.Fragment; + import com.google.android.car.kitchensink.KitchenSinkActivity; import com.google.android.car.kitchensink.R; diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/input/InputTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/input/InputTestFragment.java index 19ad0943..34ea1cf7 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/input/InputTestFragment.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/input/InputTestFragment.java @@ -30,13 +30,11 @@ import android.hardware.automotive.vehicle.V2_0.SubscribeOptions; import android.hardware.automotive.vehicle.V2_0.VehicleArea; import android.hardware.automotive.vehicle.V2_0.VehicleDisplay; import android.hardware.automotive.vehicle.V2_0.VehiclePropValue; -import android.hardware.automotive.vehicle.V2_0.VehicleProperty; import android.hardware.automotive.vehicle.V2_0.VehiclePropertyGroup; import android.hardware.automotive.vehicle.V2_0.VehiclePropertyStatus; import android.hardware.automotive.vehicle.V2_0.VehiclePropertyType; import android.os.Bundle; import android.os.RemoteException; -import android.support.v4.app.Fragment; import android.text.method.ScrollingMovementMethod; import android.util.Log; import android.view.KeyEvent; @@ -48,6 +46,8 @@ import android.widget.LinearLayout; import android.widget.TextView; import android.widget.Toast; +import androidx.fragment.app.Fragment; + import com.android.car.keventreader.EventReaderService; import com.android.car.keventreader.IEventCallback; import com.android.car.keventreader.KeypressEvent; diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/job/JobSchedulerFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/job/JobSchedulerFragment.java index 3cf96e4d..b82818f7 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/job/JobSchedulerFragment.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/job/JobSchedulerFragment.java @@ -22,8 +22,6 @@ import android.content.Context; import android.content.SharedPreferences; import android.os.Bundle; import android.os.PersistableBundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -35,6 +33,9 @@ import android.widget.RadioGroup; import android.widget.TextView; import android.widget.Toast; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + import com.google.android.car.kitchensink.R; import java.util.List; diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/notification/NotificationFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/notification/NotificationFragment.java index 5f882599..7a26f932 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/notification/NotificationFragment.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/notification/NotificationFragment.java @@ -12,12 +12,13 @@ import android.app.RemoteInput; import android.content.Context; import android.content.Intent; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import androidx.fragment.app.Fragment; + import com.google.android.car.kitchensink.KitchenSinkActivity; import com.google.android.car.kitchensink.R; diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/orientation/OrientationTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/orientation/OrientationTestFragment.java index ef49ae49..b81104b7 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/orientation/OrientationTestFragment.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/orientation/OrientationTestFragment.java @@ -18,13 +18,14 @@ package com.google.android.car.kitchensink.orientation; import android.content.Intent; import android.os.Bundle; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.Button; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + import com.google.android.car.kitchensink.R; public class OrientationTestFragment extends Fragment { diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/power/PowerTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/power/PowerTestFragment.java index 9a6c2b92..d24148d2 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/power/PowerTestFragment.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/power/PowerTestFragment.java @@ -23,7 +23,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.PowerManager; import android.os.SystemClock; -import android.support.v4.app.Fragment; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -31,6 +30,8 @@ import android.view.ViewGroup; import android.widget.Button; import android.widget.TextView; +import androidx.fragment.app.Fragment; + import com.google.android.car.kitchensink.KitchenSinkActivity; import com.google.android.car.kitchensink.R; diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/property/PropertyTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/property/PropertyTestFragment.java index ff1c402f..83bbfa96 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/property/PropertyTestFragment.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/property/PropertyTestFragment.java @@ -27,7 +27,6 @@ import android.hardware.automotive.vehicle.V2_0.VehicleProperty; import android.hardware.automotive.vehicle.V2_0.VehiclePropertyType; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.Fragment; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -43,6 +42,8 @@ import android.widget.Spinner; import android.widget.TextView; import android.widget.Toast; +import androidx.fragment.app.Fragment; + import com.google.android.car.kitchensink.KitchenSinkActivity; import com.google.android.car.kitchensink.R; diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/sensor/SensorsTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/sensor/SensorsTestFragment.java index 1440ff05..39392b9c 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/sensor/SensorsTestFragment.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/sensor/SensorsTestFragment.java @@ -28,7 +28,6 @@ import android.car.hardware.CarSensorManager; import android.content.pm.PackageManager; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.Fragment; import android.text.TextUtils; import android.util.Log; import android.view.LayoutInflater; @@ -36,6 +35,8 @@ import android.view.View; import android.view.ViewGroup; import android.widget.TextView; +import androidx.fragment.app.Fragment; + import com.google.android.car.kitchensink.KitchenSinkActivity; import com.google.android.car.kitchensink.R; diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/storagelifetime/StorageLifetimeFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/storagelifetime/StorageLifetimeFragment.java index fc4052e4..bf7af5db 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/storagelifetime/StorageLifetimeFragment.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/storagelifetime/StorageLifetimeFragment.java @@ -27,7 +27,6 @@ import android.car.storagemonitoring.IoStats; import android.car.storagemonitoring.IoStatsEntry; import android.os.Bundle; import android.os.StatFs; -import android.support.v4.app.Fragment; import android.system.ErrnoException; import android.util.Log; import android.view.LayoutInflater; @@ -37,6 +36,8 @@ import android.widget.ArrayAdapter; import android.widget.ListView; import android.widget.TextView; +import androidx.fragment.app.Fragment; + import com.google.android.car.kitchensink.KitchenSinkActivity; import com.google.android.car.kitchensink.R; diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/touch/TouchTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/touch/TouchTestFragment.java index fe2c3856..2cb0a64f 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/touch/TouchTestFragment.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/touch/TouchTestFragment.java @@ -17,11 +17,12 @@ package com.google.android.car.kitchensink.touch; import android.os.Bundle; -import android.support.v4.app.Fragment; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; +import androidx.fragment.app.Fragment; + import com.google.android.car.kitchensink.R; public class TouchTestFragment extends Fragment { diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/vhal/VehicleHalFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/vhal/VehicleHalFragment.java index ac62505d..df5f0fc6 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/vhal/VehicleHalFragment.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/vhal/VehicleHalFragment.java @@ -24,7 +24,6 @@ import android.hardware.automotive.vehicle.V2_0.VehiclePropConfig; import android.hardware.automotive.vehicle.V2_0.VehicleProperty; import android.os.Bundle; import android.os.RemoteException; -import android.support.v4.app.Fragment; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -34,6 +33,8 @@ import android.widget.AdapterView.OnItemClickListener; import android.widget.ArrayAdapter; import android.widget.ListView; +import androidx.fragment.app.Fragment; + import com.google.android.car.kitchensink.KitchenSinkActivity; import com.google.android.car.kitchensink.R; diff --git a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/volume/VolumeTestFragment.java b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/volume/VolumeTestFragment.java index 800d6507..066f46a0 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/volume/VolumeTestFragment.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/volume/VolumeTestFragment.java @@ -26,8 +26,6 @@ import android.os.Bundle; import android.os.Handler; import android.os.IBinder; import android.os.Message; -import android.support.annotation.Nullable; -import android.support.v4.app.Fragment; import android.util.Log; import android.util.SparseIntArray; import android.view.LayoutInflater; @@ -36,6 +34,9 @@ import android.view.ViewGroup; import android.widget.ListView; import android.widget.SeekBar; +import androidx.annotation.Nullable; +import androidx.fragment.app.Fragment; + import com.google.android.car.kitchensink.R; public class VolumeTestFragment extends Fragment { -- cgit v1.2.3-54-g00ecf