Merge "Right align pwd field when space is tight" into rvc-dev am: b157e3cef4

Change-Id: I4a3f8aae729c132f61311f2e330e1f5e88e8c515

packages/SystemUI/src/com/android/keyguard/PasswordTextView.java

@@ -164,7 +164,9 @@ public class PasswordTextView extends View {
                 currentDrawPosition = getPaddingLeft();
             }
         } else {
-            currentDrawPosition = getWidth() / 2 - totalDrawingWidth / 2;
+            float maxRight = getWidth() - getPaddingRight() - totalDrawingWidth;
+            float center = getWidth() / 2f - totalDrawingWidth / 2f;
+            currentDrawPosition = center > 0 ? center : maxRight;
         }
         int length = mTextChars.size();
         Rect bounds = getCharBounds();