Reland add FeatureProvider for SyncAcrossDevices Settings integration.
Prior CL ag/26930404 was reverted because an unused class was trimmed in AOSP, causing test cases to throw NoClassDefFoundError exceptions. This CL combines ag/26930404 and ag/26995936 to address the failure. Bug: 330498032 Test: atest FakeFeatureFactory, atest SyncAcrossDevicesPreferenceControllerTest Change-Id: I0a7ebccdebcad20e06d7542d7c4a0005885f393b
This commit is contained in:
@@ -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);
|
||||
}
|
||||
@@ -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);
|
||||
}
|
||||
@@ -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() {};
|
||||
}
|
||||
}
|
||||
@@ -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) {}
|
||||
}
|
||||
@@ -0,0 +1,100 @@
|
||||
/*
|
||||
* 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 android.util.Log;
|
||||
|
||||
import androidx.annotation.NonNull;
|
||||
import androidx.annotation.Nullable;
|
||||
import androidx.annotation.VisibleForTesting;
|
||||
import androidx.preference.Preference;
|
||||
import androidx.preference.PreferenceGroup;
|
||||
import androidx.preference.PreferenceScreen;
|
||||
|
||||
import com.android.settings.core.BasePreferenceController;
|
||||
import com.android.settings.core.PreferenceControllerMixin;
|
||||
import com.android.settings.overlay.FeatureFactory;
|
||||
|
||||
public class SyncAcrossDevicesPreferenceController extends BasePreferenceController
|
||||
implements PreferenceControllerMixin, SyncAcrossDevicesFeatureCallback {
|
||||
|
||||
private static final String TAG = "SyncXDevicesPrefCtr";
|
||||
|
||||
private static final boolean DEBUG = Log.isLoggable(TAG, Log.DEBUG);
|
||||
|
||||
private PreferenceGroup mPreferenceGroup;
|
||||
private SyncAcrossDevicesFeatureUpdater mSyncAcrossDevicesFeatureUpdater;
|
||||
|
||||
public SyncAcrossDevicesPreferenceController(@NonNull Context context, @NonNull String key) {
|
||||
super(context, key);
|
||||
SyncAcrossDevicesFeatureProvider syncAcrossDevicesFeatureProvider =
|
||||
FeatureFactory.getFeatureFactory().getSyncAcrossDevicesFeatureProvider();
|
||||
mSyncAcrossDevicesFeatureUpdater =
|
||||
syncAcrossDevicesFeatureProvider.getSyncAcrossDevicesFeatureUpdater(context, this);
|
||||
}
|
||||
|
||||
@Override
|
||||
public void displayPreference(@NonNull PreferenceScreen screen) {
|
||||
super.displayPreference(screen);
|
||||
mPreferenceGroup = screen.findPreference(getPreferenceKey());
|
||||
mPreferenceGroup.setVisible(false);
|
||||
if (isAvailable()) {
|
||||
final Context context = screen.getContext();
|
||||
mSyncAcrossDevicesFeatureUpdater.setPreferenceContext(context);
|
||||
mSyncAcrossDevicesFeatureUpdater.forceUpdate();
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public int getAvailabilityStatus() {
|
||||
return mSyncAcrossDevicesFeatureUpdater != null ? AVAILABLE : UNSUPPORTED_ON_DEVICE;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFeatureAdded(@Nullable Preference preference) {
|
||||
if (preference == null) {
|
||||
if (DEBUG) {
|
||||
Log.d(TAG, "onFeatureAdded receives null preference. Ignore.");
|
||||
}
|
||||
return;
|
||||
}
|
||||
mPreferenceGroup.addPreference(preference);
|
||||
updatePreferenceVisibility();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onFeatureRemoved(@Nullable Preference preference) {
|
||||
if (preference == null) {
|
||||
if (DEBUG) {
|
||||
Log.d(TAG, "onFeatureRemoved receives null preference. Ignore.");
|
||||
}
|
||||
return;
|
||||
}
|
||||
mPreferenceGroup.removePreference(preference);
|
||||
updatePreferenceVisibility();
|
||||
}
|
||||
|
||||
private void updatePreferenceVisibility() {
|
||||
mPreferenceGroup.setVisible(mPreferenceGroup.getPreferenceCount() > 0);
|
||||
}
|
||||
|
||||
@VisibleForTesting
|
||||
public void setPreferenceGroup(@NonNull PreferenceGroup preferenceGroup) {
|
||||
mPreferenceGroup = preferenceGroup;
|
||||
}
|
||||
}
|
||||
@@ -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
|
||||
|
||||
|
||||
@@ -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()
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user