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

Clean up some search nonIndexableKeys.

Browse Source 
- Make the entire gesture setting page unsearchable. This is safe
  because each row in gesture setting page lead to a child page, we are
  only removing duplicates.
- Make the pref controller for System -> gesture return
  AVILABLE_UNSEARCHABLE so it's also suppressed.
- Suppres the parent page for adaptive brightness.

Bug: 72748524
Test: manual
Change-Id: Id7317f5f126af88b1bde8d87b8a206d9909df904
This commit is contained in:
Fan Zhang
2018-05-30 16:20:47 -07:00
parent 50437769a2
commit 7c1233116b
3 changed files with 11 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/com/android/settings/fuelgauge/batterytip/BatteryManagerPreferenceController.java
View File

@@ -20,14 +20,15 @@ import android.app.AppOpsManager;
import android.content.Context;
import android.os.UserManager;
import android.provider.Settings;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
import com.android.settings.overlay.FeatureFactory;
import androidx.annotation.VisibleForTesting;
import androidx.preference.Preference;
/**
* Preference controller to control the battery manager
*/
@@ -48,7 +49,7 @@ public class BatteryManagerPreferenceController extends BasePreferenceController
@Override
public int getAvailabilityStatus() {
return AVAILABLE;
return AVAILABLE_UNSEARCHABLE;
}
@Override

32
src/com/android/settings/gestures/GestureSettings.java
View File

@@ -17,21 +17,15 @@
package com.android.settings.gestures;
import android.content.Context;
import android.os.UserHandle;
import android.provider.SearchIndexableResource;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.internal.logging.nano.MetricsProto;
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.core.lifecycle.Lifecycle;
import com.android.settingslib.search.SearchIndexable;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
@@ -40,15 +34,6 @@ public class GestureSettings extends DashboardFragment {
private static final String TAG = "GestureSettings";
private static final String KEY_ASSIST = "gesture_assist_input_summary";
private static final String KEY_SWIPE_DOWN = "gesture_swipe_down_fingerprint_input_summary";
private static final String KEY_DOUBLE_TAP_POWER = "gesture_double_tap_power_input_summary";
private static final String KEY_DOUBLE_TWIST = "gesture_double_twist_input_summary";
private static final String KEY_DOUBLE_TAP_SCREEN = "gesture_double_tap_screen_input_summary";
private static final String KEY_PICK_UP = "gesture_pick_up_input_summary";
private static final String KEY_PREVENT_RINGING = "gesture_prevent_ringing_summary";
private static final String KEY_SWIPE_UP = "gesture_swipe_up_input_summary";
private AmbientDisplayConfiguration mAmbientDisplayConfig;
@Override
@@ -92,19 +77,10 @@ public class GestureSettings extends DashboardFragment {
}
@Override
public List<String> getNonIndexableKeys(Context context) {
List<String> keys = super.getNonIndexableKeys(context);
// Duplicates in summary and details pages.
keys.add(KEY_ASSIST);
keys.add(KEY_SWIPE_DOWN);
keys.add(KEY_DOUBLE_TAP_POWER);
keys.add(KEY_DOUBLE_TWIST);
keys.add(KEY_SWIPE_UP);
keys.add(KEY_DOUBLE_TAP_SCREEN);
keys.add(KEY_PICK_UP);
keys.add(KEY_PREVENT_RINGING);
return keys;
protected boolean isPageSearchEnabled(Context context) {
// All rows in this screen can lead to a different page, so suppress everything
// from this page to remove duplicates.
return false;
}
};
}

5
src/com/android/settings/gestures/GesturesSettingPreferenceController.java
View File

@@ -19,7 +19,6 @@ package com.android.settings.gestures;
import android.content.ContentResolver;
import android.content.Context;
import android.provider.Settings;
import androidx.annotation.NonNull;
import com.android.internal.hardware.AmbientDisplayConfiguration;
import com.android.settings.R;
@@ -30,6 +29,8 @@ import com.android.settingslib.core.AbstractPreferenceController;
import java.util.ArrayList;
import java.util.List;
import androidx.annotation.NonNull;
public class GesturesSettingPreferenceController extends BasePreferenceController {
private final AssistGestureFeatureProvider mFeatureProvider;
private List<AbstractPreferenceController> mGestureControllers;
@@ -51,7 +52,7 @@ public class GesturesSettingPreferenceController extends BasePreferenceControlle
for (AbstractPreferenceController controller : mGestureControllers) {
isAvailable = isAvailable || controller.isAvailable();
}
return isAvailable ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
return isAvailable ? AVAILABLE_UNSEARCHABLE : UNSUPPORTED_ON_DEVICE;
}
/**