Merge "Move suggestions package to dashboard.suggestions"

src/com/android/settings/core/instrumentation/SettingSuggestionsLogWriter.java

@@ -17,12 +17,10 @@
 package com.android.settings.core.instrumentation;
 
 import android.content.Context;
-import android.metrics.LogMaker;
 import android.util.Pair;
 
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
-import com.android.internal.logging.MetricsLogger;
-import com.android.settings.suggestions.EventStore;
+import com.android.settings.dashboard.suggestions.EventStore;
 
 /**
  * {@link LogWriter} that writes setting suggestion related logs.

src/com/android/settings/dashboard/DashboardSummary.java

@@ -36,8 +36,8 @@ import com.android.settings.dashboard.conditional.Condition;
 import com.android.settings.dashboard.conditional.ConditionAdapterUtils;
 import com.android.settings.dashboard.conditional.ConditionManager;
 import com.android.settings.dashboard.conditional.FocusRecyclerView;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.suggestions.SuggestionFeatureProvider;
 import com.android.settingslib.SuggestionParser;
 import com.android.settingslib.drawer.CategoryKey;
 import com.android.settingslib.drawer.DashboardCategory;

src/com/android/settings/dashboard/SuggestionsChecks.java

@@ -30,6 +30,7 @@ import android.os.RemoteException;
 import android.os.ServiceManager;
 
 import com.android.ims.ImsManager;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
 import com.android.settings.Settings.FingerprintEnrollSuggestionActivity;
 import com.android.settings.Settings.FingerprintSuggestionActivity;
 import com.android.settings.Settings.ScreenLockSuggestionActivity;
@@ -38,7 +39,6 @@ import com.android.settings.Settings.ZenModeAutomationSuggestionActivity;
 import com.android.settings.Utils;
 import com.android.settings.WallpaperSuggestionActivity;
 import com.android.settings.overlay.FeatureFactory;
-import com.android.settings.suggestions.SuggestionFeatureProvider;
 import com.android.settingslib.drawer.Tile;
 
 import java.util.Collection;

src/com/android/settings/dashboard/suggestions/EventStore.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-package com.android.settings.suggestions;
+package com.android.settings.dashboard.suggestions;
 
 import android.content.Context;
 import android.content.SharedPreferences;

src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java

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

src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java

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

src/com/android/settings/dashboard/suggestions/SuggestionFeaturizer.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-package com.android.settings.suggestions;
+package com.android.settings.dashboard.suggestions;
 
 import java.util.HashMap;
 import java.util.List;

src/com/android/settings/dashboard/suggestions/SuggestionRanker.java

@@ -13,7 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License
  */
-package com.android.settings.suggestions;
+package com.android.settings.dashboard.suggestions;
 
 import com.android.settingslib.drawer.Tile;
 

src/com/android/settings/overlay/FeatureFactory.java

@@ -24,13 +24,13 @@ import com.android.settings.R;
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.dashboard.DashboardFeatureProvider;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
 import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
 import com.android.settings.gestures.AssistGestureFeatureProvider;
 import com.android.settings.localepicker.LocaleFeatureProvider;
 import com.android.settings.security.SecurityFeatureProvider;
 import com.android.settings.search2.SearchFeatureProvider;
-import com.android.settings.suggestions.SuggestionFeatureProvider;
 
 /**
  * Abstract class for creating feature controllers. Allows OEM implementations to define their own

src/com/android/settings/overlay/FeatureFactoryImpl.java

@@ -30,6 +30,8 @@ import com.android.settings.applications.PackageManagerWrapperImpl;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.dashboard.DashboardFeatureProvider;
 import com.android.settings.dashboard.DashboardFeatureProviderImpl;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProviderImpl;
 import com.android.settings.enterprise.DevicePolicyManagerWrapperImpl;
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProviderImpl;
@@ -43,8 +45,6 @@ import com.android.settings.search2.SearchFeatureProvider;
 import com.android.settings.search2.SearchFeatureProviderImpl;
 import com.android.settings.security.SecurityFeatureProvider;
 import com.android.settings.security.SecurityFeatureProviderImpl;
-import com.android.settings.suggestions.SuggestionFeatureProvider;
-import com.android.settings.suggestions.SuggestionFeatureProviderImpl;
 import com.android.settings.vpn2.ConnectivityManagerWrapperImpl;
 
 /**

tests/robotests/src/com/android/settings/dashboard/suggestions/EventStoreTest.java

@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.settings.suggestions;
+package com.android.settings.dashboard.suggestions;
 
 import com.android.settings.SettingsRobolectricTestRunner;
 import com.android.settings.TestConfig;

tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeaturizerTest.java

@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.settings.suggestions;
+package com.android.settings.dashboard.suggestions;
 
 import java.util.Arrays;
 import java.util.Map;

tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionRankerTest.java

@@ -14,7 +14,7 @@
  * limitations under the License
  */
 
-package com.android.settings.suggestions;
+package com.android.settings.dashboard.suggestions;
 
 import java.util.ArrayList;
 import java.util.Arrays;

tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java

@@ -20,6 +20,7 @@ import android.content.Context;
 import com.android.settings.applications.ApplicationFeatureProvider;
 import com.android.settings.core.instrumentation.MetricsFeatureProvider;
 import com.android.settings.dashboard.DashboardFeatureProvider;
+import com.android.settings.dashboard.suggestions.SuggestionFeatureProvider;
 import com.android.settings.enterprise.EnterprisePrivacyFeatureProvider;
 import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
 import com.android.settings.gestures.AssistGestureFeatureProvider;
@@ -27,7 +28,6 @@ import com.android.settings.localepicker.LocaleFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.overlay.SupportFeatureProvider;
 import com.android.settings.security.SecurityFeatureProvider;
-import com.android.settings.suggestions.SuggestionFeatureProvider;
 import com.android.settings.search2.SearchFeatureProvider;
 import com.android.settings.overlay.SurveyFeatureProvider;