Merge "Misc fixes to search and UI."

2017-05-24 01:25:13 +00:00
parent 07894014d5 82be5f0c3f
commit 2cd55c1255
20 changed files with 51 additions and 42 deletions
--- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java
@@ -848,7 +848,7 @@ public class PowerUsageSummary extends PowerUsageBase implements

                @Override
                public List<String> getNonIndexableKeys(Context context) {
-                    List<String> niks = new ArrayList<>();
+                    List<String> niks = super.getNonIndexableKeys(context);
                    // Duplicates in display
                    niks.add(KEY_AUTO_BRIGHTNESS);
                    niks.add(KEY_SCREEN_TIMEOUT);