aboutsummaryrefslogtreecommitdiff
path: root/tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
diff options
context:
space:
mode:
authorYao Chen <yaochen@google.com>2016-07-28 14:03:28 -0700
committerYao Chen <yaochen@google.com>2016-08-03 10:15:21 -0700
commit94d4766e55c34790e9a0be3009f05205cd730776 (patch)
treeb1ffef4129fe30e4f05c3a8df4529f550ffb6a6b /tests/EmbeddedKitchenSinkApp/src/com/google/android/car/kitchensink/KitchenSinkActivity.java
parentcaccf8fc83e93eb1c499267bdadbd955474d893d (diff)
downloadCar-94d4766e55c34790e9a0be3009f05205cd730776.tar.gz
Add GarageMode settings.
+ Add CarSettings to store keys related to Car platform. + Add a settings Activity for CarSettings, currently can be launched in KitchenSink app. Later we can move it to the new Settings app. + Add relevant garage mode settings. Change-Id: Iba3b5215a69004c6d7e38ad8a2a22ebd1acc7e1d
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.java8
1 files changed, 7 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 d22de6b02f..c832bf39e8 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 android.car.hardware.camera.CarCameraManager;
import android.car.hardware.hvac.CarHvacManager;
import android.content.ComponentName;
import android.content.Context;
+import android.content.Intent;
import android.content.pm.PackageManager;
import android.graphics.Color;
import android.os.Bundle;
@@ -46,6 +47,7 @@ import com.google.android.car.kitchensink.job.JobSchedulerFragment;
import com.google.android.car.kitchensink.keyboard.KeyboardFragment;
import com.google.android.car.kitchensink.radio.RadioTestFragment;
import com.google.android.car.kitchensink.sensor.SensorsTestFragment;
+import com.google.android.car.kitchensink.setting.CarServiceSettingsActivity;
import com.google.android.car.kitchensink.touch.TouchTestFragment;
import com.google.android.car.kitchensink.volume.VolumeTestFragment;
@@ -68,6 +70,7 @@ public class KitchenSinkActivity extends CarDrawerActivity {
private static final String MENU_VOLUME_TEST = "volume test";
private static final String MENU_TOUCH_TEST = "touch test";
private static final String MENU_CUBES_TEST = "cubes test";
+ private static final String MENU_CAR_SETTINGS = "car service settings";
private Car mCarApi;
private CarCameraManager mCameraManager;
@@ -225,7 +228,7 @@ public class KitchenSinkActivity extends CarDrawerActivity {
String[] allMenus = {
MENU_AUDIO, MENU_RADIO, MENU_CAMERA, MENU_HVAC, MENU_JOB, MENU_KEYBOARD,
MENU_CLUSTER, MENU_INPUT_TEST, MENU_SENSORS, MENU_VOLUME_TEST,
- MENU_TOUCH_TEST, MENU_CUBES_TEST, MENU_QUIT
+ MENU_TOUCH_TEST, MENU_CUBES_TEST, MENU_CAR_SETTINGS, MENU_QUIT
};
for (String menu : allMenus) {
items.add(new CarMenu.Builder(menu).setText(menu).build());
@@ -305,6 +308,9 @@ public class KitchenSinkActivity extends CarDrawerActivity {
mCubesTestFragment = new CubesTestFragment();
}
setContentFragment(mCubesTestFragment);
+ } else if (id.equals(MENU_CAR_SETTINGS)) {
+ Intent intent = new Intent(getContext(), CarServiceSettingsActivity.class);
+ getContext().startActivity(intent);
} else if (id.equals(MENU_QUIT)) {
finish();
}