Merge "Add FeatureProvider for SyncAcrossDevices Settings integration." into main

src/com/android/settings/notification/syncacrossdevices/SyncAcrossDevicesFeatureCallback.java

@@ -0,0 +1,38 @@
+/*
+ * Copyright (C) 2024 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.notification.syncacrossdevices;
+
+import androidx.annotation.Nullable;
+import androidx.preference.Preference;
+
+/** Callback to add or remove {@link Preference} in Sync Across Devices feature. */
+public interface SyncAcrossDevicesFeatureCallback {
+
+    /**
+     * Called when a sync across devices feature is added
+     *
+     * @param preference present the feature
+     */
+    void onFeatureAdded(@Nullable Preference preference);
+
+    /**
+     * Called when a sync across devices feature is removed
+     *
+     * @param preference present the feature
+     */
+    void onFeatureRemoved(@Nullable Preference preference);
+}

src/com/android/settings/notification/syncacrossdevices/SyncAcrossDevicesFeatureProvider.java

@@ -0,0 +1,32 @@
+/*
+ * Copyright (C) 2024 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.notification.syncacrossdevices;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+/** Feature provider for the Sync Across Devices. */
+public interface SyncAcrossDevicesFeatureProvider {
+
+    /** Returns the SyncAcrossDevicesFeatureUpdater of the Sync Across Devices feature */
+    @Nullable
+    SyncAcrossDevicesFeatureUpdater getSyncAcrossDevicesFeatureUpdater(
+            @NonNull Context context,
+            @NonNull SyncAcrossDevicesFeatureCallback featurePreferenceCallback);
+}

src/com/android/settings/notification/syncacrossdevices/SyncAcrossDevicesFeatureProviderImpl.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2024 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.notification.syncacrossdevices;
+
+import android.content.Context;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+
+/** Default implementation for {@link SyncAcrossDevicesFeatureProvider} */
+public class SyncAcrossDevicesFeatureProviderImpl implements SyncAcrossDevicesFeatureProvider {
+
+    @Override
+    @Nullable
+    public SyncAcrossDevicesFeatureUpdater getSyncAcrossDevicesFeatureUpdater(
+            @NonNull Context context,
+            @NonNull SyncAcrossDevicesFeatureCallback featurePreferenceCallback) {
+        return new SyncAcrossDevicesFeatureUpdater() {};
+    }
+}

src/com/android/settings/notification/syncacrossdevices/SyncAcrossDevicesFeatureUpdater.java

@@ -0,0 +1,34 @@
+/*
+ * Copyright (C) 2024 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.notification.syncacrossdevices;
+
+import android.content.Context;
+
+import androidx.annotation.Nullable;
+
+/**
+ * Updates the sync across devices feature state. It notifies the upper level whether to add/remove
+ * the preference through {@link SyncAcrossDevicesFeatureCallback}
+ */
+public interface SyncAcrossDevicesFeatureUpdater {
+
+    /** Forces to update the list of the Sync Across Devices feature. */
+    default void forceUpdate() {}
+
+    /** Sets the context to generate the {@link Preference}, so it could get the correct theme. */
+    default void setPreferenceContext(@Nullable Context preferenceContext) {}
+}

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

@@ -38,6 +38,7 @@ import com.android.settings.fuelgauge.PowerUsageFeatureProvider
 import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider
 import com.android.settings.inputmethod.KeyboardSettingsFeatureProvider
 import com.android.settings.localepicker.LocaleFeatureProvider
+import com.android.settings.notification.syncacrossdevices.SyncAcrossDevicesFeatureProvider
 import com.android.settings.onboarding.OnboardingFeatureProvider
 import com.android.settings.overlay.FeatureFactory.Companion.setFactory
 import com.android.settings.panel.PanelFeatureProvider
@@ -188,6 +189,11 @@ abstract class FeatureFactory {
      */
     abstract val audioSharingFeatureProvider: AudioSharingFeatureProvider
 
+    /**
+     * Gets implementation for sync across devices related feature.
+     */
+    abstract val syncAcrossDevicesFeatureProvider: SyncAcrossDevicesFeatureProvider
+
     companion object {
         private var _factory: FeatureFactory? = null
 

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

@@ -55,6 +55,8 @@ import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvid
 import com.android.settings.inputmethod.KeyboardSettingsFeatureProvider
 import com.android.settings.inputmethod.KeyboardSettingsFeatureProviderImpl
 import com.android.settings.localepicker.LocaleFeatureProviderImpl
+import com.android.settings.notification.syncacrossdevices.SyncAcrossDevicesFeatureProvider
+import com.android.settings.notification.syncacrossdevices.SyncAcrossDevicesFeatureProviderImpl
 import com.android.settings.panel.PanelFeatureProviderImpl
 import com.android.settings.search.SearchFeatureProvider
 import com.android.settings.search.SearchFeatureProviderImpl
@@ -197,4 +199,8 @@ open class FeatureFactoryImpl : FeatureFactory() {
     override val audioSharingFeatureProvider: AudioSharingFeatureProvider by lazy {
         AudioSharingFeatureProviderImpl()
     }
+
+    override val syncAcrossDevicesFeatureProvider: SyncAcrossDevicesFeatureProvider by lazy {
+        SyncAcrossDevicesFeatureProviderImpl()
+    }
 }

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

@@ -40,6 +40,7 @@ import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
 import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider;
 import com.android.settings.inputmethod.KeyboardSettingsFeatureProvider;
 import com.android.settings.localepicker.LocaleFeatureProvider;
+import com.android.settings.notification.syncacrossdevices.SyncAcrossDevicesFeatureProvider;
 import com.android.settings.onboarding.OnboardingFeatureProvider;
 import com.android.settings.overlay.DockUpdaterFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
@@ -103,6 +104,7 @@ public class FakeFeatureFactory extends FeatureFactory {
     public PrivateSpaceLoginFeatureProvider mPrivateSpaceLoginFeatureProvider;
     public DisplayFeatureProvider mDisplayFeatureProvider;
     public AudioSharingFeatureProvider mAudioSharingFeatureProvider;
+    public SyncAcrossDevicesFeatureProvider mSyncAcrossDevicesFeatureProvider;
 
     /**
      * Call this in {@code @Before} method of the test class to use fake factory.
@@ -150,9 +152,10 @@ public class FakeFeatureFactory extends FeatureFactory {
         mStylusFeatureProvider = mock(StylusFeatureProvider.class);
         mOnboardingFeatureProvider = mock(OnboardingFeatureProvider.class);
         mFastPairFeatureProvider = mock(FastPairFeatureProvider.class);
-        mPrivateSpaceLoginFeatureProvider =  mock(PrivateSpaceLoginFeatureProvider.class);
+        mPrivateSpaceLoginFeatureProvider = mock(PrivateSpaceLoginFeatureProvider.class);
         mDisplayFeatureProvider = mock(DisplayFeatureProvider.class);
         mAudioSharingFeatureProvider = mock(AudioSharingFeatureProvider.class);
+        mSyncAcrossDevicesFeatureProvider = mock(SyncAcrossDevicesFeatureProvider.class);
     }
 
     @Override
@@ -340,5 +343,10 @@ public class FakeFeatureFactory extends FeatureFactory {
     public AudioSharingFeatureProvider getAudioSharingFeatureProvider() {
         return mAudioSharingFeatureProvider;
     }
+
+    @Override
+    public SyncAcrossDevicesFeatureProvider getSyncAcrossDevicesFeatureProvider() {
+        return mSyncAcrossDevicesFeatureProvider;
+    }
 }
 

tests/spa_unit/src/com/android/settings/testutils/FakeFeatureFactory.kt

@@ -39,6 +39,7 @@ import com.android.settings.fuelgauge.PowerUsageFeatureProvider
 import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider
 import com.android.settings.inputmethod.KeyboardSettingsFeatureProvider
 import com.android.settings.localepicker.LocaleFeatureProvider
+import com.android.settings.notification.syncacrossdevices.SyncAcrossDevicesFeatureProvider
 import com.android.settings.overlay.DockUpdaterFeatureProvider
 import com.android.settings.overlay.FeatureFactory
 import com.android.settings.overlay.SurveyFeatureProvider
@@ -152,4 +153,6 @@ class FakeFeatureFactory : FeatureFactory() {
         get() = TODO("Not yet implemented")
     override val audioSharingFeatureProvider: AudioSharingFeatureProvider
         get() = TODO("Not yet implemented")
+    override val syncAcrossDevicesFeatureProvider: SyncAcrossDevicesFeatureProvider
+        get() = TODO("Not yet implemented")
 }

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

@@ -40,6 +40,7 @@ import com.android.settings.fuelgauge.PowerUsageFeatureProvider;
 import com.android.settings.homepage.contextualcards.ContextualCardFeatureProvider;
 import com.android.settings.inputmethod.KeyboardSettingsFeatureProvider;
 import com.android.settings.localepicker.LocaleFeatureProvider;
+import com.android.settings.notification.syncacrossdevices.SyncAcrossDevicesFeatureProvider;
 import com.android.settings.onboarding.OnboardingFeatureProvider;
 import com.android.settings.overlay.DockUpdaterFeatureProvider;
 import com.android.settings.overlay.FeatureFactory;
@@ -102,6 +103,7 @@ public class FakeFeatureFactory extends FeatureFactory {
     public PrivateSpaceLoginFeatureProvider mPrivateSpaceLoginFeatureProvider;
     public DisplayFeatureProvider mDisplayFeatureProvider;
     public AudioSharingFeatureProvider mAudioSharingFeatureProvider;
+    public SyncAcrossDevicesFeatureProvider mSyncAcrossDevicesFeatureProvider;
 
     /** Call this in {@code @Before} method of the test class to use fake factory. */
     public static FakeFeatureFactory setupForTest() {
@@ -154,6 +156,7 @@ public class FakeFeatureFactory extends FeatureFactory {
         mPrivateSpaceLoginFeatureProvider = mock(PrivateSpaceLoginFeatureProvider.class);
         mDisplayFeatureProvider = mock(DisplayFeatureProvider.class);
         mAudioSharingFeatureProvider = mock(AudioSharingFeatureProvider.class);
+        mSyncAcrossDevicesFeatureProvider = mock(SyncAcrossDevicesFeatureProvider.class);
     }
 
     @Override
@@ -341,4 +344,9 @@ public class FakeFeatureFactory extends FeatureFactory {
     public AudioSharingFeatureProvider getAudioSharingFeatureProvider() {
         return mAudioSharingFeatureProvider;
     }
+
+    @Override
+    public SyncAcrossDevicesFeatureProvider getSyncAcrossDevicesFeatureProvider() {
+        return mSyncAcrossDevicesFeatureProvider;
+    }
 }