Remove restricted icon in SettingsMainSwitchBar

- display disable status directly
- click disabled MainSwitchBar will show devicepolicy dialog
- make sure BT and location use MainSwitchBar correctly

Bug: 260406688
Test: manual
Change-Id: I8bb57213eec6dd5e991af580e1a06ebf8a867c28
This commit is contained in:
Edgar Wang
2023-04-06 18:00:30 +08:00
parent ccd03c9e70
commit cd74f76a43
5 changed files with 94 additions and 26 deletions

View File

@@ -0,0 +1,63 @@
/*
* Copyright (C) 2023 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.widget;
import static com.google.common.truth.Truth.assertThat;
import android.content.Context;
import android.widget.TextView;
import com.android.settingslib.R;
import com.android.settingslib.RestrictedLockUtils;
import org.junit.Before;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.MockitoAnnotations;
import org.robolectric.RobolectricTestRunner;
import org.robolectric.RuntimeEnvironment;
@RunWith(RobolectricTestRunner.class)
public class SettingsMainSwitchBarTest {
private SettingsMainSwitchBar mMainSwitchBar;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
final Context context = RuntimeEnvironment.application;
mMainSwitchBar = new SettingsMainSwitchBar(context);
}
@Test
public void disabledByAdmin_shouldBeDisabled() {
mMainSwitchBar.setDisabledByAdmin(new RestrictedLockUtils.EnforcedAdmin());
TextView title = (TextView) mMainSwitchBar.findViewById(R.id.switch_text);
assertThat(title.isEnabled()).isFalse();
assertThat(mMainSwitchBar.getSwitch().isEnabled()).isFalse();
}
@Test
public void disabledByAdmin_setNull_shouldBeEnabled() {
mMainSwitchBar.setDisabledByAdmin(null);
TextView title = (TextView) mMainSwitchBar.findViewById(R.id.switch_text);
assertThat(title.isEnabled()).isTrue();
assertThat(mMainSwitchBar.getSwitch().isEnabled()).isTrue();
}
}