Merge "Support ability to add different page id for different accessibility service page in settings." into sc-v2-dev am: 768722fed4 am: da247a3042

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15824482

Change-Id: I58f6e45441389cd1d54d5399aa48c219d4a81ed4
This commit is contained in:
Jason Hsu
2021-09-23 07:26:46 +00:00
committed by Automerger Merge Worker
8 changed files with 132 additions and 9 deletions

View File

@@ -55,6 +55,7 @@ import androidx.annotation.Nullable;
import com.android.internal.widget.LockPatternUtils;
import com.android.settings.R;
import com.android.settings.accessibility.AccessibilityUtil.UserShortcutType;
import com.android.settings.overlay.FeatureFactory;
import com.android.settings.password.ConfirmDeviceCredentialActivity;
import com.android.settingslib.accessibility.AccessibilityUtils;
@@ -88,7 +89,15 @@ public class ToggleAccessibilityServicePreferenceFragment extends
@Override
public int getMetricsCategory() {
return SettingsEnums.ACCESSIBILITY_SERVICE;
// Retrieve from getArguments() directly because this function will be executed from
// onAttach(), but variable mComponentName only available after onProcessArguments()
// which comes from onCreateView().
final ComponentName componentName = getArguments().getParcelable(
AccessibilitySettings.EXTRA_COMPONENT_NAME);
return FeatureFactory.getFactory(getActivity().getApplicationContext())
.getAccessibilityMetricsFeatureProvider()
.getDownloadedFeatureMetricsCategory(componentName);
}
@Override