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

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

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

Revert submission 33399949-revert-33377608-catalyst-JJIRYBXCML

Reason for revert: Test started passing 

Reverted changes: /q/submissionid:33399949-revert-33377608-catalyst-JJIRYBXCML

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

File moved.

+0 −0

File moved.

Loading