aboutsummaryrefslogtreecommitdiff
path: root/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
diff options
context:
space:
mode:
authorKeun-young Park <keunyoung@google.com>2016-02-29 16:54:29 -0800
committerKeun-young Park <keunyoung@google.com>2016-03-03 16:21:05 -0800
commita28d7b201584823286f26e21a9f30d07c416eb3e (patch)
treefbaa688e075c28a08768e2f4752740ca8bcd7823 /tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
parenta6521cd799e509b03ecbeea3b05f1dd5c0379387 (diff)
downloadCar-a28d7b201584823286f26e21a9f30d07c416eb3e.tar.gz
add input service
- CarInputService monitors input event through vehicle hal and handle it by itself (for now, VOICE_ASSITANT only), deliver it to other relevant component, or inject as android key event into kernel input device. - renamed jni to jni_car_service - added kitchensink input test. - From kitchensink test, single touch of volume key does not work as touch event in other window mess things up. But long press should work. It will work in real physical keys. - TODO: android key to linux key mapping should be expanded for all possible keys. bug: 27461452 Change-Id: I51e4b64bcd3c745f27ebb089fafce536be91f04d
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.java12
1 files changed, 10 insertions, 2 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 d88bb6008a..60aafe8557 100644
--- a/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
+++ b/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
@@ -20,6 +20,7 @@ import com.google.android.car.kitchensink.audio.AudioTestFragment;
import com.google.android.car.kitchensink.camera.CameraTestFragment;
import com.google.android.car.kitchensink.cluster.InstrumentClusterFragment;
import com.google.android.car.kitchensink.hvac.HvacTestFragment;
+import com.google.android.car.kitchensink.input.InputTestFragment;
import com.google.android.car.kitchensink.job.JobSchedulerFragment;
import com.google.android.car.kitchensink.keyboard.KeyboardFragment;
@@ -57,6 +58,7 @@ public class KitchenSinkActivity extends CarDrawerActivity {
private static final String MENU_JOB = "job_scheduler";
private static final String MENU_KEYBOARD = "keyboard";
private static final String MENU_CLUSTER = "inst cluster";
+ private static final String MENU_INPUT_TEST = "input test";
private Car mCarApi;
private CarCameraManager mCameraManager;
@@ -72,6 +74,7 @@ public class KitchenSinkActivity extends CarDrawerActivity {
private JobSchedulerFragment mJobFragment;
private KeyboardFragment mKeyboardFragment;
private InstrumentClusterFragment mInstrumentClusterFragment;
+ private InputTestFragment mInputTestFragment;
private final CarSensorManager.CarSensorEventListener mListener =
new CarSensorManager.CarSensorEventListener() {
@@ -205,7 +208,7 @@ public class KitchenSinkActivity extends CarDrawerActivity {
if (parentId.equals(ROOT)) {
String[] allMenus = {
MENU_AUDIO, MENU_CAMERA, MENU_HVAC, MENU_JOB, MENU_KEYBOARD, MENU_CLUSTER,
- MENU_QUIT
+ MENU_INPUT_TEST, MENU_QUIT
};
for (String menu : allMenus) {
items.add(new CarMenu.Builder(menu).setText(menu).build());
@@ -219,7 +222,7 @@ public class KitchenSinkActivity extends CarDrawerActivity {
Log.d(TAG, "onItemClicked id=" + id);
if (id.equals(MENU_AUDIO)) {
if (mAudioTestFragment == null) {
- mAudioTestFragment = new AudioTestFragment(getContext());
+ mAudioTestFragment = new AudioTestFragment();
}
setContentFragment(mAudioTestFragment);
} else if (id.equals(MENU_CAMERA)) {
@@ -257,6 +260,11 @@ public class KitchenSinkActivity extends CarDrawerActivity {
mInstrumentClusterFragment.setCarAppContextManager(mCarAppContextManager);
}
setContentFragment(mInstrumentClusterFragment);
+ } else if (id.equals(MENU_INPUT_TEST)) {
+ if (mInputTestFragment == null) {
+ mInputTestFragment = new InputTestFragment();
+ }
+ setContentFragment(mInputTestFragment);
} else if (id.equals(MENU_QUIT)) {
finish();
}