Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Visibility fixes for text related tests."

Browse Source
This commit is contained in:
Siyamed Sinir
2016-06-30 17:54:56 +00:00
committed by Android (Google) Code Review
parent f3826e4296 ed09ae1fcc
commit fcef4a3b62
5 changed files with 36 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/android/text/AndroidBidi.java
View File

@@ -18,11 +18,14 @@ package android.text;
import android.text.Layout.Directions;
import com.android.internal.annotations.VisibleForTesting;
/**
* Access the ICU bidi implementation.
* @hide
*/
/* package */ class AndroidBidi {
@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
public class AndroidBidi {
public static int bidi(int dir, char[] chs, byte[] chInfo, int n, boolean haveInfo) {
if (chs == null || chInfo == null) {

7
core/java/android/text/DynamicLayout.java
View File

@@ -20,6 +20,7 @@ import android.graphics.Paint;
import android.text.style.UpdateLayout;
import android.text.style.WrapTogetherSpan;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.ArrayUtils;
import com.android.internal.util.GrowingArrayUtils;
@@ -449,7 +450,8 @@ public class DynamicLayout extends Layout
*
* @hide
*/
void updateBlocks(int startLine, int endLine, int newLineCount) {
@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
public void updateBlocks(int startLine, int endLine, int newLineCount) {
if (mBlockEndLines == null) {
createBlocks();
return;
@@ -549,7 +551,8 @@ public class DynamicLayout extends Layout
* This package private method is used for test purposes only
* @hide
*/
void setBlocksDataForTest(int[] blockEndLines, int[] blockIndices, int numberOfBlocks) {
@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
public void setBlocksDataForTest(int[] blockEndLines, int[] blockIndices, int numberOfBlocks) {
mBlockEndLines = new int[blockEndLines.length];
mBlockIndices = new int[blockIndices.length];
System.arraycopy(blockEndLines, 0, mBlockEndLines, 0, blockEndLines.length);

23
core/java/android/text/Layout.java
View File

@@ -30,6 +30,7 @@ import android.text.style.ParagraphStyle;
import android.text.style.ReplacementSpan;
import android.text.style.TabStopSpan;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.ArrayUtils;
import com.android.internal.util.GrowingArrayUtils;
@@ -1943,8 +1944,17 @@ public abstract class Layout {
// To simply test for an RTL direction, test the bit using
// DIR_RTL_FLAG, if set then the direction is rtl.
/* package */ int[] mDirections;
/* package */ Directions(int[] dirs) {
/**
* @hide
*/
@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
public int[] mDirections;
/**
* @hide
*/
@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
public Directions(int[] dirs) {
mDirections = dirs;
}
}
@@ -2087,9 +2097,14 @@ public abstract class Layout {
private static final int TAB_INCREMENT = 20;
/* package */ static final Directions DIRS_ALL_LEFT_TO_RIGHT =
/** @hide */
@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
public static final Directions DIRS_ALL_LEFT_TO_RIGHT =
new Directions(new int[] { 0, RUN_LENGTH_MASK });
/* package */ static final Directions DIRS_ALL_RIGHT_TO_LEFT =
/** @hide */
@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
public static final Directions DIRS_ALL_RIGHT_TO_LEFT =
new Directions(new int[] { 0, RUN_LENGTH_MASK | RUN_RTL_FLAG });
}

6
core/java/android/text/PackedIntVector.java
View File

@@ -16,6 +16,7 @@
package android.text;
import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.util.ArrayUtils;
import com.android.internal.util.GrowingArrayUtils;
@@ -24,8 +25,11 @@ import com.android.internal.util.GrowingArrayUtils;
* PackedIntVector stores a two-dimensional array of integers,
* optimized for inserting and deleting rows and for
* offsetting the values in segments of a given column.
*
* @hide
*/
class PackedIntVector {
@VisibleForTesting(visibility = VisibleForTesting.Visibility.PACKAGE)
public class PackedIntVector {
private final int mColumns;
private int mRows;