From 9fa38ec42fcd257236e6022e02114e0bf8906d93 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christian=20G=C3=B6llner?= Date: Wed, 16 Feb 2022 09:56:15 +0000 Subject: [PATCH] Revert "Add support for device state based auto-rotation prefere..." Revert "Add support for device state based auto-rotation prefere..." Revert "Add support for device state based auto-rotation prefere..." Revert "Add support for device state based auto-rotation prefere..." Revert submission 16745827-device-state-auto-rotation-preferences-aops Reason for revert: Checking if reason for test failures Reverted Changes: I77ed93f04:Add support for device state based auto-rotation p... I5b2791f54:Add support for device state based auto-rotation p... If254220ca:Add support for device state based auto-rotation p... If254220ca:Add support for device state based auto-rotation p... Fix: 219652963 Change-Id: Ie4b9df0be8fdb24a10a2814a584d6f160924bd9b --- ...eviceStateRotationLockSettingsManager.java | 67 +---------------- ...eStateRotationLockSettingsManagerTest.java | 74 ------------------- 2 files changed, 1 insertion(+), 140 deletions(-) delete mode 100644 packages/SettingsLib/tests/integ/src/com/android/settingslib/devicestate/DeviceStateRotationLockSettingsManagerTest.java diff --git a/packages/SettingsLib/src/com/android/settingslib/devicestate/DeviceStateRotationLockSettingsManager.java b/packages/SettingsLib/src/com/android/settingslib/devicestate/DeviceStateRotationLockSettingsManager.java index fc38ada9b832c..afd3626ab8892 100644 --- a/packages/SettingsLib/src/com/android/settingslib/devicestate/DeviceStateRotationLockSettingsManager.java +++ b/packages/SettingsLib/src/com/android/settingslib/devicestate/DeviceStateRotationLockSettingsManager.java @@ -22,7 +22,6 @@ import static android.provider.Settings.Secure.DEVICE_STATE_ROTATION_LOCK_UNLOCK import android.content.ContentResolver; import android.content.Context; -import android.content.res.Resources; import android.database.ContentObserver; import android.os.Handler; import android.os.UserHandle; @@ -34,10 +33,7 @@ import android.util.SparseIntArray; import com.android.internal.R; import com.android.internal.annotations.VisibleForTesting; -import java.util.ArrayList; import java.util.HashSet; -import java.util.List; -import java.util.Objects; import java.util.Set; /** @@ -52,12 +48,11 @@ public final class DeviceStateRotationLockSettingsManager { private static DeviceStateRotationLockSettingsManager sSingleton; private final ContentResolver mContentResolver; + private final String[] mDeviceStateRotationLockDefaults; private final Handler mMainHandler = Handler.getMain(); private final Set mListeners = new HashSet<>(); - private String[] mDeviceStateRotationLockDefaults; private SparseIntArray mDeviceStateRotationLockSettings; private SparseIntArray mDeviceStateRotationLockFallbackSettings; - private List mSettableDeviceStates; private DeviceStateRotationLockSettingsManager(Context context) { mContentResolver = context.getContentResolver(); @@ -78,12 +73,6 @@ public final class DeviceStateRotationLockSettingsManager { return sSingleton; } - /** Resets the singleton instance of this class. Only used for testing. */ - @VisibleForTesting - public static synchronized void resetInstance() { - sSingleton = null; - } - /** Returns true if device-state based rotation lock settings are enabled. */ public static boolean isDeviceStateRotationLockEnabled(Context context) { return context.getResources() @@ -191,12 +180,6 @@ public final class DeviceStateRotationLockSettingsManager { return true; } - /** Returns a list of device states and their respective auto-rotation setting availability. */ - public List getSettableDeviceStates() { - // Returning a copy to make sure that nothing outside can mutate our internal list. - return new ArrayList<>(mSettableDeviceStates); - } - private void initializeInMemoryMap() { String serializedSetting = Settings.Secure.getStringForUser( @@ -232,17 +215,6 @@ public final class DeviceStateRotationLockSettingsManager { } } - /** - * Resets the state of the class and saved settings back to the default values provided by the - * resources config. - */ - @VisibleForTesting - public void resetStateForTesting(Resources resources) { - mDeviceStateRotationLockDefaults = - resources.getStringArray(R.array.config_perDeviceStateRotationLockDefaults); - fallbackOnDefaults(); - } - private void fallbackOnDefaults() { loadDefaults(); persistSettings(); @@ -279,7 +251,6 @@ public final class DeviceStateRotationLockSettingsManager { } private void loadDefaults() { - mSettableDeviceStates = new ArrayList<>(mDeviceStateRotationLockDefaults.length); mDeviceStateRotationLockSettings = new SparseIntArray( mDeviceStateRotationLockDefaults.length); mDeviceStateRotationLockFallbackSettings = new SparseIntArray(1); @@ -300,8 +271,6 @@ public final class DeviceStateRotationLockSettingsManager { + values.length); } } - boolean isSettable = rotationLockSetting != DEVICE_STATE_ROTATION_LOCK_IGNORED; - mSettableDeviceStates.add(new SettableDeviceState(deviceState, isSettable)); mDeviceStateRotationLockSettings.put(deviceState, rotationLockSetting); } catch (NumberFormatException e) { Log.wtf(TAG, "Error parsing settings entry. Entry was: " + entry, e); @@ -331,38 +300,4 @@ public final class DeviceStateRotationLockSettingsManager { /** Called whenever the settings have changed. */ void onSettingsChanged(); } - - /** Represents a device state and whether it has an auto-rotation setting. */ - public static class SettableDeviceState { - private final int mDeviceState; - private final boolean mIsSettable; - - SettableDeviceState(int deviceState, boolean isSettable) { - mDeviceState = deviceState; - mIsSettable = isSettable; - } - - /** Returns the device state associated with this object. */ - public int getDeviceState() { - return mDeviceState; - } - - /** Returns whether there is an auto-rotation setting for this device state. */ - public boolean isSettable() { - return mIsSettable; - } - - @Override - public boolean equals(Object o) { - if (this == o) return true; - if (!(o instanceof SettableDeviceState)) return false; - SettableDeviceState that = (SettableDeviceState) o; - return mDeviceState == that.mDeviceState && mIsSettable == that.mIsSettable; - } - - @Override - public int hashCode() { - return Objects.hash(mDeviceState, mIsSettable); - } - } } diff --git a/packages/SettingsLib/tests/integ/src/com/android/settingslib/devicestate/DeviceStateRotationLockSettingsManagerTest.java b/packages/SettingsLib/tests/integ/src/com/android/settingslib/devicestate/DeviceStateRotationLockSettingsManagerTest.java deleted file mode 100644 index 8d687b60b6eb9..0000000000000 --- a/packages/SettingsLib/tests/integ/src/com/android/settingslib/devicestate/DeviceStateRotationLockSettingsManagerTest.java +++ /dev/null @@ -1,74 +0,0 @@ -/* - * 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.settingslib.devicestate; - -import static com.google.common.truth.Truth.assertThat; - -import static org.mockito.Mockito.when; - -import android.content.Context; -import android.content.res.Resources; - -import androidx.test.InstrumentationRegistry; -import androidx.test.filters.SmallTest; -import androidx.test.runner.AndroidJUnit4; - -import com.android.internal.R; -import com.android.settingslib.devicestate.DeviceStateRotationLockSettingsManager.SettableDeviceState; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; - -import java.util.List; - -@SmallTest -@RunWith(AndroidJUnit4.class) -public class DeviceStateRotationLockSettingsManagerTest { - - @Mock private Context mMockContext; - @Mock private Resources mMockResources; - - @Before - public void setUp() { - MockitoAnnotations.initMocks(this); - Context context = InstrumentationRegistry.getTargetContext(); - when(mMockContext.getApplicationContext()).thenReturn(mMockContext); - when(mMockContext.getResources()).thenReturn(mMockResources); - when(mMockContext.getContentResolver()).thenReturn(context.getContentResolver()); - } - - @Test - public void getSettableDeviceStates_returnsExpectedValuesInOriginalOrder() { - when(mMockResources.getStringArray( - R.array.config_perDeviceStateRotationLockDefaults)).thenReturn( - new String[]{"2:2", "4:0", "1:1", "0:0"}); - - List settableDeviceStates = - DeviceStateRotationLockSettingsManager.getInstance( - mMockContext).getSettableDeviceStates(); - - assertThat(settableDeviceStates).containsExactly( - new SettableDeviceState(/* deviceState= */ 2, /* isSettable= */ true), - new SettableDeviceState(/* deviceState= */ 4, /* isSettable= */ false), - new SettableDeviceState(/* deviceState= */ 1, /* isSettable= */ true), - new SettableDeviceState(/* deviceState= */ 0, /* isSettable= */ false) - ).inOrder(); - } -}