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

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

Merge "Revert "[Catalyst] Split Theme/SettingsTitlelessPreferenceCatego..."" into main

parents b3997d69 aa22e8f3

packages/SettingsLib/Android.bp

+0 −1
Original line number Diff line number Diff line
@@ -34,7 +34,6 @@ android_library { 
        "SettingsLibBulletPreference",

        "SettingsLibButtonPreference",

        "SettingsLibCardPreference",

        "SettingsLibCategory",

        "SettingsLibCollapsingToolbarBaseActivity",

        "SettingsLibDeviceStateRotationLock",

        "SettingsLibDisplayUtils",

packages/SettingsLib/Category/Android.bp

deleted100644 → 0
+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",

}

packages/SettingsLib/Category/AndroidManifest.xml

deleted100644 → 0
+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>

packages/SettingsLib/Category/res/layout-v36/settingslib_expressive_untitled_preference_category.xml

deleted100644 → 0
+0 −25
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.

-->

<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:layout_marginTop="@dimen/settingslib_expressive_space_extrasmall6"

    android:baselineAligned="false"

    android:filterTouchesWhenObscured="false">

</LinearLayout>

packages/SettingsLib/Category/res/layout/settingslib_untitled_preference_category.xml

deleted100644 → 0
+0 −23
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

     Copyright (C) 2024 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.

-->

<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:baselineAligned="false"

    android:filterTouchesWhenObscured="false">

</LinearLayout>