diff --git a/src/com/android/settings/panel/PanelContent.java b/src/com/android/settings/panel/PanelContent.java index 6b582288457..1bbe2dba83a 100644 --- a/src/com/android/settings/panel/PanelContent.java +++ b/src/com/android/settings/panel/PanelContent.java @@ -28,7 +28,10 @@ import java.util.List; /** * Represents the data class needed to create a Settings Panel. See {@link PanelFragment}. + * + * @deprecated this is no longer used after V and will be removed. */ +@Deprecated(forRemoval = true) public interface PanelContent extends Instrumentable { int VIEW_TYPE_SLIDER = 1; diff --git a/src/com/android/settings/panel/PanelContentCallback.java b/src/com/android/settings/panel/PanelContentCallback.java index e59d69913db..cceecd1e4ed 100644 --- a/src/com/android/settings/panel/PanelContentCallback.java +++ b/src/com/android/settings/panel/PanelContentCallback.java @@ -18,7 +18,10 @@ package com.android.settings.panel; /** * PanelContentCallback provides a callback interface for {@link PanelFragment} to receive * events from {@link PanelContent}. + * + * @deprecated this is no longer used after V and will be removed. */ +@Deprecated(forRemoval = true) public interface PanelContentCallback { /** diff --git a/src/com/android/settings/panel/PanelFeatureProvider.java b/src/com/android/settings/panel/PanelFeatureProvider.java index 402a562d53d..943c37def46 100644 --- a/src/com/android/settings/panel/PanelFeatureProvider.java +++ b/src/com/android/settings/panel/PanelFeatureProvider.java @@ -19,6 +19,7 @@ package com.android.settings.panel; import android.content.Context; import android.os.Bundle; +@Deprecated(forRemoval = true) public interface PanelFeatureProvider { /** diff --git a/src/com/android/settings/panel/PanelFeatureProviderImpl.java b/src/com/android/settings/panel/PanelFeatureProviderImpl.java index ddfce652c4b..a0aeec60856 100644 --- a/src/com/android/settings/panel/PanelFeatureProviderImpl.java +++ b/src/com/android/settings/panel/PanelFeatureProviderImpl.java @@ -27,6 +27,7 @@ import androidx.annotation.Nullable; import com.android.settings.Utils; import com.android.settings.flags.Flags; +@Deprecated(forRemoval = true) public class PanelFeatureProviderImpl implements PanelFeatureProvider { @Override diff --git a/src/com/android/settings/panel/PanelFragment.java b/src/com/android/settings/panel/PanelFragment.java index 159028369aa..b3a28844be5 100644 --- a/src/com/android/settings/panel/PanelFragment.java +++ b/src/com/android/settings/panel/PanelFragment.java @@ -66,6 +66,7 @@ import java.util.LinkedHashMap; import java.util.List; import java.util.Map; +@Deprecated(forRemoval = true) public class PanelFragment extends Fragment { private static final String TAG = "PanelFragment"; @@ -519,6 +520,7 @@ public class PanelFragment extends Fragment { return mPanel.getViewType(); } + @Deprecated(forRemoval = true) class LocalPanelCallback implements PanelContentCallback { @Override diff --git a/src/com/android/settings/panel/PanelLoggingContract.java b/src/com/android/settings/panel/PanelLoggingContract.java index e6e3012abef..fd145f865fb 100644 --- a/src/com/android/settings/panel/PanelLoggingContract.java +++ b/src/com/android/settings/panel/PanelLoggingContract.java @@ -21,7 +21,10 @@ package com.android.settings.panel; *

* Constants should only be removed if underlying panel, or use case is removed. *

+ * + * @deprecated this is no longer used after V and will be removed. */ +@Deprecated(forRemoval = true) public class PanelLoggingContract { /** diff --git a/src/com/android/settings/panel/PanelSlicesAdapter.java b/src/com/android/settings/panel/PanelSlicesAdapter.java index a2360d8367b..2223cbb61ab 100644 --- a/src/com/android/settings/panel/PanelSlicesAdapter.java +++ b/src/com/android/settings/panel/PanelSlicesAdapter.java @@ -48,7 +48,10 @@ import java.util.Map; /** * RecyclerView adapter for Slices in Settings Panels. + * + * @deprecated this is no longer used after V and will be removed. */ +@Deprecated(forRemoval = true) public class PanelSlicesAdapter extends RecyclerView.Adapter { @@ -112,7 +115,10 @@ public class PanelSlicesAdapter /** * ViewHolder for binding Slices to SliceViews. + * + * @deprecated this is no longer used after V and will be removed. */ + @Deprecated(forRemoval = true) public class SliceRowViewHolder extends RecyclerView.ViewHolder implements DividerItemDecoration.DividedViewHolder { diff --git a/src/com/android/settings/panel/PanelSlicesLoaderCountdownLatch.java b/src/com/android/settings/panel/PanelSlicesLoaderCountdownLatch.java index 6137d6c564e..49fd8619941 100644 --- a/src/com/android/settings/panel/PanelSlicesLoaderCountdownLatch.java +++ b/src/com/android/settings/panel/PanelSlicesLoaderCountdownLatch.java @@ -36,7 +36,10 @@ import java.util.concurrent.CountDownLatch; * {@link Uri}. Then check if all of the Slices have loaded with * {@link #isPanelReadyToLoad()}, which will return {@code true} the first time after all * Slices have loaded. + * + * @deprecated this is no longer used after V and will be removed. */ +@Deprecated(forRemoval = true) public class PanelSlicesLoaderCountdownLatch { private final Set mLoadedSlices; private final CountDownLatch mCountDownLatch; diff --git a/src/com/android/settings/panel/SettingsPanelActivity.java b/src/com/android/settings/panel/SettingsPanelActivity.java index 60b8f887936..d539c433c58 100644 --- a/src/com/android/settings/panel/SettingsPanelActivity.java +++ b/src/com/android/settings/panel/SettingsPanelActivity.java @@ -42,7 +42,10 @@ import com.android.settingslib.core.lifecycle.HideNonSystemOverlayMixin; /** * Dialog Activity to host Settings Slices. + * + * @deprecated this is no longer used after V and will be removed. */ +@Deprecated(forRemoval = true) public class SettingsPanelActivity extends FragmentActivity { private static final String TAG = "SettingsPanelActivity"; diff --git a/tests/robotests/src/com/android/settings/panel/FakePanelContent.java b/tests/robotests/src/com/android/settings/panel/FakePanelContent.java index 06beb3ecf51..17787cd01ae 100644 --- a/tests/robotests/src/com/android/settings/panel/FakePanelContent.java +++ b/tests/robotests/src/com/android/settings/panel/FakePanelContent.java @@ -29,7 +29,10 @@ import java.util.List; /** * Fake PanelContent for testing. + * + * @deprecated this is no longer used after V and will be removed. */ +@Deprecated(forRemoval = true) public class FakePanelContent implements PanelContent { public static final String FAKE_ACTION = "fake_action"; diff --git a/tests/robotests/src/com/android/settings/panel/FakeSettingsPanelActivity.java b/tests/robotests/src/com/android/settings/panel/FakeSettingsPanelActivity.java index ba763ce3a06..fe19f287794 100644 --- a/tests/robotests/src/com/android/settings/panel/FakeSettingsPanelActivity.java +++ b/tests/robotests/src/com/android/settings/panel/FakeSettingsPanelActivity.java @@ -19,6 +19,7 @@ package com.android.settings.panel; import android.content.ComponentName; import android.content.Intent; +@Deprecated(forRemoval = true) public class FakeSettingsPanelActivity extends SettingsPanelActivity { @Override public ComponentName getCallingActivity() { diff --git a/tests/robotests/src/com/android/settings/panel/PanelFragmentTest.java b/tests/robotests/src/com/android/settings/panel/PanelFragmentTest.java index 42f3977a227..e77eeab569b 100644 --- a/tests/robotests/src/com/android/settings/panel/PanelFragmentTest.java +++ b/tests/robotests/src/com/android/settings/panel/PanelFragmentTest.java @@ -54,6 +54,7 @@ import org.robolectric.annotation.Config; import java.util.Objects; +@Deprecated(forRemoval = true) @Ignore("b/313576125") @RunWith(RobolectricTestRunner.class) @Config(shadows = { diff --git a/tests/robotests/src/com/android/settings/panel/PanelSlicesAdapterTest.java b/tests/robotests/src/com/android/settings/panel/PanelSlicesAdapterTest.java index 87a798a2197..e778cb8cec8 100644 --- a/tests/robotests/src/com/android/settings/panel/PanelSlicesAdapterTest.java +++ b/tests/robotests/src/com/android/settings/panel/PanelSlicesAdapterTest.java @@ -67,6 +67,7 @@ import org.robolectric.annotation.Implements; import java.util.LinkedHashMap; import java.util.Map; +@Deprecated(forRemoval = true) @RunWith(RobolectricTestRunner.class) @Config(shadows = PanelSlicesAdapterTest.ShadowLayoutInflater.class) public class PanelSlicesAdapterTest { diff --git a/tests/robotests/src/com/android/settings/panel/SettingsPanelActivityTest.java b/tests/robotests/src/com/android/settings/panel/SettingsPanelActivityTest.java index e550284b028..4f03abb664b 100644 --- a/tests/robotests/src/com/android/settings/panel/SettingsPanelActivityTest.java +++ b/tests/robotests/src/com/android/settings/panel/SettingsPanelActivityTest.java @@ -59,6 +59,7 @@ import org.robolectric.android.controller.ActivityController; import org.robolectric.annotation.Config; import org.robolectric.util.ReflectionHelpers; +@Deprecated(forRemoval = true) @RunWith(RobolectricTestRunner.class) @Config(shadows = { com.android.settings.testutils.shadow.ShadowFragment.class, diff --git a/tests/unit/src/com/android/settings/panel/PanelSlicesLoaderCountdownLatchTest.java b/tests/unit/src/com/android/settings/panel/PanelSlicesLoaderCountdownLatchTest.java index 3794e00ea10..e201f42e4b3 100644 --- a/tests/unit/src/com/android/settings/panel/PanelSlicesLoaderCountdownLatchTest.java +++ b/tests/unit/src/com/android/settings/panel/PanelSlicesLoaderCountdownLatchTest.java @@ -29,6 +29,7 @@ import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; +@Deprecated(forRemoval = true) @RunWith(AndroidJUnit4.class) public class PanelSlicesLoaderCountdownLatchTest {