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

Merge \"Add Gestures settings to search index.\" into nyc-mr1-dev

Browse Source 
am: bd3ac3bf22

Change-Id: I0d7aa14a24f496aba842d5b70176bc6f44c49c3b
This commit is contained in:
Doris Ling
2016-07-19 20:21:45 +00:00
committed by android-build-merger
parent f465a1b635 bd3ac3bf22
commit 6f975d2430
3 changed files with 16 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -230,6 +230,9 @@ public class GestureSettings extends SettingsPreferenceFragment implements
if (!isSystemUINavigationAvailable(context)) {
result.add(PREF_KEY_SWIPE_DOWN_FINGERPRINT);
}
if (!isDoubleTwistAvailable(context)) {
result.add(PREF_KEY_DOUBLE_TWIST);
}
return result;
}
};

5
src/com/android/settings/search/Ranking.java
View File

@@ -38,6 +38,7 @@ import com.android.settings.deviceinfo.StorageSettings;
import com.android.settings.display.ScreenZoomSettings;
import com.android.settings.fuelgauge.BatterySaverSettings;
import com.android.settings.fuelgauge.PowerUsageSummary;
import com.android.settings.gestures.GestureSettings;
import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
import com.android.settings.location.LocationSettings;
import com.android.settings.location.ScanningSettings;
@@ -85,6 +86,7 @@ public final class Ranking {
public static final int RANK_PRINTING = 21;
public static final int RANK_DEVELOPEMENT = 22;
public static final int RANK_DEVICE_INFO = 23;
public static final int RANK_GESTURE = 24;
public static final int RANK_UNDEFINED = -1;
public static final int RANK_OTHERS = 1024;
@@ -146,6 +148,9 @@ public final class Ranking {
// Users
sRankMap.put(UserSettings.class.getName(), RANK_USERS);
// Gestures
sRankMap.put(GestureSettings.class.getName(), RANK_GESTURE);
// Location
sRankMap.put(LocationSettings.class.getName(), RANK_LOCATION);
sRankMap.put(ScanningSettings.class.getName(), RANK_LOCATION);

8
src/com/android/settings/search/SearchIndexableResources.java
View File

@@ -39,6 +39,7 @@ import com.android.settings.deviceinfo.StorageSettings;
import com.android.settings.display.ScreenZoomSettings;
import com.android.settings.fuelgauge.BatterySaverSettings;
import com.android.settings.fuelgauge.PowerUsageSummary;
import com.android.settings.gestures.GestureSettings;
import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
import com.android.settings.location.LocationSettings;
import com.android.settings.location.ScanningSettings;
@@ -220,6 +221,13 @@ public final class SearchIndexableResources {
UserSettings.class.getName(),
R.drawable.ic_settings_multiuser));
sResMap.put(GestureSettings.class.getName(),
new SearchIndexableResource(
Ranking.getRankForClassName(GestureSettings.class.getName()),
NO_DATA_RES_ID,
GestureSettings.class.getName(),
R.drawable.ic_settings_gestures));
sResMap.put(LocationSettings.class.getName(),
new SearchIndexableResource(
Ranking.getRankForClassName(LocationSettings.class.getName()),