Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa22e8f3 authored by Liana Kazanova (xWF)'s avatar Liana Kazanova (xWF) Committed by Android (Google) Code Review
Browse files

Revert "[Catalyst] Split Theme/SettingsTitlelessPreferenceCatego..."

Revert submission 33377608-catalyst

Reason for revert: DroidMonitor: Potential culprit for http://b/415751145 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Bug: 415751145

Reverted changes: /q/submissionid:33377608-catalyst

Change-Id: I9a1eafc26e191c1acff703da75a1bb3451f76dfd
parent c210c471
Loading
Loading
Loading
Loading
+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ android_library {
        "SettingsLibBulletPreference",
        "SettingsLibButtonPreference",
        "SettingsLibCardPreference",
        "SettingsLibCategory",
        "SettingsLibCollapsingToolbarBaseActivity",
        "SettingsLibDeviceStateRotationLock",
        "SettingsLibDisplayUtils",
+0 −30
Original line number Diff line number Diff line
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",
}
+0 −21
Original line number Diff line number Diff line
<?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>
+0 −28
Original line number Diff line number Diff line
/*
 * 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)
}
+0 −0

File moved.

Loading