Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Snap for 12053972 from 5c642663de to 24Q4-release

Browse Source 
Change-Id: Ia21eb35058b020c19ccef7a47b11ef6b05dc1827
This commit is contained in:
Android Build Coastguard Worker
2024-07-06 03:22:26 +00:00
parent b3aff91d4c 5c642663de
commit 9063c2b970
8 changed files with 50 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/com/android/settings/accessibility/KeyboardVibrationTogglePreferenceController.java
View File

@@ -154,8 +154,8 @@ public class KeyboardVibrationTogglePreferenceController extends TogglePreferenc
}
private boolean isKeyboardVibrationSwitchEnabled() {
return Settings.System.getInt(mContext.getContentResolver(), KEYBOARD_VIBRATION_ENABLED,
mVibrator.isDefaultKeyboardVibrationEnabled() ? ON : OFF) == ON;
return Settings.System.getInt(
mContext.getContentResolver(), KEYBOARD_VIBRATION_ENABLED, ON) == ON;
}
private boolean updateKeyboardVibrationSetting(boolean enable) {

4
src/com/android/settings/notification/SettingsEnableZenModeDialog.java
View File

@@ -21,13 +21,13 @@ import android.app.settings.SettingsEnums;
import android.os.Bundle;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.notification.modes.EnableZenModeDialog;
public class SettingsEnableZenModeDialog extends InstrumentedDialogFragment {
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
return new com.android.settingslib.notification.EnableZenModeDialog(
getContext()).createDialog();
return new EnableZenModeDialog(getContext()).createDialog();
}
@Override

4
src/com/android/settings/notification/zen/SettingsZenDurationDialog.java
View File

@@ -21,13 +21,13 @@ import android.app.settings.SettingsEnums;
import android.os.Bundle;
import com.android.settings.core.instrumentation.InstrumentedDialogFragment;
import com.android.settingslib.notification.modes.ZenDurationDialog;
public class SettingsZenDurationDialog extends InstrumentedDialogFragment {
@Override
public Dialog onCreateDialog(Bundle savedInstanceState) {
return new com.android.settingslib.notification.ZenDurationDialog(
getContext()).createDialog();
return new ZenDurationDialog(getContext()).createDialog();
}
@Override

2
src/com/android/settings/notification/zen/ZenDurationDialogPreference.java
View File

@@ -23,7 +23,7 @@ import android.util.AttributeSet;
import androidx.appcompat.app.AlertDialog;
import com.android.settingslib.CustomDialogPreferenceCompat;
import com.android.settingslib.notification.ZenDurationDialog;
import com.android.settingslib.notification.modes.ZenDurationDialog;
public class ZenDurationDialogPreference extends CustomDialogPreferenceCompat {

1
src/com/android/settings/password/SetupChooseLockGeneric.java
View File

@@ -243,6 +243,7 @@ public class SetupChooseLockGeneric extends ChooseLockGeneric {
@Override
protected void onCreate(Bundle savedState) {
setTheme(SetupWizardUtils.getTheme(this, getIntent()));
setTheme(R.style.SettingsPreferenceTheme_SetupWizard);
ThemeHelper.trySetDynamicColor(this);
super.onCreate(savedState);
}

1
src/com/android/settings/wfd/WifiDisplayPreferenceController.java
View File

@@ -65,7 +65,6 @@ public class WifiDisplayPreferenceController extends BasePreferenceController im
public WifiDisplayPreferenceController(Context context, String key) {
super(context, key);
mRouter = context.getSystemService(MediaRouter.class);
mRouter.setRouterGroupId(MediaRouter.MIRRORING_GROUP_ID);
}
@Override

15
src/com/android/settings/wifi/AddWifiNetworkPreference.java
View File

@@ -26,11 +26,13 @@ import android.widget.ImageButton;
import androidx.annotation.DrawableRes;
import androidx.annotation.Nullable;
import androidx.annotation.VisibleForTesting;
import androidx.preference.PreferenceViewHolder;
import com.android.settings.R;
import com.android.settings.wifi.dpp.WifiDppUtils;
import com.android.settingslib.RestrictedPreference;
import com.android.settingslib.wifi.WifiEnterpriseRestrictionUtils;
/**
* The Preference for users to add Wi-Fi networks in WifiSettings
@@ -53,7 +55,7 @@ public class AddWifiNetworkPreference extends RestrictedPreference {
setTitle(R.string.wifi_add_network);
mScanIconDrawable = getDrawable(R.drawable.ic_scan_24dp);
checkRestrictionAndSetDisabled(UserManager.DISALLOW_ADD_WIFI_CONFIG);
checkRestrictionAndSetDisabled();
}
@Override
@@ -80,4 +82,15 @@ public class AddWifiNetworkPreference extends RestrictedPreference {
}
return buttonIcon;
}
@VisibleForTesting
void checkRestrictionAndSetDisabled() {
checkRestrictionAndSetDisabled(UserManager.DISALLOW_ADD_WIFI_CONFIG);
if (isDisabledByAdmin()) {
return;
}
if (!WifiEnterpriseRestrictionUtils.isAddWifiConfigAllowed(getContext())) {
setEnabled(false);
}
}
}

39
tests/robotests/src/com/android/settings/wifi/AddWifiNetworkPreferenceTest.java
View File

@@ -15,19 +15,23 @@
*/
package com.android.settings.wifi;
import static android.os.UserManager.DISALLOW_ADD_WIFI_CONFIG;
import static com.google.common.truth.Truth.assertThat;
import static org.mockito.Mockito.spy;
import static org.mockito.Mockito.when;
import android.content.Context;
import android.os.UserManager;
import androidx.test.core.app.ApplicationProvider;
import com.android.settingslib.RestrictedLockUtils;
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.runner.RunWith;
import org.mockito.Mock;
import org.mockito.Spy;
import org.mockito.junit.MockitoJUnit;
import org.mockito.junit.MockitoRule;
@@ -42,31 +46,44 @@ public class AddWifiNetworkPreferenceTest {
public final MockitoRule mMockitoRule = MockitoJUnit.rule();
@Spy
Context mContext = ApplicationProvider.getApplicationContext();
@Mock
private UserManager mUserManager;
private AddWifiNetworkPreference mPreference;
@Before
public void setUp() {
mPreference = new AddWifiNetworkPreference(mContext);
when(mContext.getSystemService(UserManager.class)).thenReturn(mUserManager);
mPreference = spy(new AddWifiNetworkPreference(mContext));
}
@Test
public void updatePreferenceForRestriction_isAddWifiConfigAllowed_prefIsEnabled() {
// If the user is allowed to add Wi-Fi configuration then the EnforcedAdmin will be null.
RestrictedLockUtils.EnforcedAdmin enforcedAdmin = null;
public void checkRestrictionAndSetDisabled_disabledByAdmin_keepEnabledForClicks() {
when(mPreference.isDisabledByAdmin()).thenReturn(true);
mPreference.setDisabledByAdmin(enforcedAdmin);
mPreference.checkRestrictionAndSetDisabled();
assertThat(mPreference.isEnabled()).isTrue();
}
@Test
public void updatePreferenceForRestriction_isAddWifiConfigNotAllowed_prefIsDisabled() {
RestrictedLockUtils.EnforcedAdmin enforcedAdmin = new RestrictedLockUtils.EnforcedAdmin(
null /* component */, UserManager.DISALLOW_ADD_WIFI_CONFIG, null /* user */);
public void checkRestrictionAndSetDisabled_notDisabledByAdmin_setDisabled() {
when(mPreference.isDisabledByAdmin()).thenReturn(false);
when(mUserManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)).thenReturn(true);
mPreference.setDisabledByAdmin(enforcedAdmin);
mPreference.checkRestrictionAndSetDisabled();
assertThat(mPreference.isEnabled()).isFalse();
}
@Test
public void checkRestrictionAndSetDisabled_noRestriction_setEnabled() {
when(mPreference.isDisabledByAdmin()).thenReturn(false);
when(mUserManager.hasUserRestriction(DISALLOW_ADD_WIFI_CONFIG)).thenReturn(false);
mPreference.checkRestrictionAndSetDisabled();
assertThat(mPreference.isEnabled()).isTrue();
}
}