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

Remove duplicate result for dark mode

Browse Source 
We only keep the one in display settings.

Test: robo test and search dark mode in settings search.
Fix: 155735315
Change-Id: I71041f473944e854ef4601063658021bb9411069
This commit is contained in:
Tsung-Mao Fang
2020-05-05 21:08:37 +08:00
parent cdab906c45
commit ae9dc54c56
4 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/xml/dark_mode_settings.xml
View File

@@ -53,8 +53,7 @@
android:selectable="false" android:selectable="false"
android:layout="@layout/dark_ui_activation_button" android:layout="@layout/dark_ui_activation_button"
settings:allowDividerBelow="true" settings:allowDividerBelow="true"
settings:controller="com.android.settings.display.darkmode.DarkModeActivationPreferenceController" settings:controller="com.android.settings.display.darkmode.DarkModeActivationPreferenceController"/>
settings:keywords="@string/keywords_dark_ui_mode"/>
<com.android.settingslib.widget.FooterPreference <com.android.settingslib.widget.FooterPreference
android:key="dark_ui_footer" android:key="dark_ui_footer"

3
res/xml/display_settings.xml
View File

@@ -37,7 +37,8 @@
android:fragment="com.android.settings.display.darkmode.DarkModeSettingsFragment" android:fragment="com.android.settings.display.darkmode.DarkModeSettingsFragment"
android:widgetLayout="@null" android:widgetLayout="@null"
settings: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 <com.android.settings.display.NightDisplayPreference
android:key="night_display" android:key="night_display"

2
src/com/android/settings/display/darkmode/DarkModeActivationPreferenceController.java
View File

@@ -156,6 +156,6 @@ public class DarkModeActivationPreferenceController extends BasePreferenceContro
@Override @Override
public int getAvailabilityStatus() { public int getAvailabilityStatus() {
return AVAILABLE; return AVAILABLE_UNSEARCHABLE;
} }
} }

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

@@ -15,6 +15,19 @@
package com.android.settings.display.darkmode; 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.app.UiModeManager;
import android.content.Context; import android.content.Context;
import android.content.res.Configuration; import android.content.res.Configuration;
@@ -22,9 +35,12 @@ import android.content.res.Resources;
import android.os.PowerManager; import android.os.PowerManager;
import android.view.View; import android.view.View;
import android.widget.Button; import android.widget.Button;
import androidx.preference.PreferenceScreen; import androidx.preference.PreferenceScreen;
import com.android.settings.R; import com.android.settings.R;
import com.android.settingslib.widget.LayoutPreference; import com.android.settingslib.widget.LayoutPreference;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import org.junit.runner.RunWith; import org.junit.runner.RunWith;
@@ -34,15 +50,6 @@ import org.robolectric.RobolectricTestRunner;
import java.util.Locale; 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) @RunWith(RobolectricTestRunner.class)
public class DarkModeActivationPreferenceControllerTest { public class DarkModeActivationPreferenceControllerTest {
private DarkModeActivationPreferenceController mController; private DarkModeActivationPreferenceController mController;
@@ -203,4 +210,9 @@ public class DarkModeActivationPreferenceControllerTest {
verify(mTurnOffButton).setVisibility(eq(View.GONE)); verify(mTurnOffButton).setVisibility(eq(View.GONE));
verify(mTurnOnButton).setVisibility(eq(View.GONE)); verify(mTurnOnButton).setVisibility(eq(View.GONE));
} }
@Test
public void getAvailabilityStatus_returnsAVAILABLE_UNSEARCHABLE() {
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE_UNSEARCHABLE);
}
} }