Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 57d82fc8 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "refactor: migrate LaunchAccessibilityActivityPreferenceFragment to... 

Merge "refactor: migrate LaunchAccessibilityActivityPreferenceFragment to xml/PreferenceControllers style" into main
parents f8e9a5bc 4b80c191

src/com/android/settings/accessibility/BaseRestrictedSupportFragment.java

+1 −2
Original line number Diff line number Diff line
@@ -19,7 +19,6 @@ package com.android.settings.accessibility; 
import android.app.settings.SettingsEnums;

import android.os.Bundle;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.settings.accessibility.actionbar.FeedbackMenuController;
@@ -38,7 +37,7 @@ public abstract class BaseRestrictedSupportFragment extends RestrictedDashboardF 
    }



    @Override

    public void onCreate(@NonNull Bundle savedInstanceState) {

    public void onCreate(@Nullable Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        int feedbackCategory = getFeedbackCategory();

        if (feedbackCategory != SettingsEnums.PAGE_UNKNOWN) {

src/com/android/settings/accessibility/BaseSupportFragment.java

+2 −1
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.os.Bundle; 
import android.text.TextUtils;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;



import com.android.server.accessibility.Flags;

import com.android.settings.accessibility.actionbar.FeedbackMenuController;
@@ -43,7 +44,7 @@ import com.android.settings.overlay.SurveyFeatureProvider; 
public abstract class BaseSupportFragment extends DashboardFragment {



    @Override

    public void onCreate(@NonNull Bundle savedInstanceState) {

    public void onCreate(@Nullable Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        handleFeedbackFlow();

src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragment.java

+66 −165
Original line number Diff line number Diff line
@@ -16,208 +16,109 @@ 


package com.android.settings.accessibility;



import static com.android.settings.accessibility.AccessibilityStatsLogUtils.logAccessibilityServiceEnabled;

import static com.android.settingslib.widget.ButtonPreference.SIZE_EXTRA_LARGE;

import static com.android.settingslib.widget.ButtonPreference.TYPE_TONAL;



import android.accessibilityservice.AccessibilityShortcutInfo;

import android.app.ActivityOptions;

import android.content.ActivityNotFoundException;

import android.content.ComponentName;

import android.content.ContentResolver;

import android.content.Intent;

import android.content.pm.ActivityInfo;

import android.net.Uri;

import android.content.Context;

import android.os.Bundle;

import android.os.UserHandle;

import android.text.TextUtils;

import android.util.Log;

import android.view.LayoutInflater;

import android.view.View;

import android.view.ViewGroup;

import android.view.accessibility.AccessibilityManager;



import androidx.annotation.NonNull;

import androidx.annotation.Nullable;

import androidx.preference.Preference;



import com.android.settings.R;

import com.android.settingslib.widget.ButtonPreference;

import com.android.settingslib.widget.SettingsThemeHelper;



import java.util.ArrayList;

import java.util.List;

import com.android.settings.accessibility.data.AccessibilityRepositoryProvider;

import com.android.settings.accessibility.detail.a11yactivity.AccessibilityActivityFooterPreferenceController;

import com.android.settings.accessibility.detail.a11yactivity.AccessibilityActivityHtmlFooterPreferenceController;

import com.android.settings.accessibility.detail.a11yactivity.AccessibilityActivityIllustrationPreferenceController;

import com.android.settings.accessibility.detail.a11yactivity.LaunchAccessibilityActivityPreferenceController;

import com.android.settings.accessibility.detail.a11yactivity.SettingsPreferenceController;

import com.android.settings.accessibility.detail.a11yactivity.ShortcutPreferenceController;

import com.android.settings.accessibility.detail.a11yactivity.TopIntroPreferenceController;

import com.android.settings.accessibility.shared.LaunchAppInfoPreferenceController;

import com.android.settings.overlay.FeatureFactory;



/** Fragment for providing open activity button. */

public class LaunchAccessibilityActivityPreferenceFragment extends ToggleFeaturePreferenceFragment {

public class LaunchAccessibilityActivityPreferenceFragment extends ShortcutFragment {



    private static final String TAG = "LaunchAccessibilityActivityPreferenceFragment";

    private static final String EMPTY_STRING = "";

    protected static final String KEY_LAUNCH_PREFERENCE = "launch_preference";



    private ComponentName mTileComponentName;

    @Nullable

    private AccessibilityShortcutInfo mAccessibilityShortcutInfo;



    @Override

    public int getMetricsCategory() {

        return getArguments().getInt(AccessibilitySettings.EXTRA_METRICS_CATEGORY);

    public void onAttach(@NonNull Context context) {

        super.onAttach(context);

        ComponentName componentName = getFeatureComponentName();

        mAccessibilityShortcutInfo = AccessibilityRepositoryProvider.get(

                context).getAccessibilityShortcutInfo(componentName);

        if (mAccessibilityShortcutInfo != null) {

            initializePreferenceControllers(mAccessibilityShortcutInfo);

        }



    @Override

    public int getFeedbackCategory() {

        return getArguments().getInt(AccessibilitySettings.EXTRA_FEEDBACK_CATEGORY);

    }



    @Override

    public View onCreateView(LayoutInflater inflater, ViewGroup container,

            Bundle savedInstanceState) {

        // Init new preference to replace the switch preference instead.

        initLaunchPreference();



        final View view = super.onCreateView(inflater, container, savedInstanceState);

        removePreference(getUseServicePreferenceKey());

        return view;

    }



    public void onCreate(@Nullable Bundle savedInstanceState) {

        super.onCreate(savedInstanceState);

        getActivity().setTitle(getFeatureName());

    }



    private void initializePreferenceControllers(

            @NonNull AccessibilityShortcutInfo accessibilityShortcutInfo) {

        use(TopIntroPreferenceController.class).initialize(accessibilityShortcutInfo);

        use(AccessibilityActivityIllustrationPreferenceController.class).initialize(

                accessibilityShortcutInfo);

        use(LaunchAccessibilityActivityPreferenceController.class).initialize(

                accessibilityShortcutInfo);

        use(ShortcutPreferenceController.class).initialize(accessibilityShortcutInfo);

        use(SettingsPreferenceController.class).initialize(accessibilityShortcutInfo);

        use(LaunchAppInfoPreferenceController.class).initialize(

                accessibilityShortcutInfo.getComponentName());

        use(AccessibilityActivityHtmlFooterPreferenceController.class).initialize(

                accessibilityShortcutInfo);

        use(AccessibilityActivityFooterPreferenceController.class).initialize(

                accessibilityShortcutInfo);

    }



    @NonNull

    @Override

    protected void onProcessArguments(Bundle arguments) {

        super.onProcessArguments(arguments);

        mComponentName = arguments.getParcelable(AccessibilitySettings.EXTRA_COMPONENT_NAME);

        final ActivityInfo info = getAccessibilityShortcutInfo().getActivityInfo();

        mFeatureName = info.loadLabel(getPackageManager());



        // Settings animated image.

        final int animatedImageRes = arguments.getInt(

                AccessibilitySettings.EXTRA_ANIMATED_IMAGE_RES);

        if (animatedImageRes > 0) {

            mImageUri = new Uri.Builder().scheme(ContentResolver.SCHEME_ANDROID_RESOURCE)

                    .authority(mComponentName.getPackageName())

                    .appendPath(String.valueOf(animatedImageRes))

                    .build();

        }



        // Settings html description.

        mHtmlDescription = arguments.getCharSequence(AccessibilitySettings.EXTRA_HTML_DESCRIPTION);



        // Settings title and intent.

        final String settingsTitle = arguments.getString(

                AccessibilitySettings.EXTRA_SETTINGS_TITLE);

        mSettingsIntent = TextUtils.isEmpty(settingsTitle) ? null : getSettingsIntent(arguments);

        mSettingsTitle = (mSettingsIntent == null) ? null : settingsTitle;



        // Tile service.

        if (arguments.containsKey(AccessibilitySettings.EXTRA_TILE_SERVICE_COMPONENT_NAME)) {

            final String tileServiceComponentName = arguments.getString(

                    AccessibilitySettings.EXTRA_TILE_SERVICE_COMPONENT_NAME);

            mTileComponentName = ComponentName.unflattenFromString(tileServiceComponentName);

        }

    public ToggleShortcutPreferenceController getShortcutPreferenceController() {

        return use(ShortcutPreferenceController.class);

    }



    @Override

    int getUserShortcutTypes() {

        return AccessibilityUtil.getUserShortcutTypesFromSettings(getPrefContext(),

                mComponentName);

    public int getMetricsCategory() {

        return FeatureFactory.getFeatureFactory()

                .getAccessibilityPageIdFeatureProvider().getCategory(getFeatureComponentName());

    }



    @Override

    ComponentName getTileComponentName() {

        return mTileComponentName;

    }



    // IMPORTANT: Refresh the info since there are dynamically changing capabilities.

    private AccessibilityShortcutInfo getAccessibilityShortcutInfo() {

        final List<AccessibilityShortcutInfo> infos = AccessibilityManager.getInstance(

                getPrefContext()).getInstalledAccessibilityShortcutListAsUser(getPrefContext(),

                UserHandle.myUserId());



        for (int i = 0, count = infos.size(); i < count; i++) {

            AccessibilityShortcutInfo shortcutInfo = infos.get(i);

            ActivityInfo activityInfo = shortcutInfo.getActivityInfo();

            if (mComponentName.getPackageName().equals(activityInfo.packageName)

                    && mComponentName.getClassName().equals(activityInfo.name)) {

                return shortcutInfo;

            }

        }

        return null;

    }



    /** Customizes the order by preference key. */

    protected List<String> getPreferenceOrderList() {

        final List<String> lists = new ArrayList<>();

        lists.add(KEY_TOP_INTRO_PREFERENCE);

        lists.add(KEY_ANIMATED_IMAGE);

        lists.add(KEY_LAUNCH_PREFERENCE);

        lists.add(KEY_GENERAL_CATEGORY);

        lists.add(KEY_HTML_DESCRIPTION_PREFERENCE);

        return lists;

    }



    private void initLaunchPreference() {

        final Preference launchPreference;

        if (SettingsThemeHelper.isExpressiveTheme(getPrefContext())) {

            launchPreference = new ButtonPreference(getPrefContext());

            ((ButtonPreference) launchPreference).setButtonStyle(TYPE_TONAL, SIZE_EXTRA_LARGE);

            ((ButtonPreference) launchPreference).setOnClickListener(view -> {

                logAccessibilityServiceEnabled(mComponentName, /* enabled= */ true);

                launchShortcutTargetActivity(getPrefContext().getDisplayId(), mComponentName);

            });

        } else {

            launchPreference = new Preference(getPrefContext());

            launchPreference.setLayoutResource(R.layout.accessibility_launch_activity_preference);

            launchPreference.setOnPreferenceClickListener(preference -> {

                logAccessibilityServiceEnabled(mComponentName, /* enabled= */ true);

                launchShortcutTargetActivity(getPrefContext().getDisplayId(), mComponentName);

                return true;

            });

        }

        launchPreference.setKey(KEY_LAUNCH_PREFERENCE);



        final AccessibilityShortcutInfo info = getAccessibilityShortcutInfo();

        final String switchBarText = (info == null) ? EMPTY_STRING : getString(

                R.string.accessibility_service_primary_open_title,

                info.getActivityInfo().loadLabel(getPackageManager()));

        launchPreference.setTitle(switchBarText);

        getPreferenceScreen().addPreference(launchPreference);

    }



    private void launchShortcutTargetActivity(int displayId, ComponentName name) {

        final Intent intent = new Intent();

        final Bundle bundle = ActivityOptions.makeBasic().setLaunchDisplayId(displayId).toBundle();



        intent.setComponent(name);

        intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);

        try {

            final int userId = UserHandle.myUserId();

            getPrefContext().startActivityAsUser(intent, bundle, UserHandle.of(userId));

        } catch (ActivityNotFoundException ignore) {

            // ignore the exception

            Log.w(TAG, "Target activity not found.");

        }

    public int getFeedbackCategory() {

        return getMetricsCategory();

    }



    @Nullable

    private Intent getSettingsIntent(Bundle arguments) {

        final String settingsComponentName = arguments.getString(

                AccessibilitySettings.EXTRA_SETTINGS_COMPONENT_NAME);

        if (TextUtils.isEmpty(settingsComponentName)) {

            return null;

    @Override

    protected int getPreferenceScreenResId() {

        return R.xml.accessibility_activity_detail_screen;

    }



        final Intent settingsIntent = new Intent(Intent.ACTION_MAIN).setComponent(

                ComponentName.unflattenFromString(settingsComponentName));

        if (getPackageManager().queryIntentActivities(settingsIntent, /* flags= */ 0).isEmpty()) {

            return null;

    @Override

    protected String getLogTag() {

        return TAG;

    }



        return settingsIntent;

    @NonNull

    @Override

    public CharSequence getFeatureName() {

        if (mAccessibilityShortcutInfo == null

                || mAccessibilityShortcutInfo.getActivityInfo() == null) {

            return "";

        }



    @Override

    protected int getPreferenceScreenResId() {

        // TODO(b/171272809): Add back when controllers move to static type

        return 0;

        return mAccessibilityShortcutInfo.getActivityInfo().loadLabel(getPackageManager());

    }



    @NonNull

    @Override

    protected String getLogTag() {

        return TAG;

    public ComponentName getFeatureComponentName() {

        return getArguments().getParcelable(

                AccessibilitySettings.EXTRA_COMPONENT_NAME, ComponentName.class);

    }

}
 
 No newline at end of file

src/com/android/settings/accessibility/ShortcutFragment.kt

+14 −0
Original line number Diff line number Diff line
@@ -18,7 +18,11 @@ package com.android.settings.accessibility 


import android.content.ComponentName

import android.content.Context

import android.os.Bundle

import android.view.LayoutInflater

import android.view.ViewGroup

import androidx.preference.Preference

import androidx.recyclerview.widget.RecyclerView

import com.android.settings.accessibility.shortcuts.EditShortcutsPreferenceFragment

import com.google.android.setupcompat.util.WizardManagerHelper
@@ -69,4 +73,14 @@ abstract class ShortcutFragment(restrictionKey: String? = null) : 
        super.onAttach(context)

        getShortcutPreferenceController().initialize(getFeatureComponentName())

    }



    override fun onCreateRecyclerView(

        inflater: LayoutInflater,

        parent: ViewGroup,

        savedInstanceState: Bundle?

    ): RecyclerView {

        val recyclerView =

            super.onCreateRecyclerView(inflater, parent, savedInstanceState)

        return AccessibilityFragmentUtils.addCollectionInfoToAccessibilityDelegate(recyclerView)

    }

}

tests/robotests/src/com/android/settings/accessibility/LaunchAccessibilityActivityPreferenceFragmentTest.java

deleted100644 → 0
+0 −111
Original line number Diff line number Diff line 
/*

 * Copyright (C) 2022 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.accessibility;



import static org.mockito.Mockito.doReturn;

import static org.mockito.Mockito.spy;

import static org.mockito.Mockito.when;



import android.content.ComponentName;

import android.content.Context;

import android.content.Intent;

import android.content.pm.PackageManager;

import android.content.pm.ResolveInfo;

import android.content.pm.ServiceInfo;

import android.service.quicksettings.TileService;



import androidx.preference.PreferenceManager;

import androidx.preference.PreferenceScreen;

import androidx.test.core.app.ApplicationProvider;



import org.junit.Before;

import org.junit.runner.RunWith;

import org.mockito.Answers;

import org.mockito.Mock;

import org.mockito.MockitoAnnotations;

import org.robolectric.RobolectricTestRunner;

import org.robolectric.Shadows;

import org.robolectric.shadows.ShadowPackageManager;



/** Tests for {@link LaunchAccessibilityActivityPreferenceFragment} */

@RunWith(RobolectricTestRunner.class)

public class LaunchAccessibilityActivityPreferenceFragmentTest {



    private static final String PLACEHOLDER_PACKAGE_NAME = "com.placeholder.example";

    private static final String PLACEHOLDER_TILE_CLASS_NAME =

            PLACEHOLDER_PACKAGE_NAME + "tile.placeholder";

    private static final String PLACEHOLDER_TILE_CLASS_NAME2 =

            PLACEHOLDER_PACKAGE_NAME + "tile.placeholder2";

    private static final ComponentName PLACEHOLDER_TILE_COMPONENT_NAME = new ComponentName(

            PLACEHOLDER_PACKAGE_NAME, PLACEHOLDER_TILE_CLASS_NAME);

    private static final String PLACEHOLDER_TILE_NAME =

            PLACEHOLDER_PACKAGE_NAME + "tile.placeholder";

    private static final String PLACEHOLDER_TILE_NAME2 =

            PLACEHOLDER_PACKAGE_NAME + "tile.placeholder2";



    private TestLaunchAccessibilityActivityPreferenceFragment mFragment;

    private PreferenceScreen mScreen;

    private Context mContext = ApplicationProvider.getApplicationContext();



    @Mock(answer = Answers.RETURNS_DEEP_STUBS)

    private PreferenceManager mPreferenceManager;



    @Before

    public void setUpTestFragment() {

        MockitoAnnotations.initMocks(this);



        mFragment = spy(new TestLaunchAccessibilityActivityPreferenceFragment());

        when(mFragment.getPreferenceManager()).thenReturn(mPreferenceManager);

        when(mFragment.getPreferenceManager().getContext()).thenReturn(mContext);

        when(mFragment.getContext()).thenReturn(mContext);

        mScreen = spy(new PreferenceScreen(mContext, /* attrs= */ null));

        when(mScreen.getPreferenceManager()).thenReturn(mPreferenceManager);

        doReturn(mScreen).when(mFragment).getPreferenceScreen();

    }



    private void setupTileService(String packageName, String name, String tileName) {

        final Intent tileProbe = new Intent(TileService.ACTION_QS_TILE);

        final ResolveInfo info = new ResolveInfo();

        info.serviceInfo = new FakeServiceInfo(packageName, name, tileName);

        final ShadowPackageManager shadowPackageManager =

                Shadows.shadowOf(mContext.getPackageManager());

        shadowPackageManager.addResolveInfoForIntent(tileProbe, info);

    }



    private static class FakeServiceInfo extends ServiceInfo {

        private String mTileName;



        FakeServiceInfo(String packageName, String name, String tileName) {

            this.packageName = packageName;

            this.name = name;

            mTileName = tileName;

        }



        public String loadLabel(PackageManager mgr) {

            return mTileName;

        }

    }



    private static class TestLaunchAccessibilityActivityPreferenceFragment

            extends LaunchAccessibilityActivityPreferenceFragment {



        @Override

        protected ComponentName getTileComponentName() {

            return PLACEHOLDER_TILE_COMPONENT_NAME;

        }

    }

}