From 6431f3183c7cf0e7ccbf3b8df1655f6154a5d795 Mon Sep 17 00:00:00 2001 From: Lostark13 Date: Tue, 12 Nov 2024 18:19:29 +0530 Subject: [PATCH] Revert "sky: parts: Import MiSound" This reverts commit 0c31bb8c3519df7ba3deacbb1dcf34652d5b24a5. --- parts/AndroidManifest.xml | 16 -- parts/res/drawable/ic_dirac.xml | 13 -- parts/res/drawable/ic_preset.xml | 11 -- parts/res/drawable/ic_scenes.xml | 9 -- parts/res/values/arrays.xml | 112 -------------- parts/res/values/strings.xml | 60 -------- parts/res/xml/dirac_settings.xml | 54 ------- .../settings/BootCompletedReceiver.java | 2 - .../settings/dirac/DiracActivity.java | 35 ----- .../settings/dirac/DiracSettingsFragment.java | 118 --------------- .../lineageos/settings/dirac/DiracSound.java | 65 -------- .../settings/dirac/DiracTileService.java | 42 ------ .../lineageos/settings/dirac/DiracUtils.java | 141 ------------------ .../xiaomi/devicesettings/system_app.te | 1 - 14 files changed, 679 deletions(-) delete mode 100644 parts/res/drawable/ic_dirac.xml delete mode 100644 parts/res/drawable/ic_preset.xml delete mode 100644 parts/res/drawable/ic_scenes.xml delete mode 100644 parts/res/xml/dirac_settings.xml delete mode 100644 parts/src/org/lineageos/settings/dirac/DiracActivity.java delete mode 100644 parts/src/org/lineageos/settings/dirac/DiracSettingsFragment.java delete mode 100644 parts/src/org/lineageos/settings/dirac/DiracSound.java delete mode 100644 parts/src/org/lineageos/settings/dirac/DiracTileService.java delete mode 100644 parts/src/org/lineageos/settings/dirac/DiracUtils.java diff --git a/parts/AndroidManifest.xml b/parts/AndroidManifest.xml index 38a8365..16c4741 100644 --- a/parts/AndroidManifest.xml +++ b/parts/AndroidManifest.xml @@ -24,7 +24,6 @@ - - - - - - - - - - diff --git a/parts/res/drawable/ic_dirac.xml b/parts/res/drawable/ic_dirac.xml deleted file mode 100644 index 1ff2be0..0000000 --- a/parts/res/drawable/ic_dirac.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - diff --git a/parts/res/drawable/ic_preset.xml b/parts/res/drawable/ic_preset.xml deleted file mode 100644 index 817d758..0000000 --- a/parts/res/drawable/ic_preset.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - diff --git a/parts/res/drawable/ic_scenes.xml b/parts/res/drawable/ic_scenes.xml deleted file mode 100644 index 1eee4f1..0000000 --- a/parts/res/drawable/ic_scenes.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - diff --git a/parts/res/values/arrays.xml b/parts/res/values/arrays.xml index abc6d4d..0671df6 100644 --- a/parts/res/values/arrays.xml +++ b/parts/res/values/arrays.xml @@ -15,118 +15,6 @@ limitations under the License. --> - - - @string/dirac_headset_earbuds - @string/dirac_headset_in_ear_2013 - @string/dirac_headset_piston_1 - @string/dirac_headset_piston_basic - @string/dirac_headset_piston_2 - @string/dirac_headset_piston_standard - @string/dirac_headset_general_inear - @string/dirac_headset_piston_youth - @string/dirac_headset_piston_color - @string/dirac_headset_in_ear - @string/dirac_headset_capsule - @string/dirac_headset_in_ear_pro - @string/dirac_headset_comfort - @string/dirac_headset_reduction_noise - @string/dirac_headset_cancelling - @string/dirac_headset_half_in_ear - @string/dirac_headset_in_ear2 - @string/dirac_headset_earphone_basic - @string/dirac_headset_earphone - @string/dirac_headset_ear_four - @string/dirac_headset_piston_typec - @string/dirac_headset_bluetooth_collar - @string/dirac_headset_bluetooth_linefree - @string/dirac_headset_redmi_earphones - - - - 0 - 1 - 2 - 4 - 5 - 8 - 9 - 10 - 11 - 12 - 13 - 14 - 15 - 16 - 17 - 18 - 19 - 20 - 21 - 24 - 25 - 26 - 27 - 28 - - - - - @string/dirac_preset_default - @string/dirac_preset_rock - @string/dirac_preset_jazz - @string/dirac_preset_pop - @string/dirac_preset_classical - @string/dirac_preset_hiphop - @string/dirac_preset_blues - @string/dirac_preset_electronic - @string/dirac_preset_country - @string/dirac_preset_dance - @string/dirac_preset_metal - @string/dirac_preset_bass_booster - @string/dirac_preset_balanced - @string/dirac_preset_live - @string/dirac_preset_bass_reduction - @string/dirac_preset_treble_reduction - @string/dirac_preset_soft_bass - @string/dirac_preset_soft_treble - - - - "0,0,0,0,0,0,0" - "4,2,-2,0,-2,-2,4" - "0,0,0,-2,-3,0,0" - "0,-3,-5,0,0,-3,0" - "0,0,0,0,3,6,6" - "3,3,-3,0,-3,0,2" - "2,4,-6,4,0,1,2" - "3,3,-1,0,-3,0,0" - "0,0,-2,-2,2,2,0" - "0,4,2,0,-2,-2,4" - "2,0,0,-2,-4,0,0" - "10,8,0,-3,0,5,6" - "3,1,0,0,0,1,3" - "-4,-2,2,2,2,1,1" - "-5,-3,0,0,0,0,0" - "0,0,0,0,0,-5,-3" - "3,3,1,-3,-3,0,0" - "0,0,-1,-4,-4,5,4" - - - - @string/music_headset_scenario_intelligent - @string/music_headset_scenario_music - @string/music_headset_scenario_video - @string/music_headset_scenario_vocal - - - - 4 - 1 - 2 - 3 - - "Off" "Low" diff --git a/parts/res/values/strings.xml b/parts/res/values/strings.xml index 950e4c9..1b55f3b 100644 --- a/parts/res/values/strings.xml +++ b/parts/res/values/strings.xml @@ -26,65 +26,6 @@ Gaming Streaming - - Use Mi Sound Enhancer - Mi Sound Enhancer - Optimize audio quality for wired earphones - Choose headphones type - Choose a preset - - - Mi Earbuds - Mi In-Ear (2013) - Mi Piston-1 - General In-Ear - Basic Edition - Mi Piston-2 - Standard Edition - Youth Edition - Color Edition - Mi In-Ear - Mi Capsule - Mi In-Ear Pro - Mi Comfort - Mi Noise Cancelling Type-C - Mi Noise Cancelling 3.5mm - Mi Half In-Ear - Mi In-Ear 2 - Mi Earphones Basic - Mi Earphones - Mi Quadruple Driver Earphones - Mi In-Ear Headphones (Type-C) - Mi Bluetooth Neckband - Mi Bluetooth Earphones - Redmi Earphones - - - Default - Rock - Jazz - Pop - Classical - Hip Hop - Blues - Electronic - Country - Dance - Metal - Bass Booster - Live - Balanced - Bass Reduction - Treble Reduction - Soft Bass - Soft Treble - - Smart - Music - Select Scene - Video - Voice - LCD features High Brightness Mode, CABC @@ -92,5 +33,4 @@ HBM CABC Mode High Brightness Mode (HBM) increases the maximum brightness of the display to improve visibility under sunlight. Increases power consumption.\n\nCABC (Content Adaptive Backlight Control) adjusts display and backlight brightness based on currently shown content, to reduce power consumption without degradation. - diff --git a/parts/res/xml/dirac_settings.xml b/parts/res/xml/dirac_settings.xml deleted file mode 100644 index 542eeaf..0000000 --- a/parts/res/xml/dirac_settings.xml +++ /dev/null @@ -1,54 +0,0 @@ - - - - - - - - - - - - - diff --git a/parts/src/org/lineageos/settings/BootCompletedReceiver.java b/parts/src/org/lineageos/settings/BootCompletedReceiver.java index 31d4360..631e673 100644 --- a/parts/src/org/lineageos/settings/BootCompletedReceiver.java +++ b/parts/src/org/lineageos/settings/BootCompletedReceiver.java @@ -22,7 +22,6 @@ import android.content.Context; import android.content.Intent; import android.util.Log; -import org.lineageos.settings.dirac.DiracUtils; import org.lineageos.settings.display.LcdFeaturesService; import org.lineageos.settings.thermal.ThermalUtils; @@ -35,7 +34,6 @@ public class BootCompletedReceiver extends BroadcastReceiver { public void onReceive(final Context context, Intent intent) { if (DEBUG) Log.d(TAG, "Received boot completed intent"); ThermalUtils.startService(context); - new DiracUtils(context).onBootCompleted(); context.startService(new Intent(context, LcdFeaturesService.class)); } } diff --git a/parts/src/org/lineageos/settings/dirac/DiracActivity.java b/parts/src/org/lineageos/settings/dirac/DiracActivity.java deleted file mode 100644 index 12fd901..0000000 --- a/parts/src/org/lineageos/settings/dirac/DiracActivity.java +++ /dev/null @@ -1,35 +0,0 @@ -/* - * Copyright (C) 2018,2021-2022 The LineageOS Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.lineageos.settings.dirac; - -import android.os.Bundle; - -import com.android.settingslib.collapsingtoolbar.CollapsingToolbarBaseActivity; - -public class DiracActivity extends CollapsingToolbarBaseActivity { - - private static final String TAG_DIRAC = "dirac"; - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - getFragmentManager().beginTransaction().replace( - com.android.settingslib.collapsingtoolbar.R.id.content_frame, - new DiracSettingsFragment(), TAG_DIRAC).commit(); - } -} diff --git a/parts/src/org/lineageos/settings/dirac/DiracSettingsFragment.java b/parts/src/org/lineageos/settings/dirac/DiracSettingsFragment.java deleted file mode 100644 index a698f76..0000000 --- a/parts/src/org/lineageos/settings/dirac/DiracSettingsFragment.java +++ /dev/null @@ -1,118 +0,0 @@ -/* - * Copyright (C) 2018 The LineageOS Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.lineageos.settings.dirac; - -import android.os.Bundle; -import android.os.Handler; -import android.widget.CompoundButton; - -import androidx.preference.ListPreference; -import androidx.preference.Preference; -import androidx.preference.PreferenceCategory; -import androidx.preference.PreferenceFragment; -import androidx.preference.SwitchPreference; - -import com.android.settingslib.widget.MainSwitchPreference; - -import org.lineageos.settings.R; - -public class DiracSettingsFragment extends PreferenceFragment implements - Preference.OnPreferenceChangeListener, CompoundButton.OnCheckedChangeListener { - - private static final String PREF_ENABLE = "dirac_enable"; - private static final String PREF_HEADSET = "dirac_headset_pref"; - private static final String PREF_PRESET = "dirac_preset_pref"; - private static final String PREF_SCENE = "scenario_selection"; - - private MainSwitchPreference mSwitchBar; - - private ListPreference mHeadsetType; - private ListPreference mPreset; - private ListPreference mScenes; - - private DiracUtils mDiracUtils; - private Handler mHandler = new Handler(); - - @Override - public void onCreatePreferences(Bundle savedInstanceState, String rootKey) { - addPreferencesFromResource(R.xml.dirac_settings); - - mDiracUtils = new DiracUtils(getContext()); - - boolean enhancerEnabled = mDiracUtils.isDiracEnabled(); - - mSwitchBar = (MainSwitchPreference) findPreference(PREF_ENABLE); - mSwitchBar.addOnSwitchChangeListener(this); - mSwitchBar.setChecked(enhancerEnabled); - - mHeadsetType = (ListPreference) findPreference(PREF_HEADSET); - mHeadsetType.setOnPreferenceChangeListener(this); - mHeadsetType.setEnabled(enhancerEnabled); - - mPreset = (ListPreference) findPreference(PREF_PRESET); - mPreset.setOnPreferenceChangeListener(this); - mPreset.setEnabled(enhancerEnabled); - - mScenes = (ListPreference) findPreference(PREF_SCENE); - mScenes.setOnPreferenceChangeListener(this); - mScenes.setEnabled(enhancerEnabled); - } - - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - switch (preference.getKey()) { - case PREF_HEADSET: - mDiracUtils.setHeadsetType(Integer.parseInt(newValue.toString())); - return true; - case PREF_PRESET: - mDiracUtils.setLevel(String.valueOf(newValue)); - return true; - case PREF_SCENE: - mDiracUtils.setScenario(Integer.parseInt(newValue.toString())); - return true; - default: - return false; - } - } - - @Override - public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) { - mDiracUtils.setEnabled(isChecked); - if (isChecked) { - mSwitchBar.setEnabled(false); - mHandler.postDelayed(new Runnable() { - @Override - public void run() { - try { - mSwitchBar.setEnabled(true); - setEnabled(isChecked); - } catch(Exception ignored) { - } - } - }, 1020); - } else { - setEnabled(isChecked); - } - } - - private void setEnabled(boolean enabled){ - mSwitchBar.setChecked(enabled); - mHeadsetType.setEnabled(enabled); - mPreset.setEnabled(enabled); - mScenes.setEnabled(enabled); - } -} diff --git a/parts/src/org/lineageos/settings/dirac/DiracSound.java b/parts/src/org/lineageos/settings/dirac/DiracSound.java deleted file mode 100644 index b8a3b8a..0000000 --- a/parts/src/org/lineageos/settings/dirac/DiracSound.java +++ /dev/null @@ -1,65 +0,0 @@ -/* - * Copyright (C) 2018 The LineageOS Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.lineageos.settings.dirac; - -import android.media.audiofx.AudioEffect; - -import java.util.UUID; - -public class DiracSound extends AudioEffect { - - private static final int DIRACSOUND_PARAM_HEADSET_TYPE = 1; - private static final int DIRACSOUND_PARAM_EQ_LEVEL = 2; - private static final int DIRACSOUND_PARAM_MUSIC = 4; - private static final int DIRACSOUND_PARAM_SCENE = 15; - - private static final UUID EFFECT_TYPE_DIRACSOUND = - UUID.fromString("5b8e36a5-144a-4c38-b1d7-0002a5d5c51b"); - private static final String TAG = "DiracSound"; - - public DiracSound(int priority, int audioSession) { - super(EFFECT_TYPE_NULL, EFFECT_TYPE_DIRACSOUND, priority, audioSession); - } - - public int getMusic() throws IllegalStateException, - IllegalArgumentException, UnsupportedOperationException { - int[] value = new int[1]; - checkStatus(getParameter(DIRACSOUND_PARAM_MUSIC, value)); - return value[0]; - } - - public void setMusic(int enable) throws IllegalStateException, - IllegalArgumentException, UnsupportedOperationException { - checkStatus(setParameter(DIRACSOUND_PARAM_MUSIC, enable)); - } - - public void setHeadsetType(int type) throws IllegalStateException, - IllegalArgumentException, UnsupportedOperationException { - checkStatus(setParameter(DIRACSOUND_PARAM_HEADSET_TYPE, type)); - } - - public void setLevel(int band, float level) throws IllegalStateException, - IllegalArgumentException, UnsupportedOperationException { - checkStatus(setParameter(new int[]{DIRACSOUND_PARAM_EQ_LEVEL, band}, - String.valueOf(level).getBytes())); - } - - public void setScenario(int scene) throws IllegalStateException, - IllegalArgumentException, UnsupportedOperationException { - checkStatus(setParameter(DIRACSOUND_PARAM_SCENE, scene)); - } -} diff --git a/parts/src/org/lineageos/settings/dirac/DiracTileService.java b/parts/src/org/lineageos/settings/dirac/DiracTileService.java deleted file mode 100644 index 340acd9..0000000 --- a/parts/src/org/lineageos/settings/dirac/DiracTileService.java +++ /dev/null @@ -1,42 +0,0 @@ -package org.lineageos.settings.dirac; - -import android.service.quicksettings.Tile; -import android.service.quicksettings.TileService; - -public class DiracTileService extends TileService { - - private DiracUtils mDiracUtils; - - @Override - public void onStartListening() { - - mDiracUtils = new DiracUtils(getApplicationContext()); - - boolean enhancerEnabled = mDiracUtils.isDiracEnabled(); - - Tile tile = getQsTile(); - if (enhancerEnabled) { - tile.setState(Tile.STATE_ACTIVE); - } else { - tile.setState(Tile.STATE_INACTIVE); - } - - tile.updateTile(); - - super.onStartListening(); - } - - @Override - public void onClick() { - Tile tile = getQsTile(); - if (mDiracUtils.isDiracEnabled()) { - mDiracUtils.setEnabled(false); - tile.setState(Tile.STATE_INACTIVE); - } else { - mDiracUtils.setEnabled(true); - tile.setState(Tile.STATE_ACTIVE); - } - tile.updateTile(); - super.onClick(); - } -} diff --git a/parts/src/org/lineageos/settings/dirac/DiracUtils.java b/parts/src/org/lineageos/settings/dirac/DiracUtils.java deleted file mode 100644 index 0e3097e..0000000 --- a/parts/src/org/lineageos/settings/dirac/DiracUtils.java +++ /dev/null @@ -1,141 +0,0 @@ -/* - * Copyright (C) 2018 The LineageOS Project - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -package org.lineageos.settings.dirac; - -import android.content.Context; -import android.content.Intent; -import android.os.Handler; -import android.os.UserHandle; -import android.os.SystemClock; -import android.view.KeyEvent; -import android.media.session.MediaController; -import android.media.session.MediaSessionManager; -import android.media.session.PlaybackState; -import java.lang.IllegalArgumentException; -import java.util.List; - -public final class DiracUtils { - - protected DiracSound mDiracSound; - private static DiracUtils mInstance; - private MediaSessionManager mMediaSessionManager; - private Handler mHandler = new Handler(); - private Context mContext; - - public static DiracUtils getInstance() { - if (mInstance == null) { - throw new IllegalArgumentException("Trying to get instance without initializing!"); - } - return mInstance; - } - - public DiracUtils(final Context context) { - mContext = context; - mMediaSessionManager = (MediaSessionManager) context.getSystemService(Context.MEDIA_SESSION_SERVICE); - mDiracSound = new DiracSound(0, 0); - } - - public void onBootCompleted() { - setEnabled(mDiracSound.getMusic() == 1); - mInstance = this; - } - - protected void refreshPlaybackIfNecessary(){ - if (mMediaSessionManager == null) { - mMediaSessionManager = (MediaSessionManager) mContext.getSystemService(Context.MEDIA_SESSION_SERVICE); - } - final List sessions - = mMediaSessionManager.getActiveSessionsForUser( - null, UserHandle.ALL); - for (MediaController aController : sessions) { - if (PlaybackState.STATE_PLAYING == - getMediaControllerPlaybackState(aController)) { - triggerPlayPause(aController); - break; - } - } - } - - private void triggerPlayPause(MediaController controller) { - long when = SystemClock.uptimeMillis(); - final KeyEvent evDownPause = new KeyEvent(when, when, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_PAUSE, 0); - final KeyEvent evUpPause = KeyEvent.changeAction(evDownPause, KeyEvent.ACTION_UP); - final KeyEvent evDownPlay = new KeyEvent(when, when, KeyEvent.ACTION_DOWN, KeyEvent.KEYCODE_MEDIA_PLAY, 0); - final KeyEvent evUpPlay = KeyEvent.changeAction(evDownPlay, KeyEvent.ACTION_UP); - mHandler.post(new Runnable() { - @Override - public void run() { - controller.dispatchMediaButtonEvent(evDownPause); - } - }); - mHandler.postDelayed(new Runnable() { - @Override - public void run() { - controller.dispatchMediaButtonEvent(evUpPause); - } - }, 20); - mHandler.postDelayed(new Runnable() { - @Override - public void run() { - controller.dispatchMediaButtonEvent(evDownPlay); - } - }, 1000); - mHandler.postDelayed(new Runnable() { - @Override - public void run() { - controller.dispatchMediaButtonEvent(evUpPlay); - } - }, 1020); - } - - private int getMediaControllerPlaybackState(MediaController controller) { - if (controller != null) { - final PlaybackState playbackState = controller.getPlaybackState(); - if (playbackState != null) { - return playbackState.getState(); - } - } - return PlaybackState.STATE_NONE; - } - protected void setEnabled(boolean enable) { - mDiracSound.setEnabled(enable); - mDiracSound.setMusic(enable ? 1 : 0); - if (enable) { - refreshPlaybackIfNecessary(); - } - } - - protected boolean isDiracEnabled() { - return mDiracSound.getMusic() == 1; - } - - protected void setLevel(String preset) { - String[] level = preset.split("\\s*,\\s*"); - - for (int band = 0; band <= level.length - 1; band++) { - mDiracSound.setLevel(band, Float.valueOf(level[band])); - } - } - - protected void setHeadsetType(int paramInt) { - mDiracSound.setHeadsetType(paramInt); - } - - protected void setScenario(int sceneInt) { - mDiracSound.setScenario(sceneInt); - } -} diff --git a/sepolicy/private/xiaomi/devicesettings/system_app.te b/sepolicy/private/xiaomi/devicesettings/system_app.te index 0af9721..25a5bae 100644 --- a/sepolicy/private/xiaomi/devicesettings/system_app.te +++ b/sepolicy/private/xiaomi/devicesettings/system_app.te @@ -4,7 +4,6 @@ set_prop(system_app, persist_lcd_prop) # Allow system_app to find *_service allow system_app { app_api_service - audio_service audioserver_service cameraserver_service drmserver_service