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

Commit 80a76f05 authored by Edgar Wang's avatar Edgar Wang Committed by Android (Google) Code Review
Browse files

Merge "Replace CardPreference with SettingsLib version" into main

parents f72679fe fa76a419

res/xml/interact_across_profiles_permissions_details.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ 
            android:layout="@layout/cross_profiles_settings_entity_header"

            android:layout="@layout/cross_profiles_settings_entity_header"

            android:selectable="false"/>

            android:selectable="false"/>





        <com.android.settings.widget.CardPreference

        <com.android.settingslib.widget.CardPreference

            android:key="install_app_banner"

            android:key="install_app_banner"

            android:icon="@drawable/ic_download_for_offline"

            android:icon="@drawable/ic_download_for_offline"

            android:gravity="top"/>

            android:gravity="top"/>

res/xml/interact_across_profiles_permissions_details_expressive.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -23,7 +23,7 @@ 
            android:layout="@layout/cross_profiles_settings_entity_header"

            android:layout="@layout/cross_profiles_settings_entity_header"

            android:selectable="false"/>

            android:selectable="false"/>





        <com.android.settings.widget.CardPreference

        <com.android.settingslib.widget.CardPreference

            android:key="install_app_banner"

            android:key="install_app_banner"

            android:icon="@drawable/ic_download_for_offline"

            android:icon="@drawable/ic_download_for_offline"

            android:gravity="top"/>

            android:gravity="top"/>

src/com/android/settings/applications/specialaccess/interactacrossprofiles/InteractAcrossProfilesDetails.java

+1 −1
Original line number Original line Diff line number Diff line
@@ -69,9 +69,9 @@ import androidx.preference.Preference; 
import com.android.settings.R;

import com.android.settings.R;

import com.android.settings.applications.AppInfoBase;

import com.android.settings.applications.AppInfoBase;

import com.android.settings.applications.AppStoreUtil;

import com.android.settings.applications.AppStoreUtil;

import com.android.settings.widget.CardPreference;

import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedSwitchPreference;

import com.android.settingslib.RestrictedSwitchPreference;

import com.android.settingslib.widget.CardPreference;

import com.android.settingslib.widget.FooterPreference;

import com.android.settingslib.widget.FooterPreference;

import com.android.settingslib.widget.LayoutPreference;

import com.android.settingslib.widget.LayoutPreference;

import com.android.settingslib.widget.SettingsThemeHelper;

import com.android.settingslib.widget.SettingsThemeHelper;