From c81a03b60e4f466fe78480ae87652e9bc6014ae9 Mon Sep 17 00:00:00 2001 From: Yiwei Zhang Date: Fri, 28 Dec 2018 11:38:11 +0800 Subject: GUP: Add stub UI Bug: 119221883 Test: make RunSettingsRoboTests ROBOTEST_FILTER=GupDashboardTest Change-Id: I1f7cc66790e1d1e1de5113e28a055ec5d1679013 --- res/values/strings.xml | 5 ++ res/xml/development_settings.xml | 6 +++ res/xml/gup_settings.xml | 20 ++++++++ .../settings/development/gup/GupDashboard.java | 50 ++++++++++++++++++++ .../grandfather_not_implementing_index_provider | 1 + .../settings/development/gup/GupDashboardTest.java | 54 ++++++++++++++++++++++ 6 files changed, 136 insertions(+) create mode 100644 res/xml/gup_settings.xml create mode 100644 src/com/android/settings/development/gup/GupDashboard.java create mode 100644 tests/robotests/src/com/android/settings/development/gup/GupDashboardTest.java diff --git a/res/values/strings.xml b/res/values/strings.xml index 089ade9a82..f0a57abf8d 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -10049,6 +10049,11 @@ %1$s + + Game Update Packages Preferences + + Modify Game Update Packages settings + diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml index 214c00c5bb..2eedca5572 100644 --- a/res/xml/development_settings.xml +++ b/res/xml/development_settings.xml @@ -191,6 +191,12 @@ android:title="@string/enable_gpu_debug_layers" android:summary="@string/enable_gpu_debug_layers_summary" /> + + + + + diff --git a/src/com/android/settings/development/gup/GupDashboard.java b/src/com/android/settings/development/gup/GupDashboard.java new file mode 100644 index 0000000000..674a0a90d0 --- /dev/null +++ b/src/com/android/settings/development/gup/GupDashboard.java @@ -0,0 +1,50 @@ +/* + * Copyright 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.development.gup; + +import android.content.Context; + +import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.R; +import com.android.settings.dashboard.DashboardFragment; +import com.android.settingslib.core.AbstractPreferenceController; + +import java.util.List; + +public class GupDashboard extends DashboardFragment { + private static final String TAG = "GupDashboard"; + + @Override + public int getMetricsCategory() { + return MetricsProto.MetricsEvent.SETTINGS_GUP_DASHBOARD; + } + + @Override + protected String getLogTag() { + return TAG; + } + + @Override + protected int getPreferenceScreenResId() { + return R.xml.gup_settings; + } + + @Override + public int getHelpResource() { + return 0; + } +} diff --git a/tests/robotests/assets/grandfather_not_implementing_index_provider b/tests/robotests/assets/grandfather_not_implementing_index_provider index 447de0049d..2622eb320e 100644 --- a/tests/robotests/assets/grandfather_not_implementing_index_provider +++ b/tests/robotests/assets/grandfather_not_implementing_index_provider @@ -28,6 +28,7 @@ com.android.settings.bluetooth.DevicePickerFragment com.android.settings.datausage.AppDataUsage com.android.settings.datausage.DataUsageList com.android.settings.datetime.timezone.TimeZoneSettings +com.android.settings.development.gup.GupDashboard com.android.settings.deviceinfo.PrivateVolumeSettings com.android.settings.deviceinfo.PublicVolumeSettings com.android.settings.deviceinfo.StorageProfileFragment diff --git a/tests/robotests/src/com/android/settings/development/gup/GupDashboardTest.java b/tests/robotests/src/com/android/settings/development/gup/GupDashboardTest.java new file mode 100644 index 0000000000..17278ef08e --- /dev/null +++ b/tests/robotests/src/com/android/settings/development/gup/GupDashboardTest.java @@ -0,0 +1,54 @@ +/* + * Copyright 2019 The Android Open Source Project + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ + +package com.android.settings.development.gup; + +import static com.google.common.truth.Truth.assertThat; + +import com.android.internal.logging.nano.MetricsProto; +import com.android.settings.R; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.robolectric.RobolectricTestRunner; + +@RunWith(RobolectricTestRunner.class) +public class GupDashboardTest { + private GupDashboard mDashboard; + + @Before + public void setUp() { + mDashboard = new GupDashboard(); + } + + @Test + public void getHelpResource_shouldReturn0() { + assertThat(mDashboard.getHelpResource()).isEqualTo(0); + } + + @Test + public void getMetricesCategory_shouldReturnGupDashboard() { + assertThat(mDashboard.getMetricsCategory()) + .isEqualTo(MetricsProto.MetricsEvent.SETTINGS_GUP_DASHBOARD); + } + + @Test + public void getPreferenceScreen_shouldReturnGupSettings() { + assertThat(mDashboard.getPreferenceScreenResId()) + .isEqualTo(R.xml.gup_settings); + } +} -- cgit v1.2.3