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

Commit 5c4d82ae authored by jeffreyhuang's avatar jeffreyhuang
Browse files

Use DeveloperOptionsPreferenceController

 - Abstract controllers in settingsLib now use
 DeveloperOptionsPreferenceController

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: I6ff61b6e01c83beeca3f38a63f054570b2ff5a3b
parent 12ba446e
Loading
Loading
Loading
Loading
+11 −7
Original line number Diff line number Diff line
@@ -28,17 +28,20 @@ import android.support.v7.preference.PreferenceScreen;
import android.support.v7.preference.TwoStatePreference;
import android.text.TextUtils;

import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.ConfirmationDialogController;

public abstract class AbstractEnableAdbPreferenceController extends AbstractPreferenceController
        implements ConfirmationDialogController {
public abstract class AbstractEnableAdbPreferenceController extends
        DeveloperOptionsPreferenceController implements ConfirmationDialogController {
    private static final String KEY_ENABLE_ADB = "enable_adb";
    public static final String ACTION_ENABLE_ADB_STATE_CHANGED =
            "com.android.settingslib.development.AbstractEnableAdbController."
                    + "ENABLE_ADB_STATE_CHANGED";

    private SwitchPreference mPreference;
    public static final int ADB_SETTING_ON = 1;
    public static final int ADB_SETTING_OFF = 0;


    protected SwitchPreference mPreference;

    public AbstractEnableAdbPreferenceController(Context context) {
        super(context);
@@ -64,7 +67,8 @@ public abstract class AbstractEnableAdbPreferenceController extends AbstractPref

    private boolean isAdbEnabled() {
        final ContentResolver cr = mContext.getContentResolver();
        return Settings.Global.getInt(cr, Settings.Global.ADB_ENABLED, 0) != 0;
        return Settings.Global.getInt(cr, Settings.Global.ADB_ENABLED, ADB_SETTING_OFF)
                != ADB_SETTING_OFF;
    }

    @Override
@@ -105,7 +109,7 @@ public abstract class AbstractEnableAdbPreferenceController extends AbstractPref

    protected void writeAdbSetting(boolean enabled) {
        Settings.Global.putInt(mContext.getContentResolver(),
                Settings.Global.ADB_ENABLED, enabled ? 1 : 0);
                Settings.Global.ADB_ENABLED, enabled ? ADB_SETTING_ON : ADB_SETTING_OFF);
        notifyStateChanged();
    }

+2 −8
Original line number Diff line number Diff line
@@ -26,10 +26,9 @@ import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;

import com.android.settingslib.R;
import com.android.settingslib.core.AbstractPreferenceController;

public abstract class AbstractLogdSizePreferenceController extends AbstractPreferenceController
        implements Preference.OnPreferenceChangeListener {
public abstract class AbstractLogdSizePreferenceController extends
        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {
    public static final String ACTION_LOGD_SIZE_UPDATED = "com.android.settingslib.development."
            + "AbstractLogdSizePreferenceController.LOGD_SIZE_UPDATED";
    public static final String EXTRA_CURRENT_LOGD_VALUE = "CURRENT_LOGD_VALUE";
@@ -56,11 +55,6 @@ public abstract class AbstractLogdSizePreferenceController extends AbstractPrefe
        super(context);
    }

    @Override
    public boolean isAvailable() {
        return true;
    }

    @Override
    public String getPreferenceKey() {
        return SELECT_LOGD_SIZE_KEY;
+3 −4
Original line number Diff line number Diff line
@@ -30,16 +30,15 @@ import android.support.v7.preference.PreferenceScreen;
import android.text.TextUtils;

import com.android.settingslib.R;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.core.ConfirmationDialogController;
import com.android.settingslib.core.lifecycle.Lifecycle;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnCreate;
import com.android.settingslib.core.lifecycle.events.OnDestroy;

public abstract class AbstractLogpersistPreferenceController extends AbstractPreferenceController
        implements Preference.OnPreferenceChangeListener, LifecycleObserver, OnCreate, OnDestroy,
        ConfirmationDialogController {
public abstract class AbstractLogpersistPreferenceController extends
        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener,
        LifecycleObserver, OnCreate, OnDestroy, ConfirmationDialogController {

    private static final String SELECT_LOGPERSIST_KEY = "select_logpersist";
    private static final String SELECT_LOGPERSIST_PROPERTY = "persist.logd.logpersistd";
+4 −3
Original line number Diff line number Diff line
@@ -17,7 +17,6 @@
package com.android.settingslib.development;

import android.content.Context;
import android.content.Intent;

import com.android.settingslib.core.AbstractPreferenceController;

@@ -65,11 +64,13 @@ public abstract class DeveloperOptionsPreferenceController extends
    /**
     * Called when developer options is enabled and the preference is available
     */
    protected abstract void onDeveloperOptionsSwitchEnabled();
    protected void onDeveloperOptionsSwitchEnabled() {
    }

    /**
     * Called when developer options is disabled and the preference is available
     */
    protected abstract void onDeveloperOptionsSwitchDisabled();
    protected void onDeveloperOptionsSwitchDisabled() {
    }

}