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

Commit a09cf202 authored by Chaohui Wang's avatar Chaohui Wang Committed by Android (Google) Code Review
Browse files

Merge "Clean up deprecated RadioButtonPreference" into main

parents a17f6b8d 7358e9f0

packages/SettingsLib/Android.bp

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

        "SettingsLibProfileSelector",

        "SettingsLibProgressBar",

        "SettingsLibRadioButtonPreference",

        "SettingsLibRestrictedLockUtils",

        "SettingsLibSelectorWithWidgetPreference",

        "SettingsLibSettingsSpinner",

packages/SettingsLib/RadioButtonPreference/Android.bp

deleted100644 → 0
+0 −29
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: "SettingsLibRadioButtonPreference",

    use_resource_processor: true,



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

    resource_dirs: ["res"],



    static_libs: [

          "androidx.preference_preference",

          "SettingsLibSelectorWithWidgetPreference",

          "SettingsLibSettingsTheme",

    ],



    sdk_version: "system_current",

    min_sdk_version: "21",

    apex_available: [

        "//apex_available:platform",

        "com.android.permission",

    ],

}

packages/SettingsLib/RadioButtonPreference/AndroidManifest.xml

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

<!--

  Copyright (C) 2019 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.preference.radio">



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



</manifest>

packages/SettingsLib/RadioButtonPreference/res/drawable/ic_settings_accent.xml

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
<!--

  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.

  -->



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

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0"

        android:tint="?android:attr/colorAccent">

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M13.85,22.25h-3.7c-0.74,0 -1.36,-0.54 -1.45,-1.27l-0.27,-1.89c-0.27,-0.14 -0.53,-0.29 -0.79,-0.46l-1.8,0.72c-0.7,0.26 -1.47,-0.03 -1.81,-0.65L2.2,15.53c-0.35,-0.66 -0.2,-1.44 0.36,-1.88l1.53,-1.19c-0.01,-0.15 -0.02,-0.3 -0.02,-0.46c0,-0.15 0.01,-0.31 0.02,-0.46l-1.52,-1.19C1.98,9.9 1.83,9.09 2.2,8.47l1.85,-3.19c0.34,-0.62 1.11,-0.9 1.79,-0.63l1.81,0.73c0.26,-0.17 0.52,-0.32 0.78,-0.46l0.27,-1.91c0.09,-0.7 0.71,-1.25 1.44,-1.25h3.7c0.74,0 1.36,0.54 1.45,1.27l0.27,1.89c0.27,0.14 0.53,0.29 0.79,0.46l1.8,-0.72c0.71,-0.26 1.48,0.03 1.82,0.65l1.84,3.18c0.36,0.66 0.2,1.44 -0.36,1.88l-1.52,1.19c0.01,0.15 0.02,0.3 0.02,0.46s-0.01,0.31 -0.02,0.46l1.52,1.19c0.56,0.45 0.72,1.23 0.37,1.86l-1.86,3.22c-0.34,0.62 -1.11,0.9 -1.8,0.63l-1.8,-0.72c-0.26,0.17 -0.52,0.32 -0.78,0.46l-0.27,1.91C15.21,21.71 14.59,22.25 13.85,22.25zM13.32,20.72c0,0.01 0,0.01 0,0.02L13.32,20.72zM10.68,20.7l0,0.02C10.69,20.72 10.69,20.71 10.68,20.7zM10.62,20.25h2.76l0.37,-2.55l0.53,-0.22c0.44,-0.18 0.88,-0.44 1.34,-0.78l0.45,-0.34l2.38,0.96l1.38,-2.4l-2.03,-1.58l0.07,-0.56c0.03,-0.26 0.06,-0.51 0.06,-0.78c0,-0.27 -0.03,-0.53 -0.06,-0.78l-0.07,-0.56l2.03,-1.58l-1.39,-2.4l-2.39,0.96l-0.45,-0.35c-0.42,-0.32 -0.87,-0.58 -1.33,-0.77L13.75,6.3l-0.37,-2.55h-2.76L10.25,6.3L9.72,6.51C9.28,6.7 8.84,6.95 8.38,7.3L7.93,7.63L5.55,6.68L4.16,9.07l2.03,1.58l-0.07,0.56C6.09,11.47 6.06,11.74 6.06,12c0,0.26 0.02,0.53 0.06,0.78l0.07,0.56l-2.03,1.58l1.38,2.4l2.39,-0.96l0.45,0.35c0.43,0.33 0.86,0.58 1.33,0.77l0.53,0.22L10.62,20.25zM18.22,17.72c0,0.01 -0.01,0.02 -0.01,0.03L18.22,17.72zM5.77,17.71l0.01,0.02C5.78,17.72 5.77,17.71 5.77,17.71zM3.93,9.47L3.93,9.47C3.93,9.47 3.93,9.47 3.93,9.47zM18.22,6.27c0,0.01 0.01,0.02 0.01,0.02L18.22,6.27zM5.79,6.25L5.78,6.27C5.78,6.27 5.79,6.26 5.79,6.25zM13.31,3.28c0,0.01 0,0.01 0,0.02L13.31,3.28zM10.69,3.26l0,0.02C10.69,3.27 10.69,3.27 10.69,3.26z"/>

    <path

        android:fillColor="#FFFFFFFF"

        android:pathData="M12,12m-3.5,0a3.5,3.5 0,1 1,7 0a3.5,3.5 0,1 1,-7 0"/>

</vector>
 
 No newline at end of file

packages/SettingsLib/RadioButtonPreference/res/layout-v33/preference_radio.xml

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

<!--

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

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

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="?android:attr/selectableItemBackground"

    android:gravity="center_vertical"

    android:minHeight="?android:attr/listPreferredItemHeightSmall"

    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">



    <LinearLayout

        android:id="@android:id/widget_frame"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:paddingHorizontal="20dp"

        android:gravity="center"

        android:minWidth="56dp"

        android:orientation="vertical"/>



    <LinearLayout

        android:id="@+id/icon_frame"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:gravity="center_vertical"

        android:minWidth="32dp"

        android:orientation="horizontal"

        android:layout_marginEnd="16dp"

        android:paddingTop="4dp"

        android:paddingBottom="4dp">

        <androidx.preference.internal.PreferenceImageView

            android:id="@android:id/icon"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            settings:maxWidth="@dimen/secondary_app_icon_size"

            settings:maxHeight="@dimen/secondary_app_icon_size"/>

    </LinearLayout>



    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:orientation="vertical"

        android:paddingTop="16dp"

        android:paddingBottom="16dp"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">



        <TextView

            android:id="@android:id/title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:maxLines="2"

            android:hyphenationFrequency="normalFast"

            android:lineBreakWordStyle="phrase"

            android:textAppearance="?android:attr/textAppearanceListItem"/>



        <LinearLayout

            android:id="@+id/summary_container"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:visibility="gone">

            <TextView

                android:id="@android:id/summary"

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:textAppearance="?android:attr/textAppearanceSmall"

                android:textAlignment="viewStart"

                android:hyphenationFrequency="normalFast"

                android:lineBreakWordStyle="phrase"

                android:textColor="?android:attr/textColorSecondary"/>



            <TextView

                android:id="@+id/appendix"

                android:layout_width="0dp"

                android:layout_height="wrap_content"

                android:layout_weight="1"

                android:textAppearance="?android:attr/textAppearanceSmall"

                android:textAlignment="viewEnd"

                android:textColor="?android:attr/textColorSecondary"

                android:maxLines="1"

                android:visibility="gone"

                android:ellipsize="end"/>

        </LinearLayout>

    </LinearLayout>



    <LinearLayout

        android:id="@+id/radio_extra_widget_container"

        android:layout_width="wrap_content"

        android:layout_height="match_parent"

        android:orientation="horizontal"

        android:gravity="center_vertical">

        <View

            android:layout_width=".75dp"

            android:layout_height="32dp"

            android:layout_marginTop="16dp"

            android:layout_marginBottom="16dp"

            android:background="?android:attr/dividerVertical" />

        <ImageView

            android:id="@+id/radio_extra_widget"

            android:layout_width="match_parent"

            android:minWidth="@dimen/two_target_min_width"

            android:layout_height="fill_parent"

            android:src="@drawable/ic_settings_accent"

            android:contentDescription="@string/settings_label"

            android:paddingStart="24dp"

            android:paddingEnd="24dp"

            android:layout_gravity="center"

            android:background="?android:attr/selectableItemBackground" />

    </LinearLayout>

</LinearLayout>