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

Commit ae9dc54c authored by Tsung-Mao Fang's avatar Tsung-Mao Fang
Browse files

Remove duplicate result for dark mode 

We only keep the one in display settings.

Test: robo test and search dark mode in settings search.
Fix: 155735315
Change-Id: I71041f473944e854ef4601063658021bb9411069
parent cdab906c

res/xml/dark_mode_settings.xml

+1 −2
Original line number Diff line number Diff line
@@ -53,8 +53,7 @@ 
        android:selectable="false"

        android:layout="@layout/dark_ui_activation_button"

        settings:allowDividerBelow="true"

        settings:controller="com.android.settings.display.darkmode.DarkModeActivationPreferenceController"

        settings:keywords="@string/keywords_dark_ui_mode"/>

        settings:controller="com.android.settings.display.darkmode.DarkModeActivationPreferenceController"/>



    <com.android.settingslib.widget.FooterPreference

            android:key="dark_ui_footer"

res/xml/display_settings.xml

+2 −1
Original line number Diff line number Diff line
@@ -37,7 +37,8 @@ 
        android:fragment="com.android.settings.display.darkmode.DarkModeSettingsFragment"

        android:widgetLayout="@null"

        settings:widgetLayout="@null"

        settings:controller="com.android.settings.display.DarkUIPreferenceController"/>

        settings:controller="com.android.settings.display.DarkUIPreferenceController"

        settings:keywords="@string/keywords_dark_ui_mode"/>



    <com.android.settings.display.NightDisplayPreference

        android:key="night_display"

src/com/android/settings/display/darkmode/DarkModeActivationPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -156,6 +156,6 @@ public class DarkModeActivationPreferenceController extends BasePreferenceContro 


    @Override

    public int getAvailabilityStatus() {

        return AVAILABLE;

        return AVAILABLE_UNSEARCHABLE;

    }

}

tests/robotests/src/com/android/settings/display/darkmode/DarkModeActivationPreferenceControllerTest.java

+21 −9
Original line number Diff line number Diff line
@@ -15,6 +15,19 @@ 


package com.android.settings.display.darkmode;



import static com.android.settings.core.BasePreferenceController.AVAILABLE_UNSEARCHABLE;



import static com.google.common.truth.Truth.assertThat;



import static org.junit.Assert.assertEquals;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.Mockito.eq;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;



import android.app.UiModeManager;

import android.content.Context;

import android.content.res.Configuration;
@@ -22,9 +35,12 @@ import android.content.res.Resources; 
import android.os.PowerManager;

import android.view.View;

import android.widget.Button;



import androidx.preference.PreferenceScreen;



import com.android.settings.R;

import com.android.settingslib.widget.LayoutPreference;



import org.junit.Before;

import org.junit.Test;

import org.junit.runner.RunWith;
@@ -34,15 +50,6 @@ import org.robolectric.RobolectricTestRunner; 


import java.util.Locale;



import static org.junit.Assert.assertEquals;

import static org.mockito.ArgumentMatchers.any;

import static org.mockito.ArgumentMatchers.anyBoolean;

import static org.mockito.ArgumentMatchers.anyString;

import static org.mockito.Mockito.mock;

import static org.mockito.Mockito.verify;

import static org.mockito.Mockito.when;

import static org.mockito.Mockito.eq;



@RunWith(RobolectricTestRunner.class)

public class DarkModeActivationPreferenceControllerTest {

    private DarkModeActivationPreferenceController mController;
@@ -203,4 +210,9 @@ public class DarkModeActivationPreferenceControllerTest { 
        verify(mTurnOffButton).setVisibility(eq(View.GONE));

        verify(mTurnOnButton).setVisibility(eq(View.GONE));

    }



    @Test

    public void getAvailabilityStatus_returnsAVAILABLE_UNSEARCHABLE() {

        assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);

    }

}