summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/search
diff options
context:
space:
mode:
authorNick Kralevich <nnk@google.com>2015-05-13 11:54:20 -0700
committerNick Kralevich <nnk@google.com>2015-05-13 15:23:52 -0700
commit7000d5433880b736bd67cbb44f66df771b64ee1b (patch)
tree437978fb76cf2b4314b706b545aebc5dba39cf6d /src/com/android/settings/search
parent07851208fc43afb343085bbfc9fbab6741d8bb03 (diff)
downloadpackages_apps_Settings-7000d5433880b736bd67cbb44f66df771b64ee1b.zip
packages_apps_Settings-7000d5433880b736bd67cbb44f66df771b64ee1b.tar.gz
packages_apps_Settings-7000d5433880b736bd67cbb44f66df771b64ee1b.tar.bz2
New UI for controlling USB
Create a new UI for managing USB access control. This UI is implemented as a transparent popup triggered by a persistent notification. Delete the old UI for controlling this. It is no longer used. Bug: 18905620 Change-Id: I54186961414447a9d37f68e946e1c167506170ae
Diffstat (limited to 'src/com/android/settings/search')
-rw-r--r--src/com/android/settings/search/Ranking.java2
-rw-r--r--src/com/android/settings/search/SearchIndexableResources.java8
2 files changed, 0 insertions, 10 deletions
diff --git a/src/com/android/settings/search/Ranking.java b/src/com/android/settings/search/Ranking.java
index e1eec5f..93e0948 100644
--- a/src/com/android/settings/search/Ranking.java
+++ b/src/com/android/settings/search/Ranking.java
@@ -34,7 +34,6 @@ import com.android.settings.applications.AdvancedAppSettings;
import com.android.settings.applications.ManageDefaultApps;
import com.android.settings.bluetooth.BluetoothSettings;
import com.android.settings.deviceinfo.StorageSettings;
-import com.android.settings.deviceinfo.UsbSettings;
import com.android.settings.fuelgauge.BatterySaverSettings;
import com.android.settings.fuelgauge.PowerUsageSummary;
import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
@@ -131,7 +130,6 @@ public final class Ranking {
// Storage
sRankMap.put(StorageSettings.class.getName(), RANK_STORAGE);
- sRankMap.put(UsbSettings.class.getName(), RANK_STORAGE);
// Battery
sRankMap.put(PowerUsageSummary.class.getName(), RANK_POWER_USAGE);
diff --git a/src/com/android/settings/search/SearchIndexableResources.java b/src/com/android/settings/search/SearchIndexableResources.java
index a3d2ddc..4d28d4a 100644
--- a/src/com/android/settings/search/SearchIndexableResources.java
+++ b/src/com/android/settings/search/SearchIndexableResources.java
@@ -36,7 +36,6 @@ import com.android.settings.applications.AdvancedAppSettings;
import com.android.settings.applications.ManageDefaultApps;
import com.android.settings.bluetooth.BluetoothSettings;
import com.android.settings.deviceinfo.StorageSettings;
-import com.android.settings.deviceinfo.UsbSettings;
import com.android.settings.fuelgauge.BatterySaverSettings;
import com.android.settings.fuelgauge.PowerUsageSummary;
import com.android.settings.inputmethod.InputMethodAndLanguageSettings;
@@ -178,13 +177,6 @@ public final class SearchIndexableResources {
StorageSettings.class.getName(),
R.drawable.ic_settings_storage));
- sResMap.put(UsbSettings.class.getName(),
- new SearchIndexableResource(
- Ranking.getRankForClassName(UsbSettings.class.getName()),
- R.xml.usb_settings,
- UsbSettings.class.getName(),
- R.drawable.ic_settings_storage));
-
sResMap.put(PowerUsageSummary.class.getName(),
new SearchIndexableResource(
Ranking.getRankForClassName(PowerUsageSummary.class.getName()),