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

Commit 141c92bf authored by jeffreyhuang's avatar jeffreyhuang
Browse files

Introduce ConnectivityMonitorPreferenceCtrlV2 

 - Create new ConnectivityMonitorPreferenceControllerV2
 - Deprecate ConnectivityMonitorPreferenceController
 - Create controller inside the DashboardFragment
 - Copy logic from ConnectivityMonitorPreferenceController with slight
 modifications for dashboard fragment compatibility

Bug: 34203528
Test: make RunSettingsRoboTests -j40
Change-Id: Ibba32208abb2535e1d13b299705e4f4e63aef8c8
parent 8caf1ff9

src/com/android/settings/development/ConnectivityMonitorPreferenceController.java

+4 −0
Original line number Diff line number Diff line
@@ -28,6 +28,10 @@ import com.android.settings.core.PreferenceControllerMixin; 
import com.android.settings.R;

import com.android.settingslib.core.AbstractPreferenceController;



/**

 * deprecated in favor of {@link ConnectivityMonitorPreferenceControllerV2}

 */

@Deprecated

public class ConnectivityMonitorPreferenceController extends AbstractPreferenceController implements

        PreferenceControllerMixin {

src/com/android/settings/development/ConnectivityMonitorPreferenceControllerV2.java

0 → 100644
+113 −0
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2017 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;



import android.content.Context;

import android.os.SystemProperties;

import android.support.v14.preference.SwitchPreference;

import android.support.v7.preference.Preference;

import android.support.v7.preference.PreferenceScreen;

import android.text.TextUtils;

import android.widget.Toast;



import com.android.internal.annotations.VisibleForTesting;

import com.android.settings.R;



public class ConnectivityMonitorPreferenceControllerV2 extends

        DeveloperOptionsPreferenceController implements Preference.OnPreferenceChangeListener {



    private static final String KEY_CONNECTIVITY_MONITOR_SWITCH = "connectivity_monitor_switch";

    @VisibleForTesting

    static final String BUILD_TYPE = "ro.build.type";

    @VisibleForTesting

    static final String PROPERTY_CONNECTIVITY_MONITOR = "persist.radio.enable_tel_mon";



    @VisibleForTesting

    static final String ENABLED_STATUS = "enabled";

    @VisibleForTesting

    static final String DISABLED_STATUS = "disabled";

    @VisibleForTesting

    static final String USER_ENABLED_STATUS = "user_enabled";

    @VisibleForTesting

    static final String USER_DISABLED_STATUS = "user_disabled";



    @VisibleForTesting

    static final String USERDEBUG_BUILD = "userdebug";

    @VisibleForTesting

    static final String ENG_BUILD = "eng";



    private SwitchPreference mPreference;



    public ConnectivityMonitorPreferenceControllerV2(Context context) {

        super(context);

    }



    @Override

    public void displayPreference(PreferenceScreen screen) {

        super.displayPreference(screen);



        mPreference = (SwitchPreference) screen.findPreference(KEY_CONNECTIVITY_MONITOR_SWITCH);

    }



    @Override

    public String getPreferenceKey() {

        return KEY_CONNECTIVITY_MONITOR_SWITCH;

    }



    @Override

    public boolean isAvailable() {

        final String buildType = SystemProperties.get(BUILD_TYPE);

        return mContext.getResources().getBoolean(R.bool.config_show_connectivity_monitor)

                && (TextUtils.equals(buildType, USERDEBUG_BUILD)

                || TextUtils.equals(buildType, ENG_BUILD));

    }



    @Override

    public boolean onPreferenceChange(Preference preference, Object newValue) {

        final boolean isEnabled = (Boolean) newValue;

        SystemProperties.set(PROPERTY_CONNECTIVITY_MONITOR,

                isEnabled ? USER_ENABLED_STATUS : USER_DISABLED_STATUS);

        Toast.makeText(mContext, R.string.connectivity_monitor_toast,

                Toast.LENGTH_LONG).show();

        return true;

    }



    @Override

    public void updateState(Preference preference) {

        final boolean enabled = isConnectivityMonitorEnabled();

        mPreference.setChecked(enabled);

    }



    @Override

    protected void onDeveloperOptionsSwitchEnabled() {

        mPreference.setEnabled(true);

    }



    @Override

    protected void onDeveloperOptionsSwitchDisabled() {

        SystemProperties.set(PROPERTY_CONNECTIVITY_MONITOR, USER_DISABLED_STATUS);

        mPreference.setChecked(false);

        mPreference.setEnabled(false);

    }



    private boolean isConnectivityMonitorEnabled() {

        final String cmStatus = SystemProperties.get(PROPERTY_CONNECTIVITY_MONITOR,

                DISABLED_STATUS);

        return TextUtils.equals(ENABLED_STATUS, cmStatus) || TextUtils.equals(USER_ENABLED_STATUS,

                cmStatus);

    }

}

src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -198,7 +198,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra 
        // verify apps over usb

        // logger buffer sizes

        // store logger data persistently on device

        // telephony monitor

        controllers.add(new ConnectivityMonitorPreferenceControllerV2(context));

        controllers.add(new CameraLaserSensorPreferenceControllerV2(context));

        controllers.add(new CameraHalHdrPlusPreferenceControllerV2(context));

        // feature flags

tests/robotests/res/values-mcc999/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -18,4 +18,5 @@ 
    <bool name="config_show_camera_hal_hdrplus">true</bool>

    <bool name="config_enableColorTemperature">false</bool>

    <bool name="config_show_camera_laser_sensor">false</bool>

    <bool name="config_show_connectivity_monitor">false</bool>

</resources>
 
 No newline at end of file

tests/robotests/res/values/config.xml

+1 −0
Original line number Diff line number Diff line
@@ -20,4 +20,5 @@ 
    <bool name="config_enableColorTemperature">true</bool>

    <bool name="config_show_camera_laser_sensor">true</bool>

    <bool name="config_show_camera_hal_hdrplus">true</bool>

    <bool name="config_show_connectivity_monitor">true</bool>

</resources>
 
 No newline at end of file