Merge "Some code refactoring" (9703ac8e) · Commits · e / os / android_frameworks_base

core/java/android/widget/TextView.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -6586,11 +6586,11 @@ public class TextView extends View implements ViewTreeObserver.OnPreDrawListener
		scrollx = left;
		}
		}
		} else if (a == Layout.Alignment.ALIGN_LEFT) {
		scrollx = (int) FloatMath.floor(mLayout.getLineLeft(line));
		} else { // a == Layout.Alignment.ALIGN_RIGHT
		} else if (a == Layout.Alignment.ALIGN_RIGHT) {
		int right = (int) FloatMath.ceil(mLayout.getLineRight(line));
		scrollx = right - hspace;
		} else { // a == Layout.Alignment.ALIGN_LEFT (will also be the default)
		scrollx = (int) FloatMath.floor(mLayout.getLineLeft(line));
		}

		if (ht < vspace) {

+29 −1

Original line number	Diff line number	Diff line
		@@ -51,4 +51,32 @@

		</LinearLayout>

		<LinearLayout
		android:layout_width="600dip"
		android:layout_height="128dip"
		android:layout_gravity="center_vertical"
		android:orientation="horizontal"
		style="@android:style/Widget.Holo.Spinner"
		>
		<LinearLayout
		android:layout_width="0dip"
		android:layout_weight="1"
		android:layout_height="match_parent"
		android:layout_gravity="center_vertical"
		android:orientation="vertical"
		>
		<TextView
		android:id="@+id/spinner_line_1"
		android:layout_width="match_parent"
		android:layout_height="0dip"
		android:layout_weight="1"
		android:textSize="16dip"
		android:singleLine="true"
		android:ellipsize="end"
		android:gravity="left\|center_vertical"
		android:text="@string/button_text"
		/>
		</LinearLayout>
		</LinearLayout>

		</FrameLayout>
		No newline at end of file