PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Change packagename of TwoTargetPreference" into sc-dev

Browse Source
This commit is contained in:
Edgar Wang
2021-03-17 05:08:21 +00:00
committed by Android (Google) Code Review
parent 78a02d76c4 9691da0d21
commit 0c914077aa
10 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/accessibility/AccessibilitySettings.java
View File

@@ -16,7 +16,7 @@
package com.android.settings.accessibility; 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.AccessibilityServiceInfo;
import android.accessibilityservice.AccessibilityShortcutInfo; import android.accessibilityservice.AccessibilityShortcutInfo;

4
src/com/android/settings/applications/defaultapps/DefaultAppPreferenceController.java
View File

@@ -16,7 +16,7 @@
package com.android.settings.applications.defaultapps; 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.Context;
import android.content.Intent; import android.content.Intent;
@@ -33,9 +33,9 @@ import com.android.settings.R;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.core.PreferenceControllerMixin; import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.widget.GearPreference; import com.android.settings.widget.GearPreference;
import com.android.settingslib.TwoTargetPreference;
import com.android.settingslib.applications.DefaultAppInfo; import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.widget.TwoTargetPreference;
public abstract class DefaultAppPreferenceController extends AbstractPreferenceController public abstract class DefaultAppPreferenceController extends AbstractPreferenceController
implements PreferenceControllerMixin { implements PreferenceControllerMixin {

2
src/com/android/settings/biometrics/fingerprint/FingerprintSettings.java
View File

@@ -63,8 +63,8 @@ import com.android.settingslib.HelpUtils;
import com.android.settingslib.RestrictedLockUtils; import com.android.settingslib.RestrictedLockUtils;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedLockUtilsInternal; import com.android.settingslib.RestrictedLockUtilsInternal;
import com.android.settingslib.TwoTargetPreference;
import com.android.settingslib.widget.FooterPreference; import com.android.settingslib.widget.FooterPreference;
import com.android.settingslib.widget.TwoTargetPreference;
import java.util.HashMap; import java.util.HashMap;
import java.util.List; import java.util.List;

2
src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
View File

@@ -46,10 +46,10 @@ import com.android.settings.core.PreferenceControllerMixin;
import com.android.settings.core.SubSettingLauncher; import com.android.settings.core.SubSettingLauncher;
import com.android.settings.notification.app.AppNotificationSettings; import com.android.settings.notification.app.AppNotificationSettings;
import com.android.settings.widget.PrimarySwitchPreference; import com.android.settings.widget.PrimarySwitchPreference;
import com.android.settingslib.TwoTargetPreference;
import com.android.settingslib.applications.ApplicationsState; import com.android.settingslib.applications.ApplicationsState;
import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.AbstractPreferenceController;
import com.android.settingslib.utils.StringUtil; import com.android.settingslib.utils.StringUtil;
import com.android.settingslib.widget.TwoTargetPreference;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Calendar; import java.util.Calendar;

2
src/com/android/settings/notification/app/RecentConversationPreference.java
View File

@@ -21,7 +21,7 @@ import android.view.View;
import androidx.preference.PreferenceViewHolder; import androidx.preference.PreferenceViewHolder;
import com.android.settings.R; import com.android.settings.R;
import com.android.settingslib.TwoTargetPreference; import com.android.settingslib.widget.TwoTargetPreference;
import com.google.common.annotations.VisibleForTesting; import com.google.common.annotations.VisibleForTesting;

2
src/com/android/settings/notification/zen/ZenRulePreference.java
View File

@@ -33,8 +33,8 @@ import androidx.preference.PreferenceViewHolder;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.utils.ManagedServiceSettings; import com.android.settings.utils.ManagedServiceSettings;
import com.android.settings.utils.ZenServiceListing; import com.android.settings.utils.ZenServiceListing;
import com.android.settingslib.TwoTargetPreference;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider; import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
import com.android.settingslib.widget.TwoTargetPreference;
import java.util.Map; import java.util.Map;

2
src/com/android/settings/wfd/WifiDisplaySettings.java
View File

@@ -64,9 +64,9 @@ import com.android.internal.app.MediaRouteDialogPresenter;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SettingsPreferenceFragment;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settingslib.TwoTargetPreference;
import com.android.settingslib.search.Indexable; import com.android.settingslib.search.Indexable;
import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.search.SearchIndexable;
import com.android.settingslib.widget.TwoTargetPreference;
/** /**
* The Settings screen for WifiDisplay configuration and connection management. * The Settings screen for WifiDisplay configuration and connection management.

2
src/com/android/settings/widget/PrimaryCheckBoxPreference.java
View File

@@ -25,7 +25,7 @@ import android.widget.CheckBox;
import androidx.preference.PreferenceViewHolder; import androidx.preference.PreferenceViewHolder;
import com.android.settings.R; import com.android.settings.R;
import com.android.settingslib.TwoTargetPreference; import com.android.settingslib.widget.TwoTargetPreference;
/** /**
* A custom preference that provides inline checkbox. It has a mandatory field for title, and * A custom preference that provides inline checkbox. It has a mandatory field for title, and

2
tests/robotests/src/com/android/settings/accounts/ProviderPreferenceTest.java
View File

@@ -16,7 +16,7 @@
package com.android.settings.accounts; package com.android.settings.accounts;
import static com.android.settingslib.TwoTargetPreference.ICON_SIZE_MEDIUM; import static com.android.settingslib.widget.TwoTargetPreference.ICON_SIZE_MEDIUM;
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;

4
tests/robotests/src/com/android/settings/applications/defaultapps/DefaultAppPreferenceControllerTest.java
View File

@@ -16,7 +16,7 @@
package com.android.settings.applications.defaultapps; 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 static org.mockito.Mockito.mock; import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify; import static org.mockito.Mockito.verify;
@@ -28,8 +28,8 @@ import android.os.UserManager;
import androidx.preference.Preference; import androidx.preference.Preference;
import com.android.settings.R; import com.android.settings.R;
import com.android.settingslib.TwoTargetPreference;
import com.android.settingslib.applications.DefaultAppInfo; import com.android.settingslib.applications.DefaultAppInfo;
import com.android.settingslib.widget.TwoTargetPreference;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;