Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d8b3fd38 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "GUP: Add stub UI"

parents 4e0d53ba c81a03b6
Loading
Loading
Loading
Loading
+5 −0
Original line number Diff line number Diff line
@@ -10065,6 +10065,11 @@
    <!-- UI debug setting: app selected to use Game Update Package [CHAR LIMIT=NONE] -->
    <string name="gup_dev_opt_in_app_set"><xliff:g id="app_name" example="com.company.app">%1$s</xliff:g></string>
    <!-- Title for Game Update Packages dashboard where developers can configure apps to use GUP or not [CHAR LIMIT=50] -->
    <string name="gup_dashboard_title">Game Update Packages Preferences</string>
    <!-- Summary for Game Update Packages dashboard [CHAR LIMIT=50] -->
    <string name="gup_dashboard_summary">Modify Game Update Packages settings</string>
    <!-- Slices Strings -->
    <!-- Summary text on a card explaining that a setting does not exist / is not supported on the device [CHAR_LIMIT=NONE]-->
+6 −0
Original line number Diff line number Diff line
@@ -191,6 +191,12 @@
            android:title="@string/enable_gpu_debug_layers"
            android:summary="@string/enable_gpu_debug_layers_summary" />

        <Preference
            android:key="gup_dashboard"
            android:title="@string/gup_dashboard_title"
            android:summary="@string/gup_dashboard_summary"
            android:fragment="com.android.settings.development.gup.GupDashboard" />

    </PreferenceCategory>

    <PreferenceCategory
+20 −0
Original line number Diff line number Diff line
<?xml version="1.0" encoding="utf-8"?>
<!--
  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.
  -->

<PreferenceScreen
    xmlns:android="http://schemas.android.com/apk/res/android"
    android:title="@string/gup_dashboard_title" />
+50 −0
Original line number Diff line number Diff line
/*
 * 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;
    }
}
+1 −0
Original line number Diff line number Diff line
@@ -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
Loading