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

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

Merge "Delete DevelopmentSettings.java"

parents 2575d3fd cb823d59

AndroidManifest.xml

+0 −25
Original line number Diff line number Diff line
@@ -1889,31 +1889,6 @@ 
                       android:value="com.android.settings.ApnEditor" />

        </activity>



        <activity android:name="Settings$DevelopmentSettingsActivity"

                android:label="@string/development_settings_title"

                android:icon="@drawable/ic_settings_development"

                android:taskAffinity="com.android.settings"

                android:parentActivityName="Settings">

            <!-- Enable if we need to revert to the old development settings

            <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.DevelopmentSettings" />

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

                android:value="true" />

        </activity>



        <activity android:name="Settings$DevelopmentSettingsDashboardActivity"

                  android:label="@string/development_settings_title"

                  android:icon="@drawable/ic_settings_development"

src/com/android/settings/Settings.java

+0 −13
Original line number Diff line number Diff line
@@ -16,10 +16,7 @@ 


package com.android.settings;



import static com.android.settings.core.FeatureFlags.DEV_OPTION_V1;



import android.os.Bundle;

import android.util.FeatureFlagUtils;



import com.android.settings.enterprise.EnterprisePrivacySettings;
@@ -60,16 +57,6 @@ public class Settings extends SettingsActivity { 
    public static class HighPowerApplicationsActivity extends SettingsActivity { /* empty */ }

    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 {

        public static final boolean isEnabled() {

            return FeatureFlagUtils.isEnabled(null /* context */, DEV_OPTION_V1);

        }

    }

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

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

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

src/com/android/settings/SettingsActivity.java

+2 −9
Original line number Diff line number Diff line
@@ -55,7 +55,6 @@ import com.android.internal.util.ArrayUtils; 
import com.android.settings.Settings.WifiSettingsActivity;

import com.android.settings.applications.manageapplications.ManageApplications;

import com.android.settings.backup.BackupSettingsActivity;

import com.android.settings.core.InstrumentedPreferenceFragment;

import com.android.settings.core.gateway.SettingsGateway;

import com.android.settings.core.instrumentation.MetricsFeatureProvider;

import com.android.settings.core.instrumentation.SharedPreferencesLogger;
@@ -827,16 +826,10 @@ public class SettingsActivity extends SettingsDrawerActivity 


        final boolean showDev = DevelopmentSettingsEnabler.isDevelopmentSettingsEnabled(this)

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

        final boolean useDevOptionV1 = Settings.DevelopmentSettingsActivity.isEnabled();

        // Enable old Dev option if v2 is disabled

        somethingChanged = setTileEnabled(new ComponentName(packageName,

                        Settings.DevelopmentSettingsActivity.class.getName()),

                showDev && useDevOptionV1, isAdmin)

                || somethingChanged;

        // Enable new Dev option if v2 is enable



        somethingChanged = setTileEnabled(new ComponentName(packageName,

                        Settings.DevelopmentSettingsDashboardActivity.class.getName()),

                showDev && !useDevOptionV1, isAdmin)

                showDev, isAdmin)

                || somethingChanged;



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

src/com/android/settings/bluetooth/DeviceListPreferenceFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -27,8 +27,8 @@ import android.support.v7.preference.PreferenceGroup; 
import android.text.BidiFormatter;

import android.util.Log;



import com.android.settings.dashboard.RestrictedDashboardFragment;

import com.android.settings.R;

import com.android.settings.dashboard.RestrictedDashboardFragment;

import com.android.settingslib.bluetooth.BluetoothCallback;

import com.android.settingslib.bluetooth.BluetoothDeviceFilter;

import com.android.settingslib.bluetooth.CachedBluetoothDevice;

src/com/android/settings/core/FeatureFlags.java

+0 −1
Original line number Diff line number Diff line
@@ -21,7 +21,6 @@ package com.android.settings.core; 
 */

public class FeatureFlags {

    public static final String DEVICE_INFO_V2 = "device_info_v2";

    public static final String DEV_OPTION_V1 = "dev_option_v1";

    public static final String SEARCH_V2 = "settings_search_v2";

    public static final String SUGGESTIONS_V2 = "new_settings_suggestion";

}