Merge "Fix preference animations when expressive design is off." into main (3d357938) · Commits · e / os / android_frameworks_base

packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsPreferenceGroupAdapter.kt

+13 −4

Original line number	Original line	Diff line number	Diff line
	@@ -71,18 +71,27 @@ open class SettingsPreferenceGroupAdapter(preferenceGroup: PreferenceGroup) :
	override fun onPreferenceHierarchyChange(preference: Preference) {		override fun onPreferenceHierarchyChange(preference: Preference) {
	super.onPreferenceHierarchyChange(preference)		super.onPreferenceHierarchyChange(preference)

			if (SettingsThemeHelper.isExpressiveTheme(preference.context)) {
	// Post after super class has posted their sync runnable to update preferences.		// Post after super class has posted their sync runnable to update preferences.
	mHandler.removeCallbacks(syncRunnable)		mHandler.removeCallbacks(syncRunnable)
	mHandler.post(syncRunnable)		mHandler.post(syncRunnable)
	}		}
			}

	@SuppressLint("RestrictedApi")		@SuppressLint("RestrictedApi")
	override fun onBindViewHolder(holder: PreferenceViewHolder, position: Int) {		override fun onBindViewHolder(holder: PreferenceViewHolder, position: Int) {
	super.onBindViewHolder(holder, position)		super.onBindViewHolder(holder, position)

			if (SettingsThemeHelper.isExpressiveTheme(holder.itemView.context)) {
	updateBackground(holder, position)		updateBackground(holder, position)
	}		}
			}

	private fun updatePreferencesList() {		private fun updatePreferencesList() {
			if (!SettingsThemeHelper.isExpressiveTheme(mPreferenceGroup.context)) {
			return
			}

	val oldList = ArrayList(mRoundCornerMappingList)		val oldList = ArrayList(mRoundCornerMappingList)
	mRoundCornerMappingList = ArrayList()		mRoundCornerMappingList = ArrayList()
	mappingPreferenceGroup(mRoundCornerMappingList, mPreferenceGroup)		mappingPreferenceGroup(mRoundCornerMappingList, mPreferenceGroup)