Move all contextual card related classes.

... from homepage to contextualcards.

Test: rebuild
Change-Id: Id7889566ce1e7257eb699d963ae996906fdb58ff

src/com/android/settings/homepage/SettingsHomepageActivity.java

@@ -29,13 +29,11 @@ import androidx.fragment.app.FragmentTransaction;
 import com.android.settings.R;
 import com.android.settings.core.FeatureFlags;
 import com.android.settings.core.SettingsBaseActivity;
+import com.android.settings.homepage.contextualcards.ContextualCardsFragment;
 import com.android.settings.overlay.FeatureFactory;
 
 public class SettingsHomepageActivity extends SettingsBaseActivity {
 
-    private static final String SUGGESTION_TAG = "suggestion";
-    private static final String MAIN_TAG = "main";
-
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -54,21 +52,21 @@ public class SettingsHomepageActivity extends SettingsBaseActivity {
         FeatureFactory.getFactory(this).getSearchFeatureProvider()
                 .initSearchToolbar(this, toolbar);
 
-        showFragment(new PersonalSettingsFragment(), R.id.suggestion_content, SUGGESTION_TAG);
-        showFragment(new TopLevelSettings(), R.id.main_content, MAIN_TAG);
+        showFragment(new ContextualCardsFragment(), R.id.contextual_cards_content);
+        showFragment(new TopLevelSettings(), R.id.main_content);
     }
 
     public static boolean isDynamicHomepageEnabled(Context context) {
         return FeatureFlagUtils.isEnabled(context, FeatureFlags.DYNAMIC_HOMEPAGE);
     }
 
-    private void showFragment(Fragment fragment, int id, String tag) {
+    private void showFragment(Fragment fragment, int id) {
         final FragmentManager fragmentManager = getSupportFragmentManager();
         final FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
         final Fragment showFragment = fragmentManager.findFragmentById(id);
 
         if (showFragment == null) {
-            fragmentTransaction.add(id, fragment, tag);
+            fragmentTransaction.add(id, fragment);
         } else {
             fragmentTransaction.show(showFragment);
         }

src/com/android/settings/homepage/conditional/FocusRecyclerView.java

@@ -1,50 +0,0 @@
-/*
- * Copyright 2015, 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.
- */
-package com.android.settings.homepage.conditional;
-
-import android.content.Context;
-import android.util.AttributeSet;
-
-import androidx.annotation.Nullable;
-import androidx.recyclerview.widget.RecyclerView;
-
-/**
- * Version of RecyclerView that can have listeners for onWindowFocusChanged.
- */
-public class FocusRecyclerView extends RecyclerView {
-
-    private FocusListener mListener;
-
-    public FocusRecyclerView(Context context, @Nullable AttributeSet attrs) {
-        super(context, attrs);
-    }
-
-    @Override
-    public void onWindowFocusChanged(boolean hasWindowFocus) {
-        super.onWindowFocusChanged(hasWindowFocus);
-        if (mListener != null) {
-            mListener.onWindowFocusChanged(hasWindowFocus);
-        }
-    }
-
-    public void setListener(FocusListener listener) {
-        mListener = listener;
-    }
-
-    public interface FocusListener {
-        void onWindowFocusChanged(boolean hasWindowFocus);
-    }
-}

src/com/android/settings/homepage/contextualcards/CardContentProvider.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
 import android.content.ContentProvider;
 import android.content.ContentValues;
@@ -41,14 +41,12 @@ public class CardContentProvider extends ContentProvider {
     public static final String CARD_AUTHORITY = "com.android.settings.homepage.CardContentProvider";
 
     /** URI matcher for ContentProvider queries. */
-    private static final UriMatcher sUriMatcher = new UriMatcher(UriMatcher.NO_MATCH);
+    private static final UriMatcher URI_MATCHER = new UriMatcher(UriMatcher.NO_MATCH);
     /** URI matcher type for cards table */
     private static final int MATCH_CARDS = 100;
-    /** URI matcher type for card log table */
-    private static final int MATCH_CARD_LOG = 200;
 
     static {
-        sUriMatcher.addURI(CARD_AUTHORITY, CardDatabaseHelper.CARD_TABLE, MATCH_CARDS);
+        URI_MATCHER.addURI(CARD_AUTHORITY, CardDatabaseHelper.CARD_TABLE, MATCH_CARDS);
     }
 
     private CardDatabaseHelper mDBHelper;
@@ -170,7 +168,7 @@ public class CardContentProvider extends ContentProvider {
 
     @VisibleForTesting
     String getTableFromMatch(Uri uri) {
-        final int match = sUriMatcher.match(uri);
+        final int match = URI_MATCHER.match(uri);
         String table;
         switch (match) {
             case MATCH_CARDS:

src/com/android/settings/homepage/contextualcards/CardDatabaseHelper.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
 import android.content.Context;
 import android.database.Cursor;

src/com/android/settings/homepage/contextualcards/ContextualCard.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
 import android.annotation.IntDef;
 import android.database.Cursor;

src/com/android/settings/homepage/contextualcards/ContextualCardController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
 /**
  * Data controller for {@link ContextualCard}.

src/com/android/settings/homepage/contextualcards/ContextualCardLoader.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
 import static android.app.slice.Slice.HINT_ERROR;
 
@@ -32,17 +32,17 @@ import androidx.annotation.NonNull;
 import androidx.annotation.VisibleForTesting;
 import androidx.slice.Slice;
 
-import com.android.settings.homepage.deviceinfo.BatterySlice;
-import com.android.settings.homepage.deviceinfo.DataUsageSlice;
-import com.android.settings.homepage.deviceinfo.DeviceInfoSlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.BatterySlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.DataUsageSlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.DeviceInfoSlice;
 import com.android.settingslib.utils.AsyncLoaderCompat;
 
 import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 
-public class CardContentLoader extends AsyncLoaderCompat<List<ContextualCard>> {
-    private static final String TAG = "CardContentLoader";
+public class ContextualCardLoader extends AsyncLoaderCompat<List<ContextualCard>> {
+    private static final String TAG = "ContextualCardLoader";
     static final int CARD_CONTENT_LOADER_ID = 1;
 
     private Context mContext;
@@ -51,7 +51,7 @@ public class CardContentLoader extends AsyncLoaderCompat<List<ContextualCard>> {
         void onFinishCardLoading(List<ContextualCard> contextualCards);
     }
 
-    CardContentLoader(Context context) {
+    ContextualCardLoader(Context context) {
         super(context);
         mContext = context.getApplicationContext();
     }
@@ -79,7 +79,7 @@ public class CardContentLoader extends AsyncLoaderCompat<List<ContextualCard>> {
                 }
             }
         }
-        return filter(result);
+        return filterEligibleCards(result);
     }
 
     @VisibleForTesting
@@ -92,42 +92,41 @@ public class CardContentLoader extends AsyncLoaderCompat<List<ContextualCard>> {
         final long appVersionCode = getAppVersionCode();
         final String packageName = mContext.getPackageName();
         final double rankingScore = 0.0;
-        final List<ContextualCard> result = new ArrayList() {{
-            add(new ContextualCard.Builder()
-                    .setSliceUri(DataUsageSlice.DATA_USAGE_CARD_URI)
-                    .setName(DataUsageSlice.PATH_DATA_USAGE)
-                    .setPackageName(packageName)
-                    .setRankingScore(rankingScore)
-                    .setAppVersion(appVersionCode)
-                    .setCardType(ContextualCard.CardType.SLICE)
-                    .setIsHalfWidth(false)
-                    .build());
-            add(new ContextualCard.Builder()
-                    .setSliceUri(BatterySlice.BATTERY_CARD_URI)
-                    .setName(BatterySlice.PATH_BATTERY_INFO)
-                    .setPackageName(packageName)
-                    .setRankingScore(rankingScore)
-                    .setAppVersion(appVersionCode)
-                    .setCardType(ContextualCard.CardType.SLICE)
-                    .setIsHalfWidth(false)
-                    .build());
-            add(new ContextualCard.Builder()
-                    .setSliceUri(DeviceInfoSlice.DEVICE_INFO_CARD_URI)
-                    .setName(DeviceInfoSlice.PATH_DEVICE_INFO)
-                    .setPackageName(packageName)
-                    .setRankingScore(rankingScore)
-                    .setAppVersion(appVersionCode)
-                    .setCardType(ContextualCard.CardType.SLICE)
-                    .setIsHalfWidth(false)
-                    .build());
-        }};
+        final List<ContextualCard> result = new ArrayList();
+        result.add(new ContextualCard.Builder()
+                .setSliceUri(DataUsageSlice.DATA_USAGE_CARD_URI)
+                .setName(DataUsageSlice.PATH_DATA_USAGE)
+                .setPackageName(packageName)
+                .setRankingScore(rankingScore)
+                .setAppVersion(appVersionCode)
+                .setCardType(ContextualCard.CardType.SLICE)
+                .setIsHalfWidth(false)
+                .build());
+        result.add(new ContextualCard.Builder()
+                .setSliceUri(BatterySlice.BATTERY_CARD_URI)
+                .setName(BatterySlice.PATH_BATTERY_INFO)
+                .setPackageName(packageName)
+                .setRankingScore(rankingScore)
+                .setAppVersion(appVersionCode)
+                .setCardType(ContextualCard.CardType.SLICE)
+                .setIsHalfWidth(false)
+                .build());
+        result.add(new ContextualCard.Builder()
+                .setSliceUri(DeviceInfoSlice.DEVICE_INFO_CARD_URI)
+                .setName(DeviceInfoSlice.PATH_DEVICE_INFO)
+                .setPackageName(packageName)
+                .setRankingScore(rankingScore)
+                .setAppVersion(appVersionCode)
+                .setCardType(ContextualCard.CardType.SLICE)
+                .setIsHalfWidth(false)
+                .build());
         return result;
     }
 
     @VisibleForTesting
-    List<ContextualCard> filter(List<ContextualCard> candidates) {
-        return candidates.stream().filter(card -> isCardEligibleToDisplay(card)).collect(
-                Collectors.toList());
+    List<ContextualCard> filterEligibleCards(List<ContextualCard> candidates) {
+        return candidates.stream().filter(card -> isCardEligibleToDisplay(card))
+                .collect(Collectors.toList());
     }
 
     @VisibleForTesting

src/com/android/settings/homepage/contextualcards/ContextualCardLookupTable.java

@@ -14,13 +14,13 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
-import com.android.settings.homepage.ContextualCard.CardType;
-import com.android.settings.homepage.conditional.ConditionContextualCardController;
-import com.android.settings.homepage.conditional.ConditionContextualCardRenderer;
-import com.android.settings.homepage.slices.SliceContextualCardController;
-import com.android.settings.homepage.slices.SliceContextualCardRenderer;
+import com.android.settings.homepage.contextualcards.ContextualCard.CardType;
+import com.android.settings.homepage.contextualcards.conditional.ConditionContextualCardController;
+import com.android.settings.homepage.contextualcards.conditional.ConditionContextualCardRenderer;
+import com.android.settings.homepage.contextualcards.slices.SliceContextualCardController;
+import com.android.settings.homepage.contextualcards.slices.SliceContextualCardRenderer;
 
 import java.util.Set;
 import java.util.TreeSet;

src/com/android/settings/homepage/contextualcards/ContextualCardManager.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
-import static com.android.settings.homepage.CardContentLoader.CARD_CONTENT_LOADER_ID;
+import static com.android.settings.homepage.contextualcards.ContextualCardLoader.CARD_CONTENT_LOADER_ID;
 
 import static java.util.stream.Collectors.groupingBy;
 
@@ -43,7 +43,7 @@ import java.util.stream.Collectors;
 /**
  * This is a centralized manager of multiple {@link ContextualCardController}.
  *
- * {@link ContextualCardManager} first loads data from {@link CardContentLoader} and gets back a
+ * {@link ContextualCardManager} first loads data from {@link ContextualCardLoader} and gets back a
  * list of {@link ContextualCard}. All subclasses of {@link ContextualCardController} are loaded
  * here, which will then trigger the {@link ContextualCardController} to load its data and listen to
  * corresponding changes. When every single {@link ContextualCardController} updates its data, the
@@ -52,7 +52,7 @@ import java.util.stream.Collectors;
  * {@link ContextualCardsAdapter} and {@link BaseAdapter#notifyDataSetChanged()} will be called to
  * get the page refreshed.
  */
-public class ContextualCardManager implements CardContentLoader.CardContentLoaderListener,
+public class ContextualCardManager implements ContextualCardLoader.CardContentLoaderListener,
         ContextualCardUpdateListener {
 
     private static final String TAG = "ContextualCardManager";
@@ -80,7 +80,7 @@ public class ContextualCardManager implements CardContentLoader.CardContentLoade
         }
     }
 
-    void loadContextualCards(PersonalSettingsFragment fragment) {
+    void loadContextualCards(ContextualCardsFragment fragment) {
         final CardContentLoaderCallbacks cardContentLoaderCallbacks =
                 new CardContentLoaderCallbacks(mContext);
         cardContentLoaderCallbacks.setListener(this);
@@ -157,13 +157,13 @@ public class ContextualCardManager implements CardContentLoader.CardContentLoade
             LoaderManager.LoaderCallbacks<List<ContextualCard>> {
 
         private Context mContext;
-        private CardContentLoader.CardContentLoaderListener mListener;
+        private ContextualCardLoader.CardContentLoaderListener mListener;
 
         CardContentLoaderCallbacks(Context context) {
             mContext = context.getApplicationContext();
         }
 
-        protected void setListener(CardContentLoader.CardContentLoaderListener listener) {
+        protected void setListener(ContextualCardLoader.CardContentLoaderListener listener) {
             mListener = listener;
         }
 
@@ -171,7 +171,7 @@ public class ContextualCardManager implements CardContentLoader.CardContentLoade
         @Override
         public Loader<List<ContextualCard>> onCreateLoader(int id, @Nullable Bundle bundle) {
             if (id == CARD_CONTENT_LOADER_ID) {
-                return new CardContentLoader(mContext);
+                return new ContextualCardLoader(mContext);
             } else {
                 throw new IllegalArgumentException("Unknown loader id: " + id);
             }

src/com/android/settings/homepage/contextualcards/ContextualCardRenderer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
 import android.view.View;
 

src/com/android/settings/homepage/contextualcards/ContextualCardUpdateListener.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
 import java.util.List;
 import java.util.Map;

src/com/android/settings/homepage/contextualcards/ContextualCardsAdapter.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
 import android.content.Context;
 import android.view.LayoutInflater;

src/com/android/settings/homepage/contextualcards/ContextualCardsDiffCallback.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
 import androidx.recyclerview.widget.DiffUtil;
 

src/com/android/settings/homepage/contextualcards/ContextualCardsFragment.java

@@ -14,9 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
-import static com.android.settings.homepage.ContextualCardsAdapter.SPAN_COUNT;
+import static com.android.settings.homepage.contextualcards.ContextualCardsAdapter.SPAN_COUNT;
 
 import android.os.Bundle;
 import android.view.LayoutInflater;
@@ -30,9 +30,9 @@ import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.core.InstrumentedFragment;
 
-public class PersonalSettingsFragment extends InstrumentedFragment {
+public class ContextualCardsFragment extends InstrumentedFragment {
 
-    private static final String TAG = "PersonalSettingsFragment";
+    private static final String TAG = "ContextualCardsFragment";
 
     private RecyclerView mCardsContainer;
     private GridLayoutManager mLayoutManager;

src/com/android/settings/homepage/contextualcards/ControllerRendererPool.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage;
+package com.android.settings.homepage.contextualcards;
 
 import android.content.Context;
 import android.util.Log;
@@ -22,10 +22,10 @@ import android.util.Log;
 import androidx.collection.ArraySet;
 import androidx.lifecycle.LifecycleOwner;
 
-import com.android.settings.homepage.conditional.ConditionContextualCardController;
-import com.android.settings.homepage.conditional.ConditionContextualCardRenderer;
-import com.android.settings.homepage.slices.SliceContextualCardController;
-import com.android.settings.homepage.slices.SliceContextualCardRenderer;
+import com.android.settings.homepage.contextualcards.conditional.ConditionContextualCardController;
+import com.android.settings.homepage.contextualcards.conditional.ConditionContextualCardRenderer;
+import com.android.settings.homepage.contextualcards.slices.SliceContextualCardController;
+import com.android.settings.homepage.contextualcards.slices.SliceContextualCardRenderer;
 
 import java.util.Set;
 

src/com/android/settings/homepage/contextualcards/SettingsContextualCardProvider.java

@@ -20,11 +20,11 @@ import static android.provider.SettingsSlicesContract.KEY_WIFI;
 
 import android.annotation.Nullable;
 
-import com.android.settings.homepage.deviceinfo.BatterySlice;
-import com.android.settings.homepage.deviceinfo.DataUsageSlice;
-import com.android.settings.homepage.deviceinfo.DeviceInfoSlice;
-import com.android.settings.homepage.deviceinfo.StorageSlice;
-import com.android.settings.homepage.deviceinfo.EmergencyInfoSlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.BatterySlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.DataUsageSlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.DeviceInfoSlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.EmergencyInfoSlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.StorageSlice;
 import com.android.settings.intelligence.ContextualCardProto.ContextualCard;
 import com.android.settings.intelligence.ContextualCardProto.ContextualCardList;
 import com.android.settings.wifi.WifiSlice;

src/com/android/settings/homepage/contextualcards/conditional/AbnormalRingerConditionController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;

src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionCard.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;

src/com/android/settings/homepage/contextualcards/conditional/AirplaneModeConditionController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;

src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionCard.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;

src/com/android/settings/homepage/contextualcards/conditional/BackgroundDataConditionController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.content.Intent;

src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionCard.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;

src/com/android/settings/homepage/contextualcards/conditional/BatterySaverConditionController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.os.PowerManager;

src/com/android/settings/homepage/contextualcards/conditional/CellularDataConditionCard.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;

src/com/android/settings/homepage/contextualcards/conditional/CellularDataConditionController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;

src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardController.java

@@ -14,14 +14,14 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.util.ArrayMap;
 
-import com.android.settings.homepage.ContextualCard;
-import com.android.settings.homepage.ContextualCardController;
-import com.android.settings.homepage.ContextualCardUpdateListener;
+import com.android.settings.homepage.contextualcards.ContextualCard;
+import com.android.settings.homepage.contextualcards.ContextualCardController;
+import com.android.settings.homepage.contextualcards.ContextualCardUpdateListener;
 import com.android.settingslib.core.lifecycle.LifecycleObserver;
 import com.android.settingslib.core.lifecycle.events.OnStart;
 import com.android.settingslib.core.lifecycle.events.OnStop;

src/com/android/settings/homepage/contextualcards/conditional/ConditionContextualCardRenderer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.text.TextUtils;
@@ -27,9 +27,9 @@ import androidx.recyclerview.widget.RecyclerView;
 
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
-import com.android.settings.homepage.ContextualCard;
-import com.android.settings.homepage.ControllerRendererPool;
-import com.android.settings.homepage.ContextualCardRenderer;
+import com.android.settings.homepage.contextualcards.ContextualCard;
+import com.android.settings.homepage.contextualcards.ContextualCardRenderer;
+import com.android.settings.homepage.contextualcards.ControllerRendererPool;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 

src/com/android/settings/homepage/contextualcards/conditional/ConditionListener.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 public interface ConditionListener {
     void onConditionsChanged();

src/com/android/settings/homepage/contextualcards/conditional/ConditionManager.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.util.Log;

src/com/android/settings/homepage/contextualcards/conditional/ConditionalCard.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.graphics.drawable.Drawable;
 

src/com/android/settings/homepage/contextualcards/conditional/ConditionalCardController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 

src/com/android/settings/homepage/contextualcards/conditional/ConditionalContextualCard.java

@@ -14,11 +14,9 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
-import androidx.annotation.VisibleForTesting;
-
-import com.android.settings.homepage.ContextualCard;
+import com.android.settings.homepage.contextualcards.ContextualCard;
 
 /**
  * Data class representing a conditional {@link ContextualCard}.

src/com/android/settings/homepage/contextualcards/conditional/DndConditionCard.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;

src/com/android/settings/homepage/contextualcards/conditional/DndConditionCardController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.app.NotificationManager;
 import android.content.BroadcastReceiver;

src/com/android/settings/homepage/contextualcards/conditional/HotspotConditionCard.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;

src/com/android/settings/homepage/contextualcards/conditional/HotspotConditionController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;

src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionCard.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;

src/com/android/settings/homepage/contextualcards/conditional/NightDisplayConditionController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 

src/com/android/settings/homepage/contextualcards/conditional/RingerMutedConditionCard.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;

src/com/android/settings/homepage/contextualcards/conditional/RingerMutedConditionController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import static android.content.Context.NOTIFICATION_SERVICE;
 

src/com/android/settings/homepage/contextualcards/conditional/RingerVibrateConditionCard.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;

src/com/android/settings/homepage/contextualcards/conditional/RingerVibrateConditionController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.media.AudioManager;

src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionCard.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.Context;
 import android.graphics.drawable.Drawable;

src/com/android/settings/homepage/contextualcards/conditional/WorkModeConditionController.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.conditional;
+package com.android.settings.homepage.contextualcards.conditional;
 
 import android.content.BroadcastReceiver;
 import android.content.Context;

src/com/android/settings/homepage/contextualcards/deviceinfo/BatterySlice.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.deviceinfo;
+package com.android.settings.homepage.contextualcards.deviceinfo;
 
 import android.app.PendingIntent;
 import android.content.ContentResolver;

src/com/android/settings/homepage/contextualcards/deviceinfo/DataUsageSlice.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.deviceinfo;
+package com.android.settings.homepage.contextualcards.deviceinfo;
 
 import android.app.PendingIntent;
 import android.content.ContentResolver;

src/com/android/settings/homepage/contextualcards/deviceinfo/DeviceInfoSlice.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.deviceinfo;
+package com.android.settings.homepage.contextualcards.deviceinfo;
 
 import android.app.PendingIntent;
 import android.content.ContentResolver;

src/com/android/settings/homepage/contextualcards/deviceinfo/EmergencyInfoSlice.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.deviceinfo;
+package com.android.settings.homepage.contextualcards.deviceinfo;
 
 import android.app.PendingIntent;
 import android.content.ContentResolver;

src/com/android/settings/homepage/contextualcards/deviceinfo/StorageSlice.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.deviceinfo;
+package com.android.settings.homepage.contextualcards.deviceinfo;
 
 import android.app.PendingIntent;
 import android.content.ContentResolver;

src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardController.java

@@ -14,13 +14,11 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.slices;
+package com.android.settings.homepage.contextualcards.slices;
 
-import com.android.settings.homepage.ContextualCard;
-import com.android.settings.homepage.ContextualCardController;
-import com.android.settings.homepage.ContextualCardUpdateListener;
-
-import java.util.List;
+import com.android.settings.homepage.contextualcards.ContextualCard;
+import com.android.settings.homepage.contextualcards.ContextualCardController;
+import com.android.settings.homepage.contextualcards.ContextualCardUpdateListener;
 
 /**
  * Card controller for {@link ContextualCard} built as slices.

src/com/android/settings/homepage/contextualcards/slices/SliceContextualCardRenderer.java

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-package com.android.settings.homepage.slices;
+package com.android.settings.homepage.contextualcards.slices;
 
 import android.content.ContentResolver;
 import android.content.Context;
@@ -35,8 +35,8 @@ import androidx.slice.widget.SliceLiveData;
 import androidx.slice.widget.SliceView;
 
 import com.android.settings.R;
-import com.android.settings.homepage.ContextualCard;
-import com.android.settings.homepage.ContextualCardRenderer;
+import com.android.settings.homepage.contextualcards.ContextualCard;
+import com.android.settings.homepage.contextualcards.ContextualCardRenderer;
 
 import java.util.Map;
 

src/com/android/settings/slices/CustomSliceManager.java

@@ -20,10 +20,10 @@ import android.content.Context;
 import android.net.Uri;
 import android.util.ArrayMap;
 
-import com.android.settings.homepage.deviceinfo.BatterySlice;
-import com.android.settings.homepage.deviceinfo.DataUsageSlice;
-import com.android.settings.homepage.deviceinfo.DeviceInfoSlice;
-import com.android.settings.homepage.deviceinfo.StorageSlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.BatterySlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.DataUsageSlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.DeviceInfoSlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.StorageSlice;
 import com.android.settings.wifi.WifiSlice;
 
 import java.util.Map;

src/com/android/settings/slices/SettingsSliceProvider.java

@@ -42,7 +42,7 @@ import com.android.settings.R;
 import com.android.settings.bluetooth.BluetoothSliceBuilder;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settings.flashlight.FlashlightSliceBuilder;
-import com.android.settings.homepage.deviceinfo.EmergencyInfoSlice;
+import com.android.settings.homepage.contextualcards.deviceinfo.EmergencyInfoSlice;
 import com.android.settings.location.LocationSliceBuilder;
 import com.android.settings.network.telephony.Enhanced4gLteSliceHelper;
 import com.android.settings.notification.ZenModeSliceBuilder;