Revert "Revert "Revert "[Catalyst] Split Theme/SettingsTitleless..."
Revert submission 33402806-revert-33399949-revert-33377608-catalyst-JJIRYBXCML-KNRSCCJRRE
Reason for revert: DroidMonitor: Potential culprit for http://b/415866273 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.
Bug: 415866273
Reverted changes: /q/submissionid:33402806-revert-33399949-revert-33377608-catalyst-JJIRYBXCML-KNRSCCJRRE
Change-Id: I9500beeb52d4b83e784f85f642cc6b527e68bf21
diff --git a/packages/SettingsLib/Android.bp b/packages/SettingsLib/Android.bp
index 09b6db4..f549a38 100644
--- a/packages/SettingsLib/Android.bp
+++ b/packages/SettingsLib/Android.bp
@@ -34,7 +34,6 @@
"SettingsLibBulletPreference",
"SettingsLibButtonPreference",
"SettingsLibCardPreference",
- "SettingsLibCategory",
"SettingsLibCollapsingToolbarBaseActivity",
"SettingsLibDeviceStateRotationLock",
"SettingsLibDisplayUtils",
diff --git a/packages/SettingsLib/Category/Android.bp b/packages/SettingsLib/Category/Android.bp
deleted file mode 100644
index 5bc1466..0000000
--- a/packages/SettingsLib/Category/Android.bp
+++ /dev/null
@@ -1,30 +0,0 @@
-package {
- // See: http://go/android-license-faq
- // A large-scale-change added 'default_applicable_licenses' to import
- // all of the 'license_kinds' from "frameworks_base_license"
- // to get the below license kinds:
- // SPDX-license-identifier-Apache-2.0
- default_applicable_licenses: ["frameworks_base_license"],
-}
-
-android_library {
- name: "SettingsLibCategory",
- use_resource_processor: true,
- defaults: [
- "SettingsLibApexDefaults",
- "SettingsLintDefaults",
- ],
-
- srcs: [
- "src/**/*.kt",
- ],
- resource_dirs: ["res"],
-
- static_libs: [
- "SettingsLibMetadata",
- "SettingsLibPreference",
- "SettingsLibSettingsTheme",
- ],
- sdk_version: "system_current",
- min_sdk_version: "21",
-}
diff --git a/packages/SettingsLib/Category/AndroidManifest.xml b/packages/SettingsLib/Category/AndroidManifest.xml
deleted file mode 100644
index 6b57b7e8..0000000
--- a/packages/SettingsLib/Category/AndroidManifest.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?><!--
- Copyright (C) 2025 The Android Open Source 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.
- -->
-
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
- package="com.android.settingslib.widget.category">
-
- <uses-sdk android:minSdkVersion="21" />
-</manifest>
diff --git a/packages/SettingsLib/Category/src/com/android/settingslib/widget/UntitledPreferenceCategoryMetadata.kt b/packages/SettingsLib/Category/src/com/android/settingslib/widget/UntitledPreferenceCategoryMetadata.kt
deleted file mode 100644
index 92bebf8..0000000
--- a/packages/SettingsLib/Category/src/com/android/settingslib/widget/UntitledPreferenceCategoryMetadata.kt
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (C) 2025 The Android Open Source 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.android.settingslib.widget
-
-import android.content.Context
-import com.android.settingslib.metadata.PreferenceGroup
-import com.android.settingslib.preference.PreferenceBinding
-
-/** Metadata and binding for [UntitledPreferenceCategory]. */
-class UntitledPreferenceCategoryMetadata(override val key: String) :
- PreferenceGroup, PreferenceBinding {
-
- override fun createWidget(context: Context) = UntitledPreferenceCategory(context)
-}
diff --git a/packages/SettingsLib/Category/res/layout-v36/settingslib_expressive_untitled_preference_category.xml b/packages/SettingsLib/SettingsTheme/res/layout-v36/settingslib_expressive_preference_category_no_title.xml
similarity index 100%
rename from packages/SettingsLib/Category/res/layout-v36/settingslib_expressive_untitled_preference_category.xml
rename to packages/SettingsLib/SettingsTheme/res/layout-v36/settingslib_expressive_preference_category_no_title.xml
diff --git a/packages/SettingsLib/Category/res/layout/settingslib_untitled_preference_category.xml b/packages/SettingsLib/SettingsTheme/res/layout/settingslib_preference_category_no_title.xml
similarity index 100%
rename from packages/SettingsLib/Category/res/layout/settingslib_untitled_preference_category.xml
rename to packages/SettingsLib/SettingsTheme/res/layout/settingslib_preference_category_no_title.xml
diff --git a/packages/SettingsLib/Category/src/com/android/settingslib/widget/UntitledPreferenceCategory.kt b/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsTitlelessPreferenceCategory.kt
similarity index 69%
rename from packages/SettingsLib/Category/src/com/android/settingslib/widget/UntitledPreferenceCategory.kt
rename to packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsTitlelessPreferenceCategory.kt
index a8de619..3d9aff1 100644
--- a/packages/SettingsLib/Category/src/com/android/settingslib/widget/UntitledPreferenceCategory.kt
+++ b/packages/SettingsLib/SettingsTheme/src/com/android/settingslib/widget/SettingsTitlelessPreferenceCategory.kt
@@ -20,29 +20,27 @@
import android.util.AttributeSet
import androidx.preference.PreferenceCategory
import androidx.preference.PreferenceViewHolder
-import com.android.settingslib.widget.category.R
+import com.android.settingslib.widget.theme.R
-/** A [PreferenceCategory] that has no title. */
-class UntitledPreferenceCategory
-@JvmOverloads
-constructor(
+class SettingsTitlelessPreferenceCategory @JvmOverloads constructor(
context: Context,
attrs: AttributeSet? = null,
defStyleAttr: Int = 0,
- defStyleRes: Int = 0,
+ defStyleRes: Int = 0
) : PreferenceCategory(context, attrs, defStyleAttr, defStyleRes) {
init {
layoutResource =
- when (SettingsThemeHelper.isExpressiveTheme(context)) {
- true -> R.layout.settingslib_expressive_untitled_preference_category
- else -> R.layout.settingslib_untitled_preference_category
+ if (SettingsThemeHelper.isExpressiveTheme(context)) {
+ R.layout.settingslib_expressive_preference_category_no_title
+ } else {
+ R.layout.settingslib_preference_category_no_title
}
}
override fun onBindViewHolder(holder: PreferenceViewHolder) {
super.onBindViewHolder(holder)
- holder.isDividerAllowedAbove = false
- holder.isDividerAllowedBelow = false
+ holder.setDividerAllowedAbove(false)
+ holder.setDividerAllowedBelow(false)
}
}
