commit 415e8ec42c6f4f9ad15de5568a527233ea1e4e6d
author Jeff Sharkey <jsharkey@android.com> Mon Apr 13 16:22:23 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 13 16:22:23 2015 +0000
tree f13be1a0b97e3394f8b78fbb35a0f14985e5d4a1
parent 3b1a4c6cc2afe590407819fc66c30e9361862950
parent fc3bd5c0c2bb0aa8f701d3df4980a76ef6de9801

Merge "CleanSpec!"

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 66a081d..af9c3b4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -2075,23 +2075,6 @@
                        android:resource="@id/security_settings" />
         </activity>
 
-        <activity android:name="Settings$ConditionProviderSettingsActivity"
-                  android:label="@string/manage_condition_providers"
-                  android:taskAffinity="">
-            <intent-filter android:priority="1">
-                <action android:name="android.settings.ACTION_CONDITION_PROVIDER_SETTINGS" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.intent.category.DEFAULT" />
-            </intent-filter>
-            <meta-data android:name="com.android.settings.FRAGMENT_CLASS"
-                       android:value="com.android.settings.notification.ConditionProviderSettings" />
-            <meta-data android:name="com.android.settings.TOP_LEVEL_HEADER_ID"
-                       android:resource="@id/notification_settings" />
-        </activity>
-
         <activity android:name="Settings$NotificationSettingsActivity"
                 android:label="@string/notification_settings"
                 android:exported="true"

src/com/android/settings/notification/ConditionProviderSettings.java

diff --git a/src/com/android/settings/notification/ConditionProviderSettings.java b/src/com/android/settings/notification/ConditionProviderSettings.java
index 259e53c..76576ab 100644
--- a/src/com/android/settings/notification/ConditionProviderSettings.java
+++ b/src/com/android/settings/notification/ConditionProviderSettings.java
@@ -21,8 +21,6 @@
 import android.provider.Settings;
 import android.service.notification.ConditionProviderService;
 
-import com.android.settings.R;
-
 public class ConditionProviderSettings extends ManagedServiceSettings {
     private static final String TAG = ConditionProviderSettings.class.getSimpleName();
     private static final Config CONFIG = getConditionProviderConfig();
@@ -34,9 +32,6 @@
         c.intentAction = ConditionProviderService.SERVICE_INTERFACE;
         c.permission = android.Manifest.permission.BIND_CONDITION_PROVIDER_SERVICE;
         c.noun = "condition provider";
-        c.warningDialogTitle = R.string.condition_provider_security_warning_title;
-        c.warningDialogSummary = R.string.condition_provider_security_warning_summary;
-        c.emptyText = R.string.no_condition_providers;
         return c;
     }