Merge "Fix the button display problem in Dark theme page" into rvc-dev am: 985b1e8ffb

Change-Id: I5c7a85ba47eb9f069341946957cedbcf084457f0
This commit is contained in:
Automerger Merge Worker
2020-03-02 10:13:13 +00:00

View File

@@ -15,19 +15,19 @@
package com.android.settings.display.darkmode;
import android.app.Dialog;
import android.app.TimePickerDialog;
import android.app.UiModeManager;
import android.app.settings.SettingsEnums;
import android.content.Context;
import android.os.Bundle;
import android.app.settings.SettingsEnums;
import android.os.PowerManager;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.search.SearchIndexable;
import java.time.LocalTime;
import java.util.ArrayList;
import java.util.List;
@@ -143,5 +143,11 @@ public class DarkModeSettingsFragment extends DashboardFragment {
}
public static final BaseSearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
new BaseSearchIndexProvider(R.xml.dark_mode_settings);
new BaseSearchIndexProvider(R.xml.dark_mode_settings) {
@Override
protected boolean isPageSearchEnabled(Context context) {
return !context.getSystemService(PowerManager.class).isPowerSaveMode();
}
};
}