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

Commit a404be00 authored by Fan Zhang's avatar Fan Zhang Committed by android-build-merger
Browse files

Merge "Turn off WifiTetherSettings page." into oc-mr1-dev 

am: b9da1117

Change-Id: I4f027adb993a7971f83d3fd659a86dc4392ae57e
parents 92f7794d b9da1117

src/com/android/settings/wifi/WifiApEnabler.java

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ public class WifiApEnabler { 
        mContext = context;

        mDataSaverBackend = dataSaverBackend;

        mSwitch = switchPreference;

        mOriginalSummary = switchPreference.getSummary();

        mOriginalSummary = context.getText(R.string.wifi_hotspot_off_subtext);

        switchPreference.setPersistent(false);



        mWifiManager = (WifiManager) context.getSystemService(Context.WIFI_SERVICE);

src/com/android/settings/wifi/tether/WifiTetherSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ public class WifiTetherSettings extends RestrictedDashboardFragment 
        implements WifiTetherBasePreferenceController.OnTetherConfigUpdateListener {



    public static boolean isTetherSettingPageEnabled() {

        return SystemProperties.getBoolean("settings.ui.wifi.tether.enabled", true);

        return SystemProperties.getBoolean("settings.ui.wifi.tether.enabled", false);

    }



    private static final IntentFilter TETHER_STATE_CHANGE_FILTER;

tests/unit/src/com/android/settings/wifi/tether/WifiTetherSettingsTest.java

+11 −5
Original line number Diff line number Diff line
@@ -16,6 +16,12 @@ 


package com.android.settings.wifi.tether;



import static android.support.test.espresso.Espresso.onView;

import static android.support.test.espresso.assertion.ViewAssertions.matches;

import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;

import static android.support.test.espresso.matcher.ViewMatchers.withText;

import static com.google.common.truth.Truth.assertThat;



import android.app.Instrumentation;

import android.content.Intent;

import android.support.test.InstrumentationRegistry;
@@ -33,11 +39,6 @@ import org.junit.Before; 
import org.junit.Test;

import org.junit.runner.RunWith;



import static android.support.test.espresso.Espresso.onView;

import static android.support.test.espresso.assertion.ViewAssertions.matches;

import static android.support.test.espresso.matcher.ViewMatchers.isDisplayed;

import static android.support.test.espresso.matcher.ViewMatchers.withText;



@RunWith(AndroidJUnit4.class)

@SmallTest

public class WifiTetherSettingsTest {
@@ -63,6 +64,11 @@ public class WifiTetherSettingsTest { 
        mDevice.pressHome();

    }



    @Test

    public void verifyPageIsDisabledByDefault() {

        assertThat(WifiTetherSettings.isTetherSettingPageEnabled()).isFalse();

    }



    @Test

    public void launchTetherSettings_shouldHaveAllFields() {

        launchWifiTetherActivity();