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

Merge "Fix the Night Light page UI shrinking" into rvc-dev am: 6f4aa6e5e0

Browse Source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/11983923

Change-Id: I9ef98879c2581fbe8bf0c466a43ebe6602e3ed7f
This commit is contained in:
TreeHugger Robot
2020-06-24 12:43:25 +00:00
committed by Automerger Merge Worker
parent 04652c4210 6f4aa6e5e0
commit 821d3a21f1
2 changed files with 70 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/display/TwilightLocationPreferenceController.java
View File

@@ -21,7 +21,6 @@ import android.content.Intent;
import android.location.LocationManager;
import android.view.View;
import androidx.preference.Preference;
import androidx.preference.PreferenceScreen;
import com.android.settings.R;
@@ -57,13 +56,9 @@ public class TwilightLocationPreferenceController extends BasePreferenceControll
});
}
@Override
public void updateState(Preference preference) {
preference.setVisible(!mLocationManager.isLocationEnabled());
}
@Override
public int getAvailabilityStatus() {
return AVAILABLE_UNSEARCHABLE;
return mLocationManager.isLocationEnabled() ? CONDITIONALLY_UNAVAILABLE
: AVAILABLE_UNSEARCHABLE;
}
}

68
tests/robotests/src/com/android/settings/display/TwilightLocationPreferenceControllerTest.java Normal file
View File

@@ -0,0 +1,68 @@
/*
* Copyright (C) 2020 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.display;
import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;
import static com.android.settings.core.BasePreferenceController.CONDITIONALLY_UNAVAILABLE;
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.location.LocationManager;
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 TwilightLocationPreferenceControllerTest {
private static final String TEST_KEY = "test_key";
private Context mContext;
private TwilightLocationPreferenceController mController;
@Mock
private LocationManager mLocationManager;
@Before
public void setUp() {
MockitoAnnotations.initMocks(this);
mContext = spy(RuntimeEnvironment.application);
when(mContext.getSystemService(LocationManager.class)).thenReturn(mLocationManager);
mController = new TwilightLocationPreferenceController(mContext, TEST_KEY);
}
@Test
public void getAvailabilityStatus_locationEnabled_shouldBeCONDITIONALLY_UNAVAILABLE() {
when(mLocationManager.isLocationEnabled()).thenReturn(true);
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}
@Test
public void getAvailabilityStatus_locationDisabled_shouldBeAVAILABLE_UNSEARCHABLE() {
when(mLocationManager.isLocationEnabled()).thenReturn(false);
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
}
}