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

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

Merge "Change packagename of TwoTargetPreference" into sc-dev

parents 78a02d76 9691da0d

src/com/android/settings/accessibility/AccessibilitySettings.java

+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.settings.accessibility;



import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM;

import static com.android.settingslib.widget.TwoTargetPreference.ICON_SIZE_MEDIUM;



import android.accessibilityservice.AccessibilityServiceInfo;

import android.accessibilityservice.AccessibilityShortcutInfo;

src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java

+2 −2
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ 


package com.android.settings.applications.defaultapps;



import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM;

import static com.android.settingslib.widget.TwoTargetPreference.ICON_SIZE_MEDIUM;



import android.content.Context;

import android.content.Intent;
@@ -33,9 +33,9 @@ import com.android.settings.R; 
import com.android.settings.Utils;

import com.android.settings.core.PreferenceControllerMixin;

import com.android.settings.widget.GearPreference;

import com.android.settingslib.TwoTargetPreference;

import com.android.settingslib.applications.DefaultAppInfo;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.widget.TwoTargetPreference;



public abstract class DefaultAppPreferenceController extends AbstractPreferenceController

        implements PreferenceControllerMixin {

src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java

+1 −1
Original line number Diff line number Diff line
@@ -63,8 +63,8 @@ import com.android.settingslib.HelpUtils; 
import com.android.settingslib.RestrictedLockUtils;

import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;

import com.android.settingslib.RestrictedLockUtilsInternal;

import com.android.settingslib.TwoTargetPreference;

import com.android.settingslib.widget.FooterPreference;

import com.android.settingslib.widget.TwoTargetPreference;



import java.util.HashMap;

import java.util.List;

src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java

+1 −1
Original line number Diff line number Diff line
@@ -46,10 +46,10 @@ import com.android.settings.core.PreferenceControllerMixin; 
import com.android.settings.core.SubSettingLauncher;

import com.android.settings.notification.app.AppNotificationSettings;

import com.android.settings.widget.PrimarySwitchPreference;

import com.android.settingslib.TwoTargetPreference;

import com.android.settingslib.applications.ApplicationsState;

import com.android.settingslib.core.AbstractPreferenceController;

import com.android.settingslib.utils.StringUtil;

import com.android.settingslib.widget.TwoTargetPreference;



import java.util.ArrayList;

import java.util.Calendar;

src/com/android/settings/notification/app/RecentConversationPreference.java

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ import android.view.View; 
import androidx.preference.PreferenceViewHolder;



import com.android.settings.R;

import com.android.settingslib.TwoTargetPreference;

import com.android.settingslib.widget.TwoTargetPreference;



import com.google.common.annotations.VisibleForTesting;