PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove isProvisioningNeededButUnavailable usage" into rvc-dev am: 5bd41e573b am: bb8f08013b am: cb57d2247d am: 1d05abe366

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11716805

Change-Id: I1152a3f3081f860d68270289c9ceaa23ce56da9d
This commit is contained in:
Mark Chien
2020-06-17 03:33:08 +00:00
committed by Automerger Merge Worker
parent b9d67441c3 1d05abe366
commit 4110e8c19c
3 changed files with 0 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/android/settings/network/AllInOneTetherPreferenceController.java
View File

@@ -37,10 +37,8 @@ import androidx.lifecycle.Lifecycle;
import androidx.lifecycle.Lifecycle.Event;
import androidx.lifecycle.LifecycleObserver;
import androidx.lifecycle.OnLifecycleEvent;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.TetherSettings;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.core.FeatureFlags;
import com.android.settings.widget.MasterSwitchController;
@@ -95,16 +93,6 @@ public class AllInOneTetherPreferenceController extends BasePreferenceController
mBluetoothAdapter = BluetoothAdapter.getDefaultAdapter();
}
@Override
public void displayPreference(PreferenceScreen screen) {
super.displayPreference(screen);
mPreference = screen.findPreference(mPreferenceKey);
if (mPreference != null && !mAdminDisallowedTetherConfig) {
// Grey out if provisioning is not available.
mPreference.setEnabled(!TetherSettings.isProvisioningNeededButUnavailable(mContext));
}
}
@Override
public int getAvailabilityStatus() {
if (!TetherUtil.isTetherAvailable(mContext)

4
src/com/android/settings/network/TetherPreferenceController.java
View File

@@ -40,7 +40,6 @@ import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.TetherSettings;
import com.android.settings.core.FeatureFlags;
import com.android.settings.core.PreferenceControllerMixin;
import com.android.settingslib.TetherUtil;
@@ -108,9 +107,6 @@ public class TetherPreferenceController extends AbstractPreferenceController imp
if (mPreference != null && !mAdminDisallowedTetherConfig) {
mPreference.setTitle(
com.android.settingslib.Utils.getTetheringLabel(mConnectivityManager));
// Grey out if provisioning is not available.
mPreference.setEnabled(!TetherSettings.isProvisioningNeededButUnavailable(mContext));
}
}