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

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

Merge "Fork a new developer options page."

parents 6f0a5d86 4c26da9e

AndroidManifest.xml

+26 −0
Original line number Diff line number Diff line
@@ -1934,6 +1934,32 @@ 
                android:value="true" />

        </activity>



        <activity android:name="Settings$DevelopmentSettingsDashboardActivity"

                  android:label="@string/development_settings_title"

                  android:icon="@drawable/ic_settings_development"

                  android:taskAffinity="com.android.settings"

                  android:parentActivityName="Settings">



            <!-- Enable when deleting DevelopmentSettingsActivity

            <intent-filter android:priority="1">

                <action android:name="android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />

                <action android:name="com.android.settings.APPLICATION_DEVELOPMENT_SETTINGS" />

                <category android:name="android.intent.category.DEFAULT" />

            </intent-filter>

            -->

            <intent-filter android:priority="50">

                <action android:name="com.android.settings.action.SETTINGS" />

            </intent-filter>

            <meta-data android:name="com.android.settings.category"

                       android:value="com.android.settings.category.ia.system" />

            <meta-data android:name="com.android.settings.summary"

                       android:resource="@string/summary_empty"/>

            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"

                       android:value="com.android.settings.development.DevelopmentSettingsDashboardFragment" />

            <meta-data android:name="com.android.settings.PRIMARY_PROFILE_CONTROLLED"

                       android:value="true" />

        </activity>



        <!-- The opposite of DevelopmentSettingsActivity, it's no-op and only enabled when the real

             activity is disabled to be CTS compliant. -->

        <activity

src/com/android/settings/Settings.java

+11 −0
Original line number Diff line number Diff line
@@ -17,6 +17,7 @@ 
package com.android.settings;



import android.os.Bundle;

import android.util.FeatureFlagUtils;



import com.android.settings.applications.AppOpsSummary;

import com.android.settings.enterprise.EnterprisePrivacySettings;
@@ -70,7 +71,17 @@ public class Settings extends SettingsActivity { 
    }

    public static class BackgroundCheckSummaryActivity extends SettingsActivity { /* empty */ }

    public static class StorageUseActivity extends SettingsActivity { /* empty */ }



    /**

     * @deprecated in favor of {@link DevelopmentSettingsDashboardActivity}.

     */

    @Deprecated

    public static class DevelopmentSettingsActivity extends SettingsActivity { /* empty */ }

    public static class DevelopmentSettingsDashboardActivity extends SettingsActivity {

        public static final boolean isEnabled() {

            return FeatureFlagUtils.isEnabled("dev_option_v2");

        }

    }

    public static class AccessibilitySettingsActivity extends SettingsActivity { /* empty */ }

    public static class CaptioningSettingsActivity extends SettingsActivity { /* empty */ }

    public static class AccessibilityInversionSettingsActivity extends SettingsActivity { /* empty */ }

src/com/android/settings/SettingsActivity.java

+10 −2
Original line number Diff line number Diff line
@@ -50,6 +50,7 @@ import android.view.View.OnClickListener; 
import android.view.ViewGroup;

import android.widget.Button;

import android.widget.Toolbar;



import com.android.internal.util.ArrayUtils;

import com.android.settings.Settings.WifiSettingsActivity;

import com.android.settings.backup.BackupSettingsActivity;
@@ -58,7 +59,6 @@ import com.android.settings.core.instrumentation.MetricsFeatureProvider; 
import com.android.settings.core.instrumentation.SharedPreferencesLogger;

import com.android.settings.dashboard.DashboardFeatureProvider;

import com.android.settings.dashboard.DashboardSummary;

import com.android.settings.development.DevelopmentSettings;

import com.android.settings.overlay.FeatureFactory;

import com.android.settings.search.SearchActivity;

import com.android.settings.wfd.WifiDisplaySettings;
@@ -66,6 +66,7 @@ import com.android.settings.widget.SwitchBar; 
import com.android.settingslib.development.DevelopmentSettingsEnabler;

import com.android.settingslib.drawer.DashboardCategory;

import com.android.settingslib.drawer.SettingsDrawerActivity;



import java.util.ArrayList;

import java.util.List;

import java.util.Set;
@@ -831,9 +832,16 @@ public class SettingsActivity extends SettingsDrawerActivity 


        final boolean showDev = DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(this)

                && !um.hasUserRestriction(UserManager.DISALLOW_DEBUGGING_FEATURES);

        final boolean useDevOptionV2 = Settings.DevelopmentSettingsDashboardActivity.isEnabled();

        // Enable old Dev option if v2 is disabled

        somethingChanged = setTileEnabled(new ComponentName(packageName,

                        Settings.DevelopmentSettingsActivity.class.getName()),

                showDev, isAdmin)

                showDev && !useDevOptionV2, isAdmin)

                || somethingChanged;

        // Enable new Dev option if v2 is enable

        somethingChanged = setTileEnabled(new ComponentName(packageName,

                        Settings.DevelopmentSettingsDashboardActivity.class.getName()),

                showDev && useDevOptionV2, isAdmin)

                || somethingChanged;



        // Enable/disable backup settings depending on whether the user is admin.

src/com/android/settings/core/gateway/SettingsGateway.java

+2 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ import com.android.settings.datausage.DataUsageList; 
import com.android.settings.datausage.DataUsageSummary;

import com.android.settings.deletionhelper.AutomaticStorageManagerSettings;

import com.android.settings.development.DevelopmentSettings;

import com.android.settings.development.DevelopmentSettingsDashboardFragment;

import com.android.settings.deviceinfo.ImeiInformation;

import com.android.settings.deviceinfo.PrivateVolumeForget;

import com.android.settings.deviceinfo.PrivateVolumeSettings;
@@ -177,6 +178,7 @@ public class SettingsGateway { 
            PrivateVolumeSettings.class.getName(),

            PublicVolumeSettings.class.getName(),

            DevelopmentSettings.class.getName(),

            DevelopmentSettingsDashboardFragment.class.getName(),

            AndroidBeam.class.getName(),

            WifiDisplaySettings.class.getName(),

            PowerUsageSummary.class.getName(),

src/com/android/settings/dashboard/DashboardFragmentRegistry.java

+9 −2
Original line number Diff line number Diff line
@@ -20,12 +20,14 @@ import android.util.ArrayMap; 


import com.android.settings.DisplaySettings;

import com.android.settings.SecuritySettings;

import com.android.settings.Settings;

import com.android.settings.accounts.AccountDetailDashboardFragment;

import com.android.settings.accounts.UserAndAccountDashboardFragment;

import com.android.settings.applications.AppAndNotificationDashboardFragment;

import com.android.settings.applications.DefaultAppSettings;

import com.android.settings.connecteddevice.ConnectedDeviceDashboardFragment;

import com.android.settings.development.DevelopmentSettings;

import com.android.settings.development.DevelopmentSettingsDashboardFragment;

import com.android.settings.deviceinfo.StorageDashboardFragment;

import com.android.settings.fuelgauge.PowerUsageSummary;

import com.android.settings.language.LanguageAndInputSettings;
@@ -83,8 +85,13 @@ public class DashboardFragmentRegistry { 
                SystemDashboardFragment.class.getName(), CategoryKey.CATEGORY_SYSTEM);

        PARENT_TO_CATEGORY_KEY_MAP.put(LanguageAndInputSettings.class.getName(),

                CategoryKey.CATEGORY_SYSTEM_LANGUAGE);

        if (Settings.DevelopmentSettingsDashboardActivity.isEnabled()) {

            PARENT_TO_CATEGORY_KEY_MAP.put(DevelopmentSettingsDashboardFragment.class.getName(),

                    CategoryKey.CATEGORY_SYSTEM_DEVELOPMENT);

        } else {

            PARENT_TO_CATEGORY_KEY_MAP.put(DevelopmentSettings.class.getName(),

                    CategoryKey.CATEGORY_SYSTEM_DEVELOPMENT);

        }

        PARENT_TO_CATEGORY_KEY_MAP.put(ConfigureNotificationSettings.class.getName(),

                CategoryKey.CATEGORY_NOTIFICATIONS);

        PARENT_TO_CATEGORY_KEY_MAP.put(LockscreenDashboardFragment.class.getName(),