Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8d74809e authored by Sunny Shao's avatar Sunny Shao
Browse files

Fix the Night Light page UI shrinking 

- This problem causes the TwilightLocationPreferenceController too late
  to decide the preference display or not.
- Move the display criteria into the getAvailabilityStatus

Fixes: 159032276
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=com.android.settings.display
Test: manual review
Change-Id: I5850479e8a891f837c0e6772ad1096e702f95e34
parent c9310c31

src/com/android/settings/display/TwilightLocationPreferenceController.java

+2 −7
Original line number Diff line number Diff line
@@ -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;

    }

}

tests/robotests/src/com/android/settings/display/TwilightLocationPreferenceControllerTest.java

0 → 100644
+68 −0
Original line number Diff line number Diff line 
/*

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

    }

}