summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnthony Chen2018-04-16 18:20:44 -0500
committerColin Cross2018-08-29 18:42:11 -0500
commitc4a202f4e8f36233d696d38a7680e8c8e0d9be63 (patch)
tree6eb1b7fcc90bc1a0b881f93f0a87484d95057114
parentc6be349b57727b9f8a6cf5a703b933fd69527f59 (diff)
downloadplatform-packages-services-car-c4a202f4e8f36233d696d38a7680e8c8e0d9be63.tar.gz
platform-packages-services-car-c4a202f4e8f36233d696d38a7680e8c8e0d9be63.tar.xz
platform-packages-services-car-c4a202f4e8f36233d696d38a7680e8c8e0d9be63.zip
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)
-rw-r--r--tests/EmbeddedKitchenSinkApp/Android.mk2
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java2
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/activityview/ActivityViewTestFragment.java5
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/alertdialog/AlertDialogTestFragment.java3
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/assistant/CarAssistantFragment.java5
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/audio/AudioTestFragment.java3
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/bluetooth/BluetoothHeadsetFragment.java5
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/bluetooth/MapMceTestFragment.java5
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cluster/InstrumentClusterFragment.java5
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/connectivity/ConnectivityFragment.java3
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/cube/CubesTestFragment.java3
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/diagnostic/DiagnosticTestFragment.java3
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/displayinfo/DisplayInfoFragment.java3
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/hvac/HvacTestFragment.java3
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/input/InputTestFragment.java4
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/job/JobSchedulerFragment.java5
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/notification/NotificationFragment.java3
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/orientation/OrientationTestFragment.java5
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/power/PowerTestFragment.java3
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/property/PropertyTestFragment.java3
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/sensor/SensorsTestFragment.java3
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/storagelifetime/StorageLifetimeFragment.java3
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/touch/TouchTestFragment.java3
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/vhal/VehicleHalFragment.java3
-rw-r--r--tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/volume/VolumeTestFragment.java5
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
41LOCAL_DEX_PREOPT := false 41LOCAL_DEX_PREOPT := false
42 42
43LOCAL_STATIC_ANDROID_LIBRARIES += \ 43LOCAL_STATIC_ANDROID_LIBRARIES += \
44 android-support-car \ 44 androidx.car_car \
45 car-service-lib-for-test 45 car-service-lib-for-test
46 46
47LOCAL_STATIC_JAVA_LIBRARIES += \ 47LOCAL_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;
30import android.support.car.CarAppFocusManager; 30import android.support.car.CarAppFocusManager;
31import android.support.car.CarConnectionCallback; 31import android.support.car.CarConnectionCallback;
32import android.support.car.CarNotConnectedException; 32import android.support.car.CarNotConnectedException;
33import android.support.v4.app.Fragment;
34import android.util.Log; 33import android.util.Log;
35 34
36import androidx.car.drawer.CarDrawerActivity; 35import androidx.car.drawer.CarDrawerActivity;
37import androidx.car.drawer.CarDrawerAdapter; 36import androidx.car.drawer.CarDrawerAdapter;
38import androidx.car.drawer.DrawerItemViewHolder; 37import androidx.car.drawer.DrawerItemViewHolder;
38import androidx.fragment.app.Fragment;
39 39
40import com.google.android.car.kitchensink.activityview.ActivityViewTestFragment; 40import com.google.android.car.kitchensink.activityview.ActivityViewTestFragment;
41import com.google.android.car.kitchensink.alertdialog.AlertDialogTestFragment; 41import 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;
21import android.content.Intent; 21import android.content.Intent;
22import android.os.Bundle; 22import android.os.Bundle;
23import android.os.SystemClock; 23import android.os.SystemClock;
24import android.support.annotation.Nullable;
25import android.support.v4.app.Fragment;
26import android.view.LayoutInflater; 24import android.view.LayoutInflater;
27import android.view.View; 25import android.view.View;
28import android.view.ViewGroup; 26import android.view.ViewGroup;
29 27
28import androidx.annotation.Nullable;
29import androidx.fragment.app.Fragment;
30
30import com.google.android.car.kitchensink.R; 31import com.google.android.car.kitchensink.R;
31 32
32import java.util.Random; 33import 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;
19import android.app.AlertDialog; 19import android.app.AlertDialog;
20import android.content.DialogInterface; 20import android.content.DialogInterface;
21import android.os.Bundle; 21import android.os.Bundle;
22import android.support.v4.app.Fragment;
23import android.view.LayoutInflater; 22import android.view.LayoutInflater;
24import android.view.View; 23import android.view.View;
25import android.view.ViewGroup; 24import android.view.ViewGroup;
26import android.widget.Button; 25import android.widget.Button;
27 26
27import androidx.fragment.app.Fragment;
28
28import com.google.android.car.kitchensink.R; 29import com.google.android.car.kitchensink.R;
29 30
30/** 31/**
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;
18import android.content.Context; 18import android.content.Context;
19import android.content.Intent; 19import android.content.Intent;
20import android.os.Bundle; 20import android.os.Bundle;
21import android.support.annotation.Nullable;
22import android.support.v4.app.Fragment;
23import android.view.HapticFeedbackConstants; 21import android.view.HapticFeedbackConstants;
24import android.view.LayoutInflater; 22import android.view.LayoutInflater;
25import android.view.View; 23import android.view.View;
@@ -27,6 +25,9 @@ import android.view.ViewGroup;
27import android.widget.ImageView; 25import android.widget.ImageView;
28import android.widget.Toast; 26import android.widget.Toast;
29 27
28import androidx.annotation.Nullable;
29import androidx.fragment.app.Fragment;
30
30import com.google.android.car.kitchensink.R; 31import com.google.android.car.kitchensink.R;
31 32
32public class CarAssistantFragment extends Fragment { 33public 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;
31import android.os.Handler; 31import android.os.Handler;
32import android.os.IBinder; 32import android.os.IBinder;
33import android.os.Looper; 33import android.os.Looper;
34import android.support.v4.app.Fragment;
35import android.util.Log; 34import android.util.Log;
36import android.view.LayoutInflater; 35import android.view.LayoutInflater;
37import android.view.View; 36import android.view.View;
@@ -42,6 +41,8 @@ import android.widget.TextView;
42import android.widget.Toast; 41import android.widget.Toast;
43import android.widget.ToggleButton; 42import android.widget.ToggleButton;
44 43
44import androidx.fragment.app.Fragment;
45
45import com.google.android.car.kitchensink.CarEmulator; 46import com.google.android.car.kitchensink.CarEmulator;
46import com.google.android.car.kitchensink.R; 47import com.google.android.car.kitchensink.R;
47 48
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;
26import android.content.Intent; 26import android.content.Intent;
27import android.content.IntentFilter; 27import android.content.IntentFilter;
28import android.os.Bundle; 28import android.os.Bundle;
29import android.support.annotation.Nullable;
30import android.support.v4.app.Fragment;
31import android.util.Log; 29import android.util.Log;
32import android.view.LayoutInflater; 30import android.view.LayoutInflater;
33import android.view.View; 31import android.view.View;
@@ -35,6 +33,9 @@ import android.view.ViewGroup;
35import android.widget.Button; 33import android.widget.Button;
36import android.widget.TextView; 34import android.widget.TextView;
37 35
36import androidx.annotation.Nullable;
37import androidx.fragment.app.Fragment;
38
38import com.google.android.car.kitchensink.R; 39import com.google.android.car.kitchensink.R;
39 40
40public class BluetoothHeadsetFragment extends Fragment { 41public 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;
32import android.net.Uri; 32import android.net.Uri;
33import android.os.Build; 33import android.os.Build;
34import android.os.Bundle; 34import android.os.Bundle;
35import android.support.annotation.Nullable;
36import android.support.v4.app.Fragment;
37import android.telecom.PhoneAccount; 35import android.telecom.PhoneAccount;
38import android.util.Log; 36import android.util.Log;
39import android.view.LayoutInflater; 37import android.view.LayoutInflater;
@@ -45,6 +43,9 @@ import android.widget.EditText;
45import android.widget.TextView; 43import android.widget.TextView;
46import android.widget.Toast; 44import android.widget.Toast;
47 45
46import androidx.annotation.Nullable;
47import androidx.fragment.app.Fragment;
48
48import com.google.android.car.kitchensink.KitchenSinkActivity; 49import com.google.android.car.kitchensink.KitchenSinkActivity;
49import com.google.android.car.kitchensink.R; 50import com.google.android.car.kitchensink.R;
50 51
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;
20import android.content.Intent; 20import android.content.Intent;
21import android.content.pm.PackageManager; 21import android.content.pm.PackageManager;
22import android.os.Bundle; 22import android.os.Bundle;
23import android.support.annotation.Nullable;
24import android.support.car.Car; 23import android.support.car.Car;
25import android.support.car.CarAppFocusManager; 24import android.support.car.CarAppFocusManager;
26import android.support.car.CarConnectionCallback; 25import android.support.car.CarConnectionCallback;
27import android.support.car.CarNotConnectedException; 26import android.support.car.CarNotConnectedException;
28import android.support.car.navigation.CarNavigationStatusManager; 27import android.support.car.navigation.CarNavigationStatusManager;
29import android.support.v4.app.Fragment;
30import android.util.Log; 28import android.util.Log;
31import android.view.LayoutInflater; 29import android.view.LayoutInflater;
32import android.view.View; 30import android.view.View;
33import android.view.ViewGroup; 31import android.view.ViewGroup;
34import android.widget.Toast; 32import android.widget.Toast;
35 33
34import androidx.annotation.Nullable;
35import androidx.fragment.app.Fragment;
36
36import com.google.android.car.kitchensink.R; 37import com.google.android.car.kitchensink.R;
37 38
38/** 39/**
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;
26import android.net.NetworkRequest; 26import android.net.NetworkRequest;
27import android.os.Bundle; 27import android.os.Bundle;
28import android.os.Handler; 28import android.os.Handler;
29import android.support.v4.app.Fragment;
30import android.util.Log; 29import android.util.Log;
31import android.view.LayoutInflater; 30import android.view.LayoutInflater;
32import android.view.View; 31import android.view.View;
@@ -35,6 +34,8 @@ import android.widget.ArrayAdapter;
35import android.widget.ListView; 34import android.widget.ListView;
36import android.widget.Toast; 35import android.widget.Toast;
37 36
37import androidx.fragment.app.Fragment;
38
38import com.google.android.car.kitchensink.R; 39import com.google.android.car.kitchensink.R;
39 40
40import java.util.ArrayList; 41import 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;
18 18
19import android.opengl.GLSurfaceView; 19import android.opengl.GLSurfaceView;
20import android.os.Bundle; 20import android.os.Bundle;
21import android.support.v4.app.Fragment;
22import android.view.LayoutInflater; 21import android.view.LayoutInflater;
23import android.view.MotionEvent; 22import android.view.MotionEvent;
24import android.view.View; 23import android.view.View;
25import android.view.ViewGroup; 24import android.view.ViewGroup;
26 25
26import androidx.fragment.app.Fragment;
27
27import com.google.android.car.kitchensink.R; 28import com.google.android.car.kitchensink.R;
28 29
29public class CubesTestFragment extends Fragment { 30public 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;
24import android.graphics.Color; 24import android.graphics.Color;
25import android.os.Bundle; 25import android.os.Bundle;
26import android.support.car.hardware.CarSensorManager; 26import android.support.car.hardware.CarSensorManager;
27import android.support.v4.app.Fragment;
28import android.util.Log; 27import android.util.Log;
29import android.view.LayoutInflater; 28import android.view.LayoutInflater;
30import android.view.View; 29import android.view.View;
31import android.view.ViewGroup; 30import android.view.ViewGroup;
32import android.widget.TextView; 31import android.widget.TextView;
33 32
33import androidx.fragment.app.Fragment;
34
34import com.google.android.car.kitchensink.KitchenSinkActivity; 35import com.google.android.car.kitchensink.KitchenSinkActivity;
35import com.google.android.car.kitchensink.R; 36import com.google.android.car.kitchensink.R;
36 37
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;
20import android.content.res.Resources; 20import android.content.res.Resources;
21import android.graphics.Point; 21import android.graphics.Point;
22import android.os.Bundle; 22import android.os.Bundle;
23import android.support.v4.app.Fragment;
24import android.util.DisplayMetrics; 23import android.util.DisplayMetrics;
25import android.view.LayoutInflater; 24import android.view.LayoutInflater;
26import android.view.View; 25import android.view.View;
@@ -28,6 +27,8 @@ import android.view.ViewGroup;
28import android.widget.LinearLayout; 27import android.widget.LinearLayout;
29import android.widget.TextView; 28import android.widget.TextView;
30 29
30import androidx.fragment.app.Fragment;
31
31import com.google.android.car.kitchensink.R; 32import com.google.android.car.kitchensink.R;
32 33
33/** 34/**
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;
26import android.hardware.automotive.vehicle.V2_0.VehicleAreaWindow; 26import android.hardware.automotive.vehicle.V2_0.VehicleAreaWindow;
27import android.os.Bundle; 27import android.os.Bundle;
28import android.os.Handler; 28import android.os.Handler;
29import android.support.v4.app.Fragment;
30import android.util.Log; 29import android.util.Log;
31import android.view.LayoutInflater; 30import android.view.LayoutInflater;
32import android.view.View; 31import android.view.View;
@@ -37,6 +36,8 @@ import android.widget.RadioGroup;
37import android.widget.TextView; 36import android.widget.TextView;
38import android.widget.ToggleButton; 37import android.widget.ToggleButton;
39 38
39import androidx.fragment.app.Fragment;
40
40import com.google.android.car.kitchensink.KitchenSinkActivity; 41import com.google.android.car.kitchensink.KitchenSinkActivity;
41import com.google.android.car.kitchensink.R; 42import com.google.android.car.kitchensink.R;
42 43
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;
30import android.hardware.automotive.vehicle.V2_0.VehicleArea; 30import android.hardware.automotive.vehicle.V2_0.VehicleArea;
31import android.hardware.automotive.vehicle.V2_0.VehicleDisplay; 31import android.hardware.automotive.vehicle.V2_0.VehicleDisplay;
32import android.hardware.automotive.vehicle.V2_0.VehiclePropValue; 32import android.hardware.automotive.vehicle.V2_0.VehiclePropValue;
33import android.hardware.automotive.vehicle.V2_0.VehicleProperty;
34import android.hardware.automotive.vehicle.V2_0.VehiclePropertyGroup; 33import android.hardware.automotive.vehicle.V2_0.VehiclePropertyGroup;
35import android.hardware.automotive.vehicle.V2_0.VehiclePropertyStatus; 34import android.hardware.automotive.vehicle.V2_0.VehiclePropertyStatus;
36import android.hardware.automotive.vehicle.V2_0.VehiclePropertyType; 35import android.hardware.automotive.vehicle.V2_0.VehiclePropertyType;
37import android.os.Bundle; 36import android.os.Bundle;
38import android.os.RemoteException; 37import android.os.RemoteException;
39import android.support.v4.app.Fragment;
40import android.text.method.ScrollingMovementMethod; 38import android.text.method.ScrollingMovementMethod;
41import android.util.Log; 39import android.util.Log;
42import android.view.KeyEvent; 40import android.view.KeyEvent;
@@ -48,6 +46,8 @@ import android.widget.LinearLayout;
48import android.widget.TextView; 46import android.widget.TextView;
49import android.widget.Toast; 47import android.widget.Toast;
50 48
49import androidx.fragment.app.Fragment;
50
51import com.android.car.keventreader.EventReaderService; 51import com.android.car.keventreader.EventReaderService;
52import com.android.car.keventreader.IEventCallback; 52import com.android.car.keventreader.IEventCallback;
53import com.android.car.keventreader.KeypressEvent; 53import 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;
22import android.content.SharedPreferences; 22import android.content.SharedPreferences;
23import android.os.Bundle; 23import android.os.Bundle;
24import android.os.PersistableBundle; 24import android.os.PersistableBundle;
25import android.support.annotation.Nullable;
26import android.support.v4.app.Fragment;
27import android.util.Log; 25import android.util.Log;
28import android.view.LayoutInflater; 26import android.view.LayoutInflater;
29import android.view.View; 27import android.view.View;
@@ -35,6 +33,9 @@ import android.widget.RadioGroup;
35import android.widget.TextView; 33import android.widget.TextView;
36import android.widget.Toast; 34import android.widget.Toast;
37 35
36import androidx.annotation.Nullable;
37import androidx.fragment.app.Fragment;
38
38import com.google.android.car.kitchensink.R; 39import com.google.android.car.kitchensink.R;
39 40
40import java.util.List; 41import 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;
12import android.content.Context; 12import android.content.Context;
13import android.content.Intent; 13import android.content.Intent;
14import android.os.Bundle; 14import android.os.Bundle;
15import android.support.v4.app.Fragment;
16import android.view.LayoutInflater; 15import android.view.LayoutInflater;
17import android.view.View; 16import android.view.View;
18import android.view.ViewGroup; 17import android.view.ViewGroup;
19import android.widget.Button; 18import android.widget.Button;
20 19
20import androidx.fragment.app.Fragment;
21
21import com.google.android.car.kitchensink.KitchenSinkActivity; 22import com.google.android.car.kitchensink.KitchenSinkActivity;
22import com.google.android.car.kitchensink.R; 23import com.google.android.car.kitchensink.R;
23 24
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;
18 18
19import android.content.Intent; 19import android.content.Intent;
20import android.os.Bundle; 20import android.os.Bundle;
21import android.support.annotation.Nullable;
22import android.support.v4.app.Fragment;
23import android.view.LayoutInflater; 21import android.view.LayoutInflater;
24import android.view.View; 22import android.view.View;
25import android.view.ViewGroup; 23import android.view.ViewGroup;
26import android.widget.Button; 24import android.widget.Button;
27 25
26import androidx.annotation.Nullable;
27import androidx.fragment.app.Fragment;
28
28import com.google.android.car.kitchensink.R; 29import com.google.android.car.kitchensink.R;
29 30
30public class OrientationTestFragment extends Fragment { 31public 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;
23import android.os.Handler; 23import android.os.Handler;
24import android.os.PowerManager; 24import android.os.PowerManager;
25import android.os.SystemClock; 25import android.os.SystemClock;
26import android.support.v4.app.Fragment;
27import android.util.Log; 26import android.util.Log;
28import android.view.LayoutInflater; 27import android.view.LayoutInflater;
29import android.view.View; 28import android.view.View;
@@ -31,6 +30,8 @@ import android.view.ViewGroup;
31import android.widget.Button; 30import android.widget.Button;
32import android.widget.TextView; 31import android.widget.TextView;
33 32
33import androidx.fragment.app.Fragment;
34
34import com.google.android.car.kitchensink.KitchenSinkActivity; 35import com.google.android.car.kitchensink.KitchenSinkActivity;
35import com.google.android.car.kitchensink.R; 36import com.google.android.car.kitchensink.R;
36 37
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;
27import android.hardware.automotive.vehicle.V2_0.VehiclePropertyType; 27import android.hardware.automotive.vehicle.V2_0.VehiclePropertyType;
28import android.os.Bundle; 28import android.os.Bundle;
29import android.os.Handler; 29import android.os.Handler;
30import android.support.v4.app.Fragment;
31import android.util.Log; 30import android.util.Log;
32import android.view.LayoutInflater; 31import android.view.LayoutInflater;
33import android.view.View; 32import android.view.View;
@@ -43,6 +42,8 @@ import android.widget.Spinner;
43import android.widget.TextView; 42import android.widget.TextView;
44import android.widget.Toast; 43import android.widget.Toast;
45 44
45import androidx.fragment.app.Fragment;
46
46import com.google.android.car.kitchensink.KitchenSinkActivity; 47import com.google.android.car.kitchensink.KitchenSinkActivity;
47import com.google.android.car.kitchensink.R; 48import com.google.android.car.kitchensink.R;
48 49
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;
28import android.content.pm.PackageManager; 28import android.content.pm.PackageManager;
29import android.os.Bundle; 29import android.os.Bundle;
30import android.os.Handler; 30import android.os.Handler;
31import android.support.v4.app.Fragment;
32import android.text.TextUtils; 31import android.text.TextUtils;
33import android.util.Log; 32import android.util.Log;
34import android.view.LayoutInflater; 33import android.view.LayoutInflater;
@@ -36,6 +35,8 @@ import android.view.View;
36import android.view.ViewGroup; 35import android.view.ViewGroup;
37import android.widget.TextView; 36import android.widget.TextView;
38 37
38import androidx.fragment.app.Fragment;
39
39import com.google.android.car.kitchensink.KitchenSinkActivity; 40import com.google.android.car.kitchensink.KitchenSinkActivity;
40import com.google.android.car.kitchensink.R; 41import com.google.android.car.kitchensink.R;
41 42
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;
27import android.car.storagemonitoring.IoStatsEntry; 27import android.car.storagemonitoring.IoStatsEntry;
28import android.os.Bundle; 28import android.os.Bundle;
29import android.os.StatFs; 29import android.os.StatFs;
30import android.support.v4.app.Fragment;
31import android.system.ErrnoException; 30import android.system.ErrnoException;
32import android.util.Log; 31import android.util.Log;
33import android.view.LayoutInflater; 32import android.view.LayoutInflater;
@@ -37,6 +36,8 @@ import android.widget.ArrayAdapter;
37import android.widget.ListView; 36import android.widget.ListView;
38import android.widget.TextView; 37import android.widget.TextView;
39 38
39import androidx.fragment.app.Fragment;
40
40import com.google.android.car.kitchensink.KitchenSinkActivity; 41import com.google.android.car.kitchensink.KitchenSinkActivity;
41import com.google.android.car.kitchensink.R; 42import com.google.android.car.kitchensink.R;
42 43
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 @@
17package com.google.android.car.kitchensink.touch; 17package com.google.android.car.kitchensink.touch;
18 18
19import android.os.Bundle; 19import android.os.Bundle;
20import android.support.v4.app.Fragment;
21import android.view.LayoutInflater; 20import android.view.LayoutInflater;
22import android.view.View; 21import android.view.View;
23import android.view.ViewGroup; 22import android.view.ViewGroup;
24 23
24import androidx.fragment.app.Fragment;
25
25import com.google.android.car.kitchensink.R; 26import com.google.android.car.kitchensink.R;
26 27
27public class TouchTestFragment extends Fragment { 28public 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;
24import android.hardware.automotive.vehicle.V2_0.VehicleProperty; 24import android.hardware.automotive.vehicle.V2_0.VehicleProperty;
25import android.os.Bundle; 25import android.os.Bundle;
26import android.os.RemoteException; 26import android.os.RemoteException;
27import android.support.v4.app.Fragment;
28import android.util.Log; 27import android.util.Log;
29import android.view.LayoutInflater; 28import android.view.LayoutInflater;
30import android.view.View; 29import android.view.View;
@@ -34,6 +33,8 @@ import android.widget.AdapterView.OnItemClickListener;
34import android.widget.ArrayAdapter; 33import android.widget.ArrayAdapter;
35import android.widget.ListView; 34import android.widget.ListView;
36 35
36import androidx.fragment.app.Fragment;
37
37import com.google.android.car.kitchensink.KitchenSinkActivity; 38import com.google.android.car.kitchensink.KitchenSinkActivity;
38import com.google.android.car.kitchensink.R; 39import com.google.android.car.kitchensink.R;
39 40
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;
26import android.os.Handler; 26import android.os.Handler;
27import android.os.IBinder; 27import android.os.IBinder;
28import android.os.Message; 28import android.os.Message;
29import android.support.annotation.Nullable;
30import android.support.v4.app.Fragment;
31import android.util.Log; 29import android.util.Log;
32import android.util.SparseIntArray; 30import android.util.SparseIntArray;
33import android.view.LayoutInflater; 31import android.view.LayoutInflater;
@@ -36,6 +34,9 @@ import android.view.ViewGroup;
36import android.widget.ListView; 34import android.widget.ListView;
37import android.widget.SeekBar; 35import android.widget.SeekBar;
38 36
37import androidx.annotation.Nullable;
38import androidx.fragment.app.Fragment;
39
39import com.google.android.car.kitchensink.R; 40import com.google.android.car.kitchensink.R;
40 41
41public class VolumeTestFragment extends Fragment { 42public class VolumeTestFragment extends Fragment {