Add index for Hotspot settings page into search
Added index provider into TetherSettings and WifiTetherSettings pages. Added robotests to check the keys returned by getNonIndexableKeys. Move repeated code into utility class. Bug: 74777873 Test: make -j RunSettingsRoboTests Test: atest UniquePreferenceTest Change-Id: I6cb09d735afa4867d25a79de733ce8c59634e49b
This commit is contained in:
@@ -17,7 +17,6 @@ package com.android.settings.network;
|
||||
|
||||
import static android.os.UserManager.DISALLOW_CONFIG_TETHERING;
|
||||
import static com.android.settingslib.RestrictedLockUtils.checkIfRestrictionEnforced;
|
||||
import static com.android.settingslib.RestrictedLockUtils.hasBaseUserRestriction;
|
||||
|
||||
import android.bluetooth.BluetoothAdapter;
|
||||
import android.bluetooth.BluetoothPan;
|
||||
@@ -40,6 +39,7 @@ import androidx.preference.PreferenceScreen;
|
||||
import com.android.settings.R;
|
||||
import com.android.settings.TetherSettings;
|
||||
import com.android.settings.core.PreferenceControllerMixin;
|
||||
import com.android.settingslib.TetherUtil;
|
||||
import com.android.settingslib.core.AbstractPreferenceController;
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle;
|
||||
import com.android.settingslib.core.lifecycle.LifecycleObserver;
|
||||
@@ -112,11 +112,7 @@ public class TetherPreferenceController extends AbstractPreferenceController imp
|
||||
|
||||
@Override
|
||||
public boolean isAvailable() {
|
||||
final boolean isBlocked =
|
||||
(!mConnectivityManager.isTetheringSupported() && !mAdminDisallowedTetherConfig)
|
||||
|| hasBaseUserRestriction(mContext, DISALLOW_CONFIG_TETHERING,
|
||||
UserHandle.myUserId());
|
||||
return !isBlocked;
|
||||
return TetherUtil.isTetherAvailable(mContext);
|
||||
}
|
||||
|
||||
@Override
|
||||
|
Reference in New Issue
Block a user