diff options
| author | Rodrigo Lagos <rlagos@google.com> | 2018-05-07 11:46:36 -0700 |
|---|---|---|
| committer | Rodrigo Lagos <rlagos@google.com> | 2018-05-07 18:55:24 +0000 |
| commit | fa3290a37081cfa6d4862d206f6b62293957aded (patch) | |
| tree | 373f961532704d6f6f7c8fc16574559fef19d07c /tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java | |
| parent | c0b29ab914672b22c4d7a76aaa038de64ebd7359 (diff) | |
| download | Car-fa3290a37081cfa6d4862d206f6b62293957aded.tar.gz | |
DO NOT MERGE Revert AndroidX migration
This is mostly a revert of ag/3998706 along with making the linter happy
Change-Id: Ie4aaafbadd0e8f1353bdd7c9e824a60b69579832
Fixes: 79356171
Test: built locally and deployed to test
Diffstat (limited to 'tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java')
| -rw-r--r-- | tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java | 3 |
1 files changed, 2 insertions, 1 deletions
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 b2c7617552..aa6202a804 100644 --- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java +++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java @@ -16,6 +16,7 @@ package com.google.android.car.kitchensink; + import android.car.hardware.hvac.CarHvacManager; import android.car.hardware.power.CarPowerManager; import android.content.Intent; @@ -26,12 +27,12 @@ import android.support.car.CarAppFocusManager; import android.support.car.CarConnectionCallback; import android.support.car.CarNotConnectedException; import android.support.car.hardware.CarSensorManager; +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; |