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

Commit 24ca4545 authored by Kenny Root's avatar Kenny Root
Browse files

Check for spanned before computing tab stops 

Don't try to check for tab stop spans in non-Spanned text input.

Change-Id: I54d69c8e0246f5a38d0713a89b8b455a478285f0
parent 8d111038

core/java/android/text/StaticLayout.java

+7 −5
Original line number Diff line number Diff line
@@ -265,6 +265,7 @@ extends Layout 
                        if (hasTab == false) {

                            hasTab = true;

                            hasTabOrEmoji = true;

                            if (spanned != null) {

                                // First tab this para, check for tabstops

                                TabStopSpan[] spans = spanned.getSpans(paraStart,

                                        paraEnd, TabStopSpan.class);
@@ -272,6 +273,7 @@ extends Layout 
                                    tabStops = new TabStops(TAB_INCREMENT, spans);

                                }

                            }

                        }

                        if (tabStops != null) {

                            w = tabStops.nextTab(w);

                        } else {