Restrict Hotspot tile in Quick Settings
- Disable Hotspot tile when user is not allowed to enable Wi-Fi tethering. - Show restriction message in Hotspot tile secondary label. Bug: 203168953 Test: manual test atest -c com.android.systemui.qs.tiles.HotspotTileTest Change-Id: Ibe8f1824090dacb1aa03b116adcd2ae5e7ea2892
This commit is contained in:
@@ -30,6 +30,7 @@ import androidx.annotation.Nullable;
|
||||
|
||||
import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
|
||||
import com.android.settingslib.wifi.WifiEnterpriseRestrictionUtils;
|
||||
import com.android.systemui.R;
|
||||
import com.android.systemui.dagger.qualifiers.Background;
|
||||
import com.android.systemui.dagger.qualifiers.Main;
|
||||
@@ -158,7 +159,9 @@ public class HotspotTile extends QSTileImpl<BooleanState> {
|
||||
state.expandedAccessibilityClassName = Switch.class.getName();
|
||||
state.contentDescription = state.label;
|
||||
|
||||
final boolean isTileUnavailable = isDataSaverEnabled;
|
||||
final boolean isWifiTetheringAllowed =
|
||||
WifiEnterpriseRestrictionUtils.isWifiTetheringAllowed(mHost.getUserContext());
|
||||
final boolean isTileUnavailable = isDataSaverEnabled || !isWifiTetheringAllowed;
|
||||
final boolean isTileActive = (state.value || state.isTransient);
|
||||
|
||||
if (isTileUnavailable) {
|
||||
@@ -167,15 +170,17 @@ public class HotspotTile extends QSTileImpl<BooleanState> {
|
||||
state.state = isTileActive ? Tile.STATE_ACTIVE : Tile.STATE_INACTIVE;
|
||||
}
|
||||
|
||||
state.secondaryLabel = getSecondaryLabel(
|
||||
isTileActive, isTransient, isDataSaverEnabled, numConnectedDevices);
|
||||
state.secondaryLabel = getSecondaryLabel(isTileActive, isTransient, isDataSaverEnabled,
|
||||
numConnectedDevices, isWifiTetheringAllowed);
|
||||
state.stateDescription = state.secondaryLabel;
|
||||
}
|
||||
|
||||
@Nullable
|
||||
private String getSecondaryLabel(boolean isActive, boolean isTransient,
|
||||
boolean isDataSaverEnabled, int numConnectedDevices) {
|
||||
if (isTransient) {
|
||||
boolean isDataSaverEnabled, int numConnectedDevices, boolean isWifiTetheringAllowed) {
|
||||
if (!isWifiTetheringAllowed) {
|
||||
return mContext.getString(R.string.wifitrackerlib_admin_restricted_network);
|
||||
} else if (isTransient) {
|
||||
return mContext.getString(R.string.quick_settings_hotspot_secondary_label_transient);
|
||||
} else if (isDataSaverEnabled) {
|
||||
return mContext.getString(
|
||||
|
||||
@@ -0,0 +1,125 @@
|
||||
/*
|
||||
* Copyright (C) 2022 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.systemui.qs.tiles;
|
||||
|
||||
import static com.google.common.truth.Truth.assertThat;
|
||||
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
import android.os.Handler;
|
||||
import android.service.quicksettings.Tile;
|
||||
import android.testing.AndroidTestingRunner;
|
||||
import android.testing.TestableLooper;
|
||||
|
||||
import androidx.test.filters.SmallTest;
|
||||
|
||||
import com.android.dx.mockito.inline.extended.ExtendedMockito;
|
||||
import com.android.internal.logging.MetricsLogger;
|
||||
import com.android.settingslib.wifi.WifiEnterpriseRestrictionUtils;
|
||||
import com.android.systemui.R;
|
||||
import com.android.systemui.SysuiTestCase;
|
||||
import com.android.systemui.classifier.FalsingManagerFake;
|
||||
import com.android.systemui.plugins.ActivityStarter;
|
||||
import com.android.systemui.plugins.qs.QSTile;
|
||||
import com.android.systemui.plugins.statusbar.StatusBarStateController;
|
||||
import com.android.systemui.qs.QSTileHost;
|
||||
import com.android.systemui.qs.logging.QSLogger;
|
||||
import com.android.systemui.statusbar.policy.DataSaverController;
|
||||
import com.android.systemui.statusbar.policy.HotspotController;
|
||||
|
||||
import org.junit.Before;
|
||||
import org.junit.Rule;
|
||||
import org.junit.Test;
|
||||
import org.junit.runner.RunWith;
|
||||
import org.mockito.Mock;
|
||||
import org.mockito.MockitoSession;
|
||||
import org.mockito.junit.MockitoJUnit;
|
||||
import org.mockito.junit.MockitoRule;
|
||||
|
||||
@RunWith(AndroidTestingRunner.class)
|
||||
@TestableLooper.RunWithLooper(setAsMainLooper = true)
|
||||
@SmallTest
|
||||
public class HotspotTileTest extends SysuiTestCase {
|
||||
|
||||
@Rule
|
||||
public MockitoRule mRule = MockitoJUnit.rule();
|
||||
@Mock
|
||||
private QSTileHost mHost;
|
||||
@Mock
|
||||
private HotspotController mHotspotController;
|
||||
@Mock
|
||||
private DataSaverController mDataSaverController;
|
||||
|
||||
private TestableLooper mTestableLooper;
|
||||
private HotspotTile mTile;
|
||||
private QSTile.BooleanState mState = new QSTile.BooleanState();
|
||||
|
||||
@Before
|
||||
public void setUp() throws Exception {
|
||||
mTestableLooper = TestableLooper.get(this);
|
||||
when(mHost.getContext()).thenReturn(mContext);
|
||||
when(mHost.getUserContext()).thenReturn(mContext);
|
||||
when(mDataSaverController.isDataSaverEnabled()).thenReturn(false);
|
||||
|
||||
mTile = new HotspotTile(
|
||||
mHost,
|
||||
mTestableLooper.getLooper(),
|
||||
new Handler(mTestableLooper.getLooper()),
|
||||
new FalsingManagerFake(),
|
||||
mock(MetricsLogger.class),
|
||||
mock(StatusBarStateController.class),
|
||||
mock(ActivityStarter.class),
|
||||
mock(QSLogger.class),
|
||||
mHotspotController,
|
||||
mDataSaverController
|
||||
);
|
||||
|
||||
mTile.initialize();
|
||||
mTestableLooper.processAllMessages();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void handleUpdateState_wifiTetheringIsAllowed_stateIsNotUnavailable() {
|
||||
MockitoSession mockitoSession = ExtendedMockito.mockitoSession()
|
||||
.spyStatic(WifiEnterpriseRestrictionUtils.class)
|
||||
.startMocking();
|
||||
when(WifiEnterpriseRestrictionUtils.isWifiTetheringAllowed(mContext)).thenReturn(true);
|
||||
|
||||
mTile.handleUpdateState(mState, null);
|
||||
|
||||
assertThat(mState.state).isNotEqualTo(Tile.STATE_UNAVAILABLE);
|
||||
assertThat(String.valueOf(mState.secondaryLabel))
|
||||
.isNotEqualTo(mContext.getString(R.string.wifitrackerlib_admin_restricted_network));
|
||||
mockitoSession.finishMocking();
|
||||
}
|
||||
|
||||
@Test
|
||||
public void handleUpdateState_wifiTetheringIsDisallowed_stateIsUnavailable() {
|
||||
MockitoSession mockitoSession = ExtendedMockito.mockitoSession()
|
||||
.spyStatic(WifiEnterpriseRestrictionUtils.class)
|
||||
.startMocking();
|
||||
when(WifiEnterpriseRestrictionUtils.isWifiTetheringAllowed(mContext)).thenReturn(false);
|
||||
|
||||
mTile.handleUpdateState(mState, null);
|
||||
|
||||
assertThat(mState.state).isEqualTo(Tile.STATE_UNAVAILABLE);
|
||||
assertThat(String.valueOf(mState.secondaryLabel))
|
||||
.isEqualTo(mContext.getString(R.string.wifitrackerlib_admin_restricted_network));
|
||||
mockitoSession.finishMocking();
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user