From 5f375a2776950b7e511d668102e7079efc57171c Mon Sep 17 00:00:00 2001 From: Soroosh Mariooryad Date: Thu, 23 Feb 2017 02:02:29 -0800 Subject: [PATCH] Move suggestions package to dashboard.suggestions Test: RunSettingsRoboTests Change-Id: I4f9af27767c8e55d3b1a16e77c099da52d40aab5 --- .../core/instrumentation/SettingSuggestionsLogWriter.java | 4 +--- src/com/android/settings/dashboard/DashboardSummary.java | 2 +- src/com/android/settings/dashboard/SuggestionsChecks.java | 2 +- .../settings/{ => dashboard}/suggestions/EventStore.java | 2 +- .../suggestions/SuggestionFeatureProvider.java | 2 +- .../suggestions/SuggestionFeatureProviderImpl.java | 2 +- .../{ => dashboard}/suggestions/SuggestionFeaturizer.java | 2 +- .../{ => dashboard}/suggestions/SuggestionRanker.java | 2 +- src/com/android/settings/overlay/FeatureFactory.java | 2 +- src/com/android/settings/overlay/FeatureFactoryImpl.java | 4 ++-- .../settings/{ => dashboard}/suggestions/EventStoreTest.java | 2 +- .../{ => dashboard}/suggestions/SuggestionFeaturizerTest.java | 2 +- .../{ => dashboard}/suggestions/SuggestionRankerTest.java | 2 +- .../com/android/settings/testutils/FakeFeatureFactory.java | 2 +- 14 files changed, 15 insertions(+), 17 deletions(-) rename src/com/android/settings/{ => dashboard}/suggestions/EventStore.java (98%) rename src/com/android/settings/{ => dashboard}/suggestions/SuggestionFeatureProvider.java (96%) rename src/com/android/settings/{ => dashboard}/suggestions/SuggestionFeatureProviderImpl.java (96%) rename src/com/android/settings/{ => dashboard}/suggestions/SuggestionFeaturizer.java (98%) rename src/com/android/settings/{ => dashboard}/suggestions/SuggestionRanker.java (98%) rename tests/robotests/src/com/android/settings/{ => dashboard}/suggestions/EventStoreTest.java (97%) rename tests/robotests/src/com/android/settings/{ => dashboard}/suggestions/SuggestionFeaturizerTest.java (99%) rename tests/robotests/src/com/android/settings/{ => dashboard}/suggestions/SuggestionRankerTest.java (98%) diff --git a/src/com/android/settings/core/instrumentation/SettingSuggestionsLogWriter.java b/src/com/android/settings/core/instrumentation/SettingSuggestionsLogWriter.java index 1c4e26eb67f..78d09a2d3b8 100644 --- a/src/com/android/settings/core/instrumentation/SettingSuggestionsLogWriter.java +++ b/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. diff --git a/src/com/android/settings/dashboard/DashboardSummary.java b/src/com/android/settings/dashboard/DashboardSummary.java index 7d28e4ed610..32b9c57c742 100644 --- a/src/com/android/settings/dashboard/DashboardSummary.java +++ b/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; diff --git a/src/com/android/settings/dashboard/SuggestionsChecks.java b/src/com/android/settings/dashboard/SuggestionsChecks.java index 66a0ef52849..9cf086884c1 100644 --- a/src/com/android/settings/dashboard/SuggestionsChecks.java +++ b/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; diff --git a/src/com/android/settings/suggestions/EventStore.java b/src/com/android/settings/dashboard/suggestions/EventStore.java similarity index 98% rename from src/com/android/settings/suggestions/EventStore.java rename to src/com/android/settings/dashboard/suggestions/EventStore.java index bf94f48bdda..43ed65b24e8 100644 --- a/src/com/android/settings/suggestions/EventStore.java +++ b/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; diff --git a/src/com/android/settings/suggestions/SuggestionFeatureProvider.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java similarity index 96% rename from src/com/android/settings/suggestions/SuggestionFeatureProvider.java rename to src/com/android/settings/dashboard/suggestions/SuggestionFeatureProvider.java index e6af3bdcc71..18fbd90815e 100644 --- a/src/com/android/settings/suggestions/SuggestionFeatureProvider.java +++ b/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; diff --git a/src/com/android/settings/suggestions/SuggestionFeatureProviderImpl.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java similarity index 96% rename from src/com/android/settings/suggestions/SuggestionFeatureProviderImpl.java rename to src/com/android/settings/dashboard/suggestions/SuggestionFeatureProviderImpl.java index 97220dfdf03..3a4d5456bf7 100644 --- a/src/com/android/settings/suggestions/SuggestionFeatureProviderImpl.java +++ b/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; diff --git a/src/com/android/settings/suggestions/SuggestionFeaturizer.java b/src/com/android/settings/dashboard/suggestions/SuggestionFeaturizer.java similarity index 98% rename from src/com/android/settings/suggestions/SuggestionFeaturizer.java rename to src/com/android/settings/dashboard/suggestions/SuggestionFeaturizer.java index eb43272003d..18ac50a7eff 100644 --- a/src/com/android/settings/suggestions/SuggestionFeaturizer.java +++ b/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; diff --git a/src/com/android/settings/suggestions/SuggestionRanker.java b/src/com/android/settings/dashboard/suggestions/SuggestionRanker.java similarity index 98% rename from src/com/android/settings/suggestions/SuggestionRanker.java rename to src/com/android/settings/dashboard/suggestions/SuggestionRanker.java index 9f9796b8a25..a7458bcf9a2 100644 --- a/src/com/android/settings/suggestions/SuggestionRanker.java +++ b/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; diff --git a/src/com/android/settings/overlay/FeatureFactory.java b/src/com/android/settings/overlay/FeatureFactory.java index 11adddbab97..dcd2b51817a 100644 --- a/src/com/android/settings/overlay/FeatureFactory.java +++ b/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 diff --git a/src/com/android/settings/overlay/FeatureFactoryImpl.java b/src/com/android/settings/overlay/FeatureFactoryImpl.java index 56e554d63c1..377e6bb5e63 100644 --- a/src/com/android/settings/overlay/FeatureFactoryImpl.java +++ b/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; /** diff --git a/tests/robotests/src/com/android/settings/suggestions/EventStoreTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/EventStoreTest.java similarity index 97% rename from tests/robotests/src/com/android/settings/suggestions/EventStoreTest.java rename to tests/robotests/src/com/android/settings/dashboard/suggestions/EventStoreTest.java index 9db11b8e375..4b9e440197a 100644 --- a/tests/robotests/src/com/android/settings/suggestions/EventStoreTest.java +++ b/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; diff --git a/tests/robotests/src/com/android/settings/suggestions/SuggestionFeaturizerTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeaturizerTest.java similarity index 99% rename from tests/robotests/src/com/android/settings/suggestions/SuggestionFeaturizerTest.java rename to tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionFeaturizerTest.java index 3c5bd4f70ca..cb4ce71c3cd 100644 --- a/tests/robotests/src/com/android/settings/suggestions/SuggestionFeaturizerTest.java +++ b/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; diff --git a/tests/robotests/src/com/android/settings/suggestions/SuggestionRankerTest.java b/tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionRankerTest.java similarity index 98% rename from tests/robotests/src/com/android/settings/suggestions/SuggestionRankerTest.java rename to tests/robotests/src/com/android/settings/dashboard/suggestions/SuggestionRankerTest.java index 086161b99c6..056d959ff66 100644 --- a/tests/robotests/src/com/android/settings/suggestions/SuggestionRankerTest.java +++ b/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; diff --git a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java b/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java index a7eca0d701b..f4f1c632f58 100644 --- a/tests/robotests/src/com/android/settings/testutils/FakeFeatureFactory.java +++ b/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;