diff --git a/color-check-baseline.xml b/color-check-baseline.xml index 3ba943b8e90..911a95b5001 100644 --- a/color-check-baseline.xml +++ b/color-check-baseline.xml @@ -4477,6 +4477,22 @@ column="13"/> + + + + false + + + false diff --git a/res/xml/development_settings.xml b/res/xml/development_settings.xml index b93ff41c034..f3ac926305a 100644 --- a/res/xml/development_settings.xml +++ b/res/xml/development_settings.xml @@ -510,6 +510,11 @@ android:title="@string/display_cutout_emulation" settings:keywords="@string/display_cutout_emulation_keywords" /> + + { @Override void commit(int currentProgress) { final ContentResolver resolver = getContext().getContentResolver(); + if (Settings.Secure.getInt(resolver, + Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED, + /* def= */ OFF) != ON) { + Settings.Secure.putInt(resolver, + Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED, ON); + } Settings.System.putFloat(resolver, Settings.System.FONT_SCALE, getValues().get(currentProgress)); } diff --git a/src/com/android/settings/applications/ClonedAppsPreferenceController.java b/src/com/android/settings/applications/ClonedAppsPreferenceController.java index 2b6ab5d05a1..fd6bfe03be0 100644 --- a/src/com/android/settings/applications/ClonedAppsPreferenceController.java +++ b/src/com/android/settings/applications/ClonedAppsPreferenceController.java @@ -56,7 +56,9 @@ public class ClonedAppsPreferenceController extends BasePreferenceController @Override public int getAvailabilityStatus() { return DeviceConfig.getBoolean(DeviceConfig.NAMESPACE_APP_CLONING, - PROPERTY_CLONED_APPS_ENABLED, false) ? AVAILABLE : UNSUPPORTED_ON_DEVICE; + PROPERTY_CLONED_APPS_ENABLED, false) + && mContext.getResources().getBoolean(R.bool.config_cloned_apps_page_enabled) + ? AVAILABLE : UNSUPPORTED_ON_DEVICE; } @Override diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 0d4ad4a97b9..3180a797bd2 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -627,6 +627,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra controllers.add(new RtlLayoutPreferenceController(context)); controllers.add(new WindowAnimationScalePreferenceController(context)); controllers.add(new EmulateDisplayCutoutPreferenceController(context)); + controllers.add(new TransparentNavigationBarPreferenceController(context)); controllers.add(new TransitionAnimationScalePreferenceController(context)); controllers.add(new AnimatorDurationScalePreferenceController(context)); controllers.add(new SecondaryDisplayPreferenceController(context)); diff --git a/src/com/android/settings/development/TransparentNavigationBarPreferenceController.java b/src/com/android/settings/development/TransparentNavigationBarPreferenceController.java new file mode 100644 index 00000000000..d1f54b54e18 --- /dev/null +++ b/src/com/android/settings/development/TransparentNavigationBarPreferenceController.java @@ -0,0 +1,91 @@ +/* + * 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.development; + +import static android.os.UserHandle.USER_CURRENT; + +import android.content.Context; +import android.content.om.IOverlayManager; +import android.os.RemoteException; +import android.os.ServiceManager; + +import androidx.preference.Preference; +import androidx.preference.SwitchPreference; + +import com.android.internal.R; +import com.android.internal.annotations.VisibleForTesting; +import com.android.settings.core.PreferenceControllerMixin; +import com.android.settingslib.development.DeveloperOptionsPreferenceController; + +public class TransparentNavigationBarPreferenceController + extends DeveloperOptionsPreferenceController + implements Preference.OnPreferenceChangeListener, PreferenceControllerMixin { + + private static final String TRANSPARENT_NAVIGATION_BAR_KEY = + "transparent_navigation_bar"; + + private static final String OVERLAY_PACKAGE_NAME = + "com.android.internal.systemui.navbar.transparent"; + + private final IOverlayManager mOverlayManager; + + public TransparentNavigationBarPreferenceController(Context context) { + super(context); + mOverlayManager = IOverlayManager.Stub.asInterface( + ServiceManager.getService(Context.OVERLAY_SERVICE)); + } + + @Override + public String getPreferenceKey() { + return TRANSPARENT_NAVIGATION_BAR_KEY; + } + + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) { + setEnabled((boolean) newValue); + return true; + } + + @Override + public void updateState(Preference preference) { + ((SwitchPreference) mPreference).setChecked(isEnabled()); + } + + @Override + protected void onDeveloperOptionsSwitchDisabled() { + super.onDeveloperOptionsSwitchDisabled(); + ((SwitchPreference) mPreference).setChecked(false); + final boolean enabled = isEnabled(); + if (!enabled) { + setEnabled(false); + } + } + + @VisibleForTesting + protected boolean isEnabled() { + return mContext.getResources().getBoolean(R.bool.config_navBarDefaultTransparent); + } + + @VisibleForTesting + protected void setEnabled(boolean enabled) { + try { + mOverlayManager.setEnabled(OVERLAY_PACKAGE_NAME, enabled, USER_CURRENT); + } catch (RemoteException e) { + throw e.rethrowFromSystemServer(); + } + } +} diff --git a/src/com/android/settings/network/EthernetTetherPreferenceController.java b/src/com/android/settings/network/EthernetTetherPreferenceController.java index 17b4b021315..6024839ca77 100644 --- a/src/com/android/settings/network/EthernetTetherPreferenceController.java +++ b/src/com/android/settings/network/EthernetTetherPreferenceController.java @@ -50,7 +50,7 @@ public final class EthernetTetherPreferenceController extends TetherBasePreferen @OnLifecycleEvent(Lifecycle.Event.ON_START) public void onStart() { mEthernetListener = (iface, state, role, configuration) -> { - if (state == EthernetManager.STATE_LINK_UP) { + if (state != EthernetManager.STATE_ABSENT) { mAvailableInterfaces.add(iface); } else { mAvailableInterfaces.remove(iface); diff --git a/tests/robotests/src/com/android/settings/accessibility/FontSizeDataTest.java b/tests/robotests/src/com/android/settings/accessibility/FontSizeDataTest.java index 7e357140811..adf7495a069 100644 --- a/tests/robotests/src/com/android/settings/accessibility/FontSizeDataTest.java +++ b/tests/robotests/src/com/android/settings/accessibility/FontSizeDataTest.java @@ -16,6 +16,9 @@ package com.android.settings.accessibility; +import static com.android.settings.accessibility.AccessibilityUtil.State.OFF; +import static com.android.settings.accessibility.AccessibilityUtil.State.ON; + import static com.google.common.truth.Truth.assertThat; import android.content.Context; @@ -52,4 +55,19 @@ public class FontSizeDataTest { assertThat(currentScale).isEqualTo(mFontSizeData.getValues().get(progress)); } + + @Test + public void commit_fontScalingHasBeenChangedIsOn() { + final int progress = 3; + Settings.Secure.putInt(mContext.getContentResolver(), + Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED, OFF); + + mFontSizeData.commit(progress); + final int currentSettings = Settings.Secure.getInt( + mContext.getContentResolver(), + Settings.Secure.ACCESSIBILITY_FONT_SCALING_HAS_BEEN_CHANGED, + /* def= */ OFF); + + assertThat(currentSettings).isEqualTo(ON); + } } diff --git a/tests/robotests/src/com/android/settings/development/TransparentNavigationBarPreferenceControllerTest.java b/tests/robotests/src/com/android/settings/development/TransparentNavigationBarPreferenceControllerTest.java new file mode 100644 index 00000000000..a1b3892b6e0 --- /dev/null +++ b/tests/robotests/src/com/android/settings/development/TransparentNavigationBarPreferenceControllerTest.java @@ -0,0 +1,102 @@ +/* + * 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.development; + +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + +import androidx.preference.PreferenceScreen; +import androidx.preference.SwitchPreference; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.robolectric.RobolectricTestRunner; +import org.robolectric.RuntimeEnvironment; + +@RunWith(RobolectricTestRunner.class) +public class TransparentNavigationBarPreferenceControllerTest { + + @Mock + private PreferenceScreen mScreen; + @Mock + private SwitchPreference mPreference; + + private TransparentNavigationBarPreferenceController mController; + + @Before + public void setUp() { + MockitoAnnotations.initMocks(this); + mController = new TransparentNavigationBarPreferenceController( + RuntimeEnvironment.application) { + private boolean mEnabled; + + protected boolean isEnabled() { + return mEnabled; + } + + protected void setEnabled(boolean enabled) { + mEnabled = enabled; + } + }; + when(mScreen.findPreference(mController.getPreferenceKey())).thenReturn(mPreference); + mController.displayPreference(mScreen); + } + + @Test + public void updateState_enabled_shouldCheckedPreference() { + mController.setEnabled(true); + mController.updateState(mPreference); + + verify(mPreference).setChecked(true); + } + + @Test + public void updateState_disabled_shouldUncheckedPreference() { + mController.setEnabled(false); + mController.updateState(mPreference); + + verify(mPreference).setChecked(false); + } + + @Test + public void onPreferenceChange_preferenceChecked_shouldBeEnabled() { + mController.onPreferenceChange(mPreference, true /* new value */); + + assertTrue(mController.isEnabled()); + } + + @Test + public void onPreferenceChange__preferenceUnchecked_shouldNotBeEnabled() { + mController.onPreferenceChange(mPreference, false /* new value */); + + assertFalse(mController.isEnabled()); + } + + @Test + public void onDeveloperOptionsSwitchDisabled_preferenceShouldNotBeEnabled() { + mController.onDeveloperOptionsSwitchDisabled(); + + assertFalse(mController.isEnabled()); + verify(mPreference).setEnabled(false); + verify(mPreference).setChecked(false); + } +}