Revert "Cherish:add edge light customizations[2/2]"
This reverts commitc54c2eb6c2. Revert "Cherish:update edge light preferences" This reverts commitb88457ea22. Signed-off-by: Hưng Phan <phandinhhungvp2001@gmail.com>
This commit is contained in:
@@ -1,92 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2022 FlamingoOS 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 com.cherish.settings.lockscreen
|
||||
|
||||
import android.content.Context
|
||||
import android.database.ContentObserver
|
||||
import android.os.Handler
|
||||
import android.os.Looper
|
||||
import android.os.UserHandle
|
||||
import android.provider.Settings
|
||||
|
||||
import androidx.lifecycle.Lifecycle.Event
|
||||
import androidx.lifecycle.LifecycleEventObserver
|
||||
import androidx.lifecycle.LifecycleOwner
|
||||
import androidx.preference.Preference
|
||||
import androidx.preference.PreferenceScreen
|
||||
|
||||
import com.android.settings.core.BasePreferenceController
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle
|
||||
|
||||
class EdgeLightColorPickerPreferenceController(
|
||||
context: Context,
|
||||
preferenceKey: String,
|
||||
lifecycle: Lifecycle?,
|
||||
) : BasePreferenceController(context, preferenceKey),
|
||||
LifecycleEventObserver {
|
||||
|
||||
private val settingsObserver = object : ContentObserver(
|
||||
Handler(Looper.getMainLooper())
|
||||
) {
|
||||
override fun onChange(selfChange: Boolean) {
|
||||
preference?.let {
|
||||
updateState(it)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private var preference: Preference? = null
|
||||
|
||||
init {
|
||||
lifecycle?.addObserver(this)
|
||||
}
|
||||
|
||||
override fun onStateChanged(owner: LifecycleOwner, event: Event) {
|
||||
if (event == Event.ON_START) {
|
||||
mContext.contentResolver.registerContentObserver(
|
||||
Settings.System.getUriFor(Settings.System.EDGE_LIGHT_COLOR_MODE),
|
||||
false /* notifyDescendants */,
|
||||
settingsObserver,
|
||||
)
|
||||
} else if (event == Event.ON_STOP) {
|
||||
mContext.contentResolver.unregisterContentObserver(settingsObserver)
|
||||
}
|
||||
}
|
||||
|
||||
override fun getAvailabilityStatus(): Int {
|
||||
val isCustomColorMode = Settings.System.getIntForUser(
|
||||
mContext.contentResolver,
|
||||
Settings.System.EDGE_LIGHT_COLOR_MODE,
|
||||
0, UserHandle.USER_CURRENT
|
||||
) == 3
|
||||
return if (isCustomColorMode) {
|
||||
AVAILABLE
|
||||
} else {
|
||||
DISABLED_DEPENDENT_SETTING
|
||||
}
|
||||
}
|
||||
|
||||
override fun displayPreference(screen: PreferenceScreen) {
|
||||
super.displayPreference(screen)
|
||||
preference = screen.findPreference(preferenceKey)
|
||||
}
|
||||
|
||||
override fun updateState(preference: Preference) {
|
||||
super.updateState(preference)
|
||||
preference.setEnabled(getAvailabilityStatus() == AVAILABLE)
|
||||
}
|
||||
}
|
||||
@@ -1,87 +0,0 @@
|
||||
/*
|
||||
* Copyright (C) 2022 FlamingoOS 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 com.cherish.settings.lockscreen
|
||||
|
||||
import android.content.Context
|
||||
import android.os.Bundle
|
||||
import android.widget.Switch
|
||||
|
||||
import androidx.preference.forEachIndexed
|
||||
|
||||
import com.android.settings.R
|
||||
import com.android.settings.search.BaseSearchIndexProvider
|
||||
import com.android.settingslib.core.AbstractPreferenceController
|
||||
import com.android.settingslib.core.lifecycle.Lifecycle
|
||||
import com.android.settingslib.search.SearchIndexable
|
||||
import com.android.settingslib.widget.MainSwitchPreference
|
||||
import com.android.settingslib.widget.OnMainSwitchChangeListener
|
||||
import com.android.settingslib.widget.TopIntroPreference
|
||||
import com.cherish.settings.fragments.CherishDashboardFragment
|
||||
|
||||
@SearchIndexable
|
||||
class EdgeLightSettings : CherishDashboardFragment(), OnMainSwitchChangeListener {
|
||||
|
||||
override fun onCreatePreferences(savedInstanceState: Bundle?, rootKey: String?) {
|
||||
super.onCreatePreferences(savedInstanceState, rootKey)
|
||||
findPreference<MainSwitchPreference>(MAIN_SWITCH_KEY)?.also {
|
||||
updatePreferences(it.isChecked)
|
||||
it.addOnSwitchChangeListener(this)
|
||||
}
|
||||
}
|
||||
|
||||
override protected fun getPreferenceScreenResId() = R.xml.cherish_settings_edge_light
|
||||
|
||||
override protected fun getLogTag() = TAG
|
||||
|
||||
override protected fun createPreferenceControllers(
|
||||
context: Context
|
||||
): List<AbstractPreferenceController> = buildPreferenceControllers(context, settingsLifecycle)
|
||||
|
||||
override fun onSwitchChanged(switchView: Switch, isChecked: Boolean) {
|
||||
updatePreferences(isChecked)
|
||||
}
|
||||
|
||||
private fun updatePreferences(isChecked: Boolean) {
|
||||
preferenceScreen.forEachIndexed { _, preference ->
|
||||
if (preference !is MainSwitchPreference &&
|
||||
preference !is TopIntroPreference
|
||||
) preference.isVisible = isChecked
|
||||
}
|
||||
}
|
||||
|
||||
companion object {
|
||||
private const val TAG = "EdgeLightSettingsFragment"
|
||||
|
||||
private const val MAIN_SWITCH_KEY = "edge_light_enabled"
|
||||
private const val CUSTOM_COLOR_PREFERENCE_KEY = "edge_light_custom_color"
|
||||
|
||||
private fun buildPreferenceControllers(
|
||||
context: Context,
|
||||
lifecycle: Lifecycle?,
|
||||
): List<AbstractPreferenceController> = listOf(
|
||||
EdgeLightColorPickerPreferenceController(context, CUSTOM_COLOR_PREFERENCE_KEY, lifecycle)
|
||||
)
|
||||
|
||||
@JvmField
|
||||
val SEARCH_INDEX_DATA_PROVIDER = object : BaseSearchIndexProvider(R.xml.cherish_settings_edge_light) {
|
||||
override fun createPreferenceControllers(
|
||||
context: Context
|
||||
): List<AbstractPreferenceController> = buildPreferenceControllers(
|
||||
context, null /* lifecycle */)
|
||||
}
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user