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

Merge "Conditionally block battery percantage from search" into pi-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2018-07-03 21:35:32 +00:00
committed by Android (Google) Code Review
parent f406fd7976 5e8005db42
commit ea97a66383
2 changed files with 36 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/fuelgauge/PowerUsageSummary.java
View File

@@ -472,6 +472,12 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList
@Override @Override
public List<String> getNonIndexableKeys(Context context) { public List<String> getNonIndexableKeys(Context context) {
List<String> niks = super.getNonIndexableKeys(context); List<String> niks = super.getNonIndexableKeys(context);
final BatteryPercentagePreferenceController controller =
new BatteryPercentagePreferenceController(context);
if (!controller.isAvailable()) {
niks.add(controller.getPreferenceKey());
}
niks.add(KEY_BATTERY_SAVER_SUMMARY); niks.add(KEY_BATTERY_SAVER_SUMMARY);
return niks; return niks;
} }

30
tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java
View File

@@ -35,6 +35,7 @@ import static org.mockito.Mockito.when;
import android.app.LoaderManager; import android.app.LoaderManager;
import android.content.Context; import android.content.Context;
import android.content.Intent; import android.content.Intent;
import android.content.res.Resources;
import android.os.Bundle; import android.os.Bundle;
import android.util.SparseArray; import android.util.SparseArray;
import android.view.Menu; import android.view.Menu;
@@ -49,6 +50,7 @@ import com.android.settings.R;
import com.android.settings.SettingsActivity; import com.android.settings.SettingsActivity;
import com.android.settings.applications.LayoutPreference; import com.android.settings.applications.LayoutPreference;
import com.android.settings.dashboard.SummaryLoader; import com.android.settings.dashboard.SummaryLoader;
import com.android.settings.display.BatteryPercentagePreferenceController;
import com.android.settings.fuelgauge.anomaly.Anomaly; import com.android.settings.fuelgauge.anomaly.Anomaly;
import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController; import com.android.settings.fuelgauge.batterytip.BatteryTipPreferenceController;
import com.android.settings.testutils.FakeFeatureFactory; import com.android.settings.testutils.FakeFeatureFactory;
@@ -390,6 +392,34 @@ public class PowerUsageSummaryTest {
.isEqualTo("3% - Phone will shut down soon"); .isEqualTo("3% - Phone will shut down soon");
} }
@Test
public void percentageSettingAvailable_shouldNotBeHiddenInSearch() {
final Resources resources = spy(mRealContext.getResources());
doReturn(true).when(resources).getBoolean(anyInt());
doReturn(resources).when(mRealContext).getResources();
final String prefKey = new BatteryPercentagePreferenceController(mRealContext)
.getPreferenceKey();
final List<String> nonIndexableKeys =
PowerUsageSummary.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mRealContext);
assertThat(nonIndexableKeys).doesNotContain(prefKey);
}
@Test
public void percentageSettingNotAvailable_shouldBeHiddenInSearch() {
final Resources resources = spy(mRealContext.getResources());
doReturn(false).when(resources).getBoolean(anyInt());
doReturn(resources).when(mRealContext).getResources();
final String prefKey = new BatteryPercentagePreferenceController(mRealContext)
.getPreferenceKey();
final List<String> nonIndexableKeys =
PowerUsageSummary.SEARCH_INDEX_DATA_PROVIDER.getNonIndexableKeys(mRealContext);
assertThat(nonIndexableKeys).contains(prefKey);
}
public static class TestFragment extends PowerUsageSummary { public static class TestFragment extends PowerUsageSummary {
private Context mContext; private Context mContext;