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

Commit 09f6086b authored by Menghan Li's avatar Menghan Li Committed by Android (Google) Code Review
Browse files

Merge "[FAB] Improve the shortcut dialog ux after change accessibility button mode" into sc-dev

parents 913dd4c8 54ded4cb
Loading
Loading
Loading
Loading
+9 −3
Original line number Diff line number Diff line
@@ -26,6 +26,7 @@ import android.content.res.TypedArray;
import android.graphics.drawable.Drawable;
import android.text.Spannable;
import android.text.SpannableString;
import android.text.SpannableStringBuilder;
import android.text.TextUtils;
import android.text.method.LinkMovementMethod;
import android.text.style.ImageSpan;
@@ -320,8 +321,13 @@ public class AccessibilityEditDialogUtils {
    }

    private static CharSequence retrieveSummary(Context context, int lineHeight) {
        return AccessibilityUtil.isFloatingMenuEnabled(context)
                ? getSummaryStringWithLink(context) : getSummaryStringWithIcon(context, lineHeight);
        final SpannableStringBuilder sb = new SpannableStringBuilder();
        if (!AccessibilityUtil.isFloatingMenuEnabled(context)) {
            sb.append(getSummaryStringWithIcon(context, lineHeight));
            sb.append("\n\n");
        }
        sb.append(getCustomizeAccessibilityButtonLink(context));
        return sb;
    }

    private static int retrieveSoftwareShortcutImageResId(Context context) {
@@ -330,7 +336,7 @@ public class AccessibilityEditDialogUtils {
                : R.drawable.accessibility_shortcut_type_software;
    }

    private static CharSequence getSummaryStringWithLink(Context context) {
    private static CharSequence getCustomizeAccessibilityButtonLink(Context context) {
        final View.OnClickListener linkListener = v -> new SubSettingLauncher(context)
                .setDestination(AccessibilityButtonFragment.class.getName())
                .setSourceMetricsCategory(