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

Snap for 9712464 from cebb55826f to udc-release

Browse Source 
Change-Id: Ia3662a02779e62df322ccb5aa69ad4f5db8fe03f
This commit is contained in:
Android Build Coastguard Worker
2023-03-09 02:27:59 +00:00
parent b003eefc81 cebb55826f
commit cee82831b3
10 changed files with 249 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
color-check-baseline.xml
View File

@@ -4477,6 +4477,22 @@
column="13"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"
message="Avoid using hardcoded color"
category="Correctness"
priority="4"
summary="Using hardcoded color"
explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
errorLine1=" android:tint=&quot;#4F8438&quot;"
errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~">
<location
file="res/layout/locale_dialog.xml"
line="36"
column="13"/>
</issue>
<issue
id="HardCodedColor"
severity="Error"

3
res/values/config.xml
View File

@@ -698,4 +698,7 @@
<!-- Whether checking adaptive charging to define battery manager visibility. -->
<bool name="config_battery_manager_consider_ac">false</bool>
<!-- Whether to display Cloned Apps page in Settings (Settings > Apps > Cloned Apps).-->
<bool name="config_cloned_apps_page_enabled">false</bool>
</resources>

5
res/xml/development_settings.xml
View File

@@ -510,6 +510,11 @@
android:title="@string/display_cutout_emulation"
settings:keywords="@string/display_cutout_emulation_keywords" />
<SwitchPreference
android:key="transparent_navigation_bar"
android:title="@string/transparent_navigation_bar"
android:summary="@string/transparent_navigation_bar_summary" />
</PreferenceCategory>
<PreferenceCategory

9
src/com/android/settings/accessibility/FontSizeData.java
View File

@@ -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 android.content.ContentResolver;
import android.content.Context;
import android.content.res.Resources;
@@ -50,6 +53,12 @@ final class FontSizeData extends PreviewSizeData<Float> {
@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));
}

4
src/com/android/settings/applications/ClonedAppsPreferenceController.java
View File

@@ -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

1
src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java
View File

@@ -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));

91
src/com/android/settings/development/TransparentNavigationBarPreferenceController.java Normal file
View File

@@ -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();
}
}
}

2
src/com/android/settings/network/EthernetTetherPreferenceController.java
View File

@@ -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);

18
tests/robotests/src/com/android/settings/accessibility/FontSizeDataTest.java
View File

@@ -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);
}
}

102
tests/robotests/src/com/android/settings/development/TransparentNavigationBarPreferenceControllerTest.java Normal file
View File

@@ -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);
}
}