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

Commit bb77fd3a authored by Edgar Wang's avatar Edgar Wang Committed by Automerger Merge Worker
Browse files

Merge "Create SettingsLibTwoTargetPreference" into sc-dev am: 23ef16b5 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13566525

Change-Id: I5b486efca21016d0bcdce28c7381ec24ab1bc1b7
parents 194a9ad6 23ef16b5

packages/SettingsLib/Android.bp

+7 −3
Original line number Diff line number Diff line
@@ -27,7 +27,10 @@ android_library { 


    resource_dirs: ["res"],



    srcs: ["src/**/*.java", "src/**/*.kt"],

    srcs: [

        "src/**/*.java",

        "src/**/*.kt",

    ],



    min_sdk_version: "21",
@@ -67,6 +70,7 @@ java_defaults { 
        "SettingsLibFooterPreference",

        "SettingsLibUsageProgressBarPreference",

        "SettingsLibCollapsingToolbarBaseActivity",

        "SettingsLibTwoTargetPreference",

    ],

}

packages/SettingsLib/TwoTargetPreference/Android.bp

0 → 100644
+13 −0
Original line number Diff line number Diff line 
android_library {

    name: "SettingsLibTwoTargetPreference",



    srcs: ["src/**/*.java"],

    resource_dirs: ["res"],



    static_libs: [

        "androidx.annotation_annotation",

        "androidx.preference_preference",

    ],

    sdk_version: "system_current",

    min_sdk_version: "21",

}

packages/SettingsLib/TwoTargetPreference/AndroidManifest.xml

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

<!--

  Copyright (C) 2021 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">



    <uses-sdk android:minSdkVersion="21" />



</manifest>

packages/SettingsLib/res/layout/preference_two_target.xml→packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2017 The Android Open Source Project

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

packages/SettingsLib/res/layout/preference_two_target_divider.xml→packages/SettingsLib/TwoTargetPreference/res/layout/preference_two_target_divider.xml

+1 −1
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!--

  Copyright (C) 2017 The Android Open Source Project

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