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

Merge "Show admin dialog when preference is disabled by Device Admin" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-05-08 17:03:42 +00:00
committed by Android (Google) Code Review
parent d88ca05b2e 133ffc9c57
commit e3278d8240
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/network/telephony/RoamingPreferenceController.java
View File

@@ -33,7 +33,6 @@ import androidx.fragment.app.FragmentManager;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.core.TogglePreferenceController;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.core.lifecycle.LifecycleObserver;
import com.android.settingslib.core.lifecycle.events.OnStart;
@@ -114,8 +113,10 @@ public class RoamingPreferenceController extends TelephonyTogglePreferenceContro
public void updateState(Preference preference) {
super.updateState(preference);
final RestrictedSwitchPreference switchPreference = (RestrictedSwitchPreference) preference;
switchPreference.setEnabled(mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID);
switchPreference.setChecked(isChecked());
if (!switchPreference.isDisabledByAdmin()) {
switchPreference.setEnabled(mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID);
switchPreference.setChecked(isChecked());
}
}
@VisibleForTesting