PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Add FeatureProvider for SyncAcrossDevices Settings integ..."" into main

Browse Source
This commit is contained in:
Pechetty Sravani
2024-04-23 09:12:48 +00:00
committed by Android (Google) Code Review
parent 174acf5c67 ea26f2d729
commit dbb7d1772b
9 changed files with 1 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
src/com/android/settings/notification/syncacrossdevices/SyncAcrossDevicesFeatureCallback.java
View File

@@ -1,38 +0,0 @@
/*
* 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);
}

32
src/com/android/settings/notification/syncacrossdevices/SyncAcrossDevicesFeatureProvider.java
View File

@@ -1,32 +0,0 @@
/*
* 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);
}

34
src/com/android/settings/notification/syncacrossdevices/SyncAcrossDevicesFeatureProviderImpl.java
View File

@@ -1,34 +0,0 @@
/*
* 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() {};
}
}

34
src/com/android/settings/notification/syncacrossdevices/SyncAcrossDevicesFeatureUpdater.java
View File

@@ -1,34 +0,0 @@
/*
* 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) {}
}

6
src/com/android/settings/overlay/FeatureFactory.kt
View File

@@ -38,7 +38,6 @@ 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
@@ -189,11 +188,6 @@ 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

6
src/com/android/settings/overlay/FeatureFactoryImpl.kt
View File

@@ -55,8 +55,6 @@ 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
@@ -199,8 +197,4 @@ open class FeatureFactoryImpl : FeatureFactory() {
override val audioSharingFeatureProvider: AudioSharingFeatureProvider by lazy {
AudioSharingFeatureProviderImpl()
}
override val syncAcrossDevicesFeatureProvider: SyncAcrossDevicesFeatureProvider by lazy {
SyncAcrossDevicesFeatureProviderImpl()
}
}