Merge "Clean up import in homepage" into qt-dev

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

@@ -18,9 +18,9 @@ package com.android.settings.homepage.contextualcards.conditional;
 
 import android.app.settings.SettingsEnums;
 import android.content.Context;
-
 import android.hardware.display.ColorDisplayManager;
 import android.hardware.display.NightDisplayListener;
+
 import com.android.settings.R;
 import com.android.settings.core.SubSettingLauncher;
 import com.android.settings.display.NightDisplaySettings;

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

@@ -16,14 +16,11 @@
 
 package com.android.settings.homepage.contextualcards.slices;
 
-import android.annotation.ColorInt;
 import android.app.PendingIntent;
 import android.app.settings.SettingsEnums;
 import android.bluetooth.BluetoothAdapter;
 import android.content.Context;
 import android.content.Intent;
-import android.graphics.PorterDuff;
-import android.graphics.PorterDuffColorFilter;
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
 import android.os.Bundle;

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

@@ -26,6 +26,7 @@ import android.app.Application;
 import android.app.NotificationChannel;
 import android.app.NotificationChannelGroup;
 import android.app.PendingIntent;
+import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.Intent;
 import android.content.pm.PackageInfo;
@@ -44,7 +45,6 @@ import androidx.slice.builders.ListBuilder;
 import androidx.slice.builders.SliceAction;
 
 import com.android.internal.annotations.VisibleForTesting;
-import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.SubSettings;
 import com.android.settings.Utils;
@@ -215,7 +215,7 @@ public class NotificationChannelSlice implements CustomSliceable {
                 .setDestination(AppNotificationSettings.class.getName())
                 .setTitleRes(R.string.notifications_title)
                 .setArguments(args)
-                .setSourceMetricsCategory(MetricsProto.MetricsEvent.SLICE)
+                .setSourceMetricsCategory(SettingsEnums.SLICE)
                 .toIntent();
     }
 
@@ -263,7 +263,7 @@ public class NotificationChannelSlice implements CustomSliceable {
                 .setDestination(ChannelNotificationSettings.class.getName())
                 .setArguments(channelArgs)
                 .setTitleRes(R.string.notification_channel_title)
-                .setSourceMetricsCategory(MetricsProto.MetricsEvent.SLICE)
+                .setSourceMetricsCategory(SettingsEnums.SLICE)
                 .toIntent();
 
         return SliceAction.createDeeplink(
@@ -439,7 +439,7 @@ public class NotificationChannelSlice implements CustomSliceable {
         return SliceBuilderUtils.buildSearchResultPageIntent(mContext,
                 AppAndNotificationDashboardFragment.class.getName(), "" /* key */,
                 screenTitle,
-                MetricsProto.MetricsEvent.SLICE)
+                SettingsEnums.SLICE)
                 .setClassName(mContext.getPackageName(), SubSettings.class.getName())
                 .setData(getUri());
     }

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

@@ -29,8 +29,8 @@ import com.android.settings.homepage.contextualcards.CardDatabaseHelper;
 import com.android.settings.homepage.contextualcards.ContextualCard;
 import com.android.settings.homepage.contextualcards.ContextualCardController;
 import com.android.settings.homepage.contextualcards.ContextualCardFeedbackDialog;
-import com.android.settings.homepage.contextualcards.logging.ContextualCardLogUtils;
 import com.android.settings.homepage.contextualcards.ContextualCardUpdateListener;
+import com.android.settings.homepage.contextualcards.logging.ContextualCardLogUtils;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
 import com.android.settingslib.utils.ThreadUtils;

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

@@ -19,7 +19,6 @@ package com.android.settings.homepage.contextualcards.slices;
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.view.View;
-import android.widget.LinearLayout;
 
 import androidx.recyclerview.widget.RecyclerView;
 import androidx.slice.Slice;