Revert "Add preference for Ambient Play"

This reverts commit f6e9cd4.
LiquidRemix · Dec 21, 2018 · d53bdec · d53bdec
1 parent c336985
commit d53bdec
Show file tree

Hide file tree

Showing 13 changed files with 0 additions and 289 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -3490,18 +3490,6 @@
                 android:value="com.liquid.liquidlounge.fragments.AmbientSettings" />
         </activity>
 
-        <!-- Ambient play activity -->
-        <activity android:name="Settings$AmbientPlayActivity"
-                android:label="@string/ambient_play_cat"
-                android:excludeFromRecents="true">
-            <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.AmbientPlaySettings" />
-        </activity>
-
         <!-- Smart pixels activity -->
         <activity android:name="Settings$SmartPixelsActivity"
                 android:label="@string/smart_pixels_title"

diff --git a/res/drawable-hdpi/ambient_play_illustration.png b/res/drawable-hdpi/ambient_play_illustration.png
diff --git a/res/drawable-mdpi/ambient_play_illustration.png b/res/drawable-mdpi/ambient_play_illustration.png
diff --git a/res/drawable-xhdpi/ambient_play_illustration.png b/res/drawable-xhdpi/ambient_play_illustration.png
diff --git a/res/drawable-xxhdpi/ambient_play_illustration.png b/res/drawable-xxhdpi/ambient_play_illustration.png
diff --git a/res/drawable-xxxhdpi/ambient_play_illustration.png b/res/drawable-xxxhdpi/ambient_play_illustration.png
diff --git a/res/layout/ambient_play_illustration.xml b/res/layout/ambient_play_illustration.xml
diff --git a/res/values/custom_strings.xml b/res/values/custom_strings.xml
@@ -568,13 +568,6 @@
     <!-- Volume settings - Volume adjustment sound -->
     <string name="volume_adjust_sounds_title">Volume key sounds</string>
 
-    <!-- Ambient Play -->
-    <string name="ambient_play_cat">Now Playing</string>
-    <string name="ambient_recognition_title">Enable Now Playing</string>
-    <string name="ambient_recognition_summary">Be notified of music being played around you</string>
-    <string name="ambient_recognition_lockscreen_title">Show Now Playing</string>
-    <string name="ambient_recognition_lockscreen_summary">On the lockscreen</string>
-
     <!-- Proximity wake -->
     <string name="proximity_wake_title">Prevent accidental wake-up</string>
     <string name="proximity_wake_summary">Check the proximity sensor prior to waking up screen</string>

diff --git a/res/xml/ambient_play_settings.xml b/res/xml/ambient_play_settings.xml
diff --git a/src/com/android/settings/AmbientPlaySettings.java b/src/com/android/settings/AmbientPlaySettings.java
diff --git a/src/com/android/settings/core/gateway/SettingsGateway.java b/src/com/android/settings/core/gateway/SettingsGateway.java
@@ -16,7 +16,6 @@
 
 package com.android.settings.core.gateway;
 
-import com.android.settings.AmbientPlaySettings;
 import com.android.settings.DateTimeSettings;
 import com.android.settings.DeviceAdminSettings;
 import com.android.settings.DisplaySettings;
@@ -283,7 +282,6 @@ public class SettingsGateway {
             ScreenStabilization.class.getName(),
             RunningServices.class.getName(),
             AmbientSettings.class.getName(),
-            AmbientPlaySettings.class.getName(),
             SmartPixels.class.getName(),
             ExpandedDesktopPreferenceFragment.class.getName(),
             DisplayRotation.class.getName(),

diff --git a/src/com/android/settings/liquid/AmbientPlayKeyguardPreferenceController.java b/src/com/android/settings/liquid/AmbientPlayKeyguardPreferenceController.java
diff --git a/src/com/android/settings/liquid/AmbientPlayPreferenceController.java b/src/com/android/settings/liquid/AmbientPlayPreferenceController.java