Merge "Run hearing devices survey for qualified users" into main

This commit is contained in:
Angela Wang
2023-08-24 06:48:37 +00:00
committed by Android (Google) Code Review

View File

@@ -15,8 +15,6 @@
*/ */
package com.android.settings.connecteddevice; package com.android.settings.connecteddevice;
import static com.android.settings.Utils.SETTINGS_PACKAGE_NAME;
import android.app.settings.SettingsEnums; import android.app.settings.SettingsEnums;
import android.content.Context; import android.content.Context;
import android.net.Uri; import android.net.Uri;
@@ -31,8 +29,11 @@ import com.android.settings.SettingsActivity;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.core.SettingsUIDeviceConfig; import com.android.settings.core.SettingsUIDeviceConfig;
import com.android.settings.dashboard.DashboardFragment; import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.overlay.SurveyFeatureProvider;
import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.BaseSearchIndexProvider;
import com.android.settings.slices.SlicePreferenceController; import com.android.settings.slices.SlicePreferenceController;
import com.android.settingslib.bluetooth.HearingAidStatsLogUtils;
import com.android.settingslib.search.SearchIndexable; import com.android.settingslib.search.SearchIndexable;
@SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC) @SearchIndexable(forTarget = SearchIndexable.ALL & ~SearchIndexable.ARC)
@@ -87,6 +88,16 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
: null); : null);
use(DiscoverableFooterPreferenceController.class) use(DiscoverableFooterPreferenceController.class)
.setAlwaysDiscoverable(isAlwaysDiscoverable(callingAppPackageName, action)); .setAlwaysDiscoverable(isAlwaysDiscoverable(callingAppPackageName, action));
// Show hearing devices survey if user is categorized as one of interested category
final String category = HearingAidStatsLogUtils.getUserCategory(context);
if (category != null && !category.isEmpty()) {
SurveyFeatureProvider provider =
FeatureFactory.getFeatureFactory().getSurveyFeatureProvider(context);
if (provider != null) {
provider.sendActivityIfAvailable(category);
}
}
} }
@VisibleForTesting @VisibleForTesting