diff options
author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-04-01 01:21:22 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-04-01 01:21:23 +0000 |
commit | 5ff8de7e4d8e7687f9dee34a1dc54cfb2ae579e0 (patch) | |
tree | 438ff1340bd9842f7f9e8aa591b317c38b4440d5 /res | |
parent | 47d7f210f9428fa5c4e717cc9098fb78239aacce (diff) | |
parent | 0e1d4b0d1af88a119872bcdadfb30502b8ea7713 (diff) | |
download | packages_apps_Settings-5ff8de7e4d8e7687f9dee34a1dc54cfb2ae579e0.zip packages_apps_Settings-5ff8de7e4d8e7687f9dee34a1dc54cfb2ae579e0.tar.gz packages_apps_Settings-5ff8de7e4d8e7687f9dee34a1dc54cfb2ae579e0.tar.bz2 |
Merge "Fix bug #13727850 Input values are not visible when setting up the lockscreen... ...security(PIN/Passwor/Pattern)."
Diffstat (limited to 'res')
-rw-r--r-- | res/layout-land/choose_lock_password.xml | 11 | ||||
-rw-r--r-- | res/layout-land/confirm_lock_password.xml | 11 | ||||
-rw-r--r-- | res/layout-sw600dp-land/choose_lock_password.xml | 11 | ||||
-rw-r--r-- | res/layout-sw600dp-land/confirm_lock_password.xml | 11 | ||||
-rw-r--r-- | res/layout-sw600dp/choose_lock_password.xml | 13 | ||||
-rw-r--r-- | res/layout-sw600dp/confirm_lock_password.xml | 13 | ||||
-rw-r--r-- | res/layout/choose_lock_password.xml | 11 | ||||
-rw-r--r-- | res/layout/confirm_lock_password.xml | 11 | ||||
-rw-r--r-- | res/values/styles.xml | 7 |
9 files changed, 41 insertions, 58 deletions
diff --git a/res/layout-land/choose_lock_password.xml b/res/layout-land/choose_lock_password.xml index 74893c7..fd52413 100644 --- a/res/layout-land/choose_lock_password.xml +++ b/res/layout-land/choose_lock_password.xml @@ -46,18 +46,15 @@ <EditText android:id="@+id/password_entry" android:layout_width="0dip" android:layout_height="wrap_content" + android:layout_marginTop="5dip" + android:layout_marginBottom="5dip" + android:layout_gravity="center" android:layout_weight="1" - android:singleLine="true" - android:textStyle="bold" android:inputType="textPassword" android:imeOptions="actionNext" android:gravity="center" - android:layout_gravity="center" android:textSize="24sp" - android:layout_marginTop="5dip" - android:layout_marginBottom="5dip" - android:textAppearance="?android:attr/textAppearanceLarge" - android:textColor="#ffffffff" + style="@style/TextAppearance.PasswordEntry" /> </LinearLayout> diff --git a/res/layout-land/confirm_lock_password.xml b/res/layout-land/confirm_lock_password.xml index 604f766..ad7fbc0 100644 --- a/res/layout-land/confirm_lock_password.xml +++ b/res/layout-land/confirm_lock_password.xml @@ -47,18 +47,15 @@ <EditText android:id="@+id/password_entry" android:layout_width="0dip" android:layout_height="wrap_content" + android:layout_marginTop="5dip" + android:layout_marginBottom="5dip" + android:layout_gravity="center" android:layout_weight="1" - android:singleLine="true" - android:textStyle="bold" android:inputType="textPassword" android:imeOptions="actionNext" android:gravity="center" - android:layout_gravity="center" android:textSize="24sp" - android:layout_marginTop="5dip" - android:layout_marginBottom="5dip" - android:textAppearance="?android:attr/textAppearanceLarge" - android:textColor="#ffffffff" + style="@style/TextAppearance.PasswordEntry" /> </LinearLayout> diff --git a/res/layout-sw600dp-land/choose_lock_password.xml b/res/layout-sw600dp-land/choose_lock_password.xml index fa54c14..199c9ac 100644 --- a/res/layout-sw600dp-land/choose_lock_password.xml +++ b/res/layout-sw600dp-land/choose_lock_password.xml @@ -47,18 +47,15 @@ <EditText android:id="@+id/password_entry" android:layout_width="0dip" android:layout_height="wrap_content" + android:layout_marginTop="5dip" + android:layout_marginBottom="5dip" + android:layout_gravity="center" android:layout_weight="1" - android:singleLine="true" - android:textStyle="bold" android:inputType="textPassword" android:imeOptions="actionNext" android:gravity="center" - android:layout_gravity="center" android:textSize="24sp" - android:layout_marginTop="5dip" - android:layout_marginBottom="5dip" - android:textAppearance="?android:attr/textAppearanceLarge" - android:textColor="#ffffffff" + style="@style/TextAppearance.PasswordEntry" /> </LinearLayout> diff --git a/res/layout-sw600dp-land/confirm_lock_password.xml b/res/layout-sw600dp-land/confirm_lock_password.xml index dc448db..e3cc20c 100644 --- a/res/layout-sw600dp-land/confirm_lock_password.xml +++ b/res/layout-sw600dp-land/confirm_lock_password.xml @@ -48,18 +48,15 @@ <EditText android:id="@+id/password_entry" android:layout_width="0dip" android:layout_height="wrap_content" + android:layout_marginTop="5dip" + android:layout_marginBottom="5dip" + android:layout_gravity="center" android:layout_weight="1" - android:singleLine="true" - android:textStyle="bold" android:inputType="textPassword" android:imeOptions="actionNext" android:gravity="center" - android:layout_gravity="center" android:textSize="24sp" - android:layout_marginTop="5dip" - android:layout_marginBottom="5dip" - android:textAppearance="?android:attr/textAppearanceLarge" - android:textColor="#ffffffff" + style="@style/TextAppearance.PasswordEntry" /> </LinearLayout> diff --git a/res/layout-sw600dp/choose_lock_password.xml b/res/layout-sw600dp/choose_lock_password.xml index b4b8294..ca8975e 100644 --- a/res/layout-sw600dp/choose_lock_password.xml +++ b/res/layout-sw600dp/choose_lock_password.xml @@ -34,18 +34,15 @@ <EditText android:id="@+id/password_entry" android:layout_width="match_parent" android:layout_height="wrap_content" - android:singleLine="true" - android:textStyle="bold" + android:layout_marginTop="15dip" + android:layout_marginStart="30dip" + android:layout_marginEnd="30dip" + android:layout_gravity="center" android:inputType="textPassword" android:imeOptions="actionNext" android:gravity="center" - android:layout_gravity="center" android:textSize="32sp" - android:layout_marginTop="15dip" - android:layout_marginStart="30dip" - android:layout_marginEnd="30dip" - android:textAppearance="?android:attr/textAppearanceLarge" - android:textColor="#ffffffff" + style="@style/TextAppearance.PasswordEntry" /> <!-- Spacer between password entry and keyboard --> diff --git a/res/layout-sw600dp/confirm_lock_password.xml b/res/layout-sw600dp/confirm_lock_password.xml index ff7c847..9e236d5 100644 --- a/res/layout-sw600dp/confirm_lock_password.xml +++ b/res/layout-sw600dp/confirm_lock_password.xml @@ -46,18 +46,15 @@ <EditText android:id="@+id/password_entry" android:layout_width="match_parent" android:layout_height="wrap_content" - android:singleLine="true" - android:textStyle="bold" + android:layout_marginTop="15dip" + android:layout_marginStart="30dip" + android:layout_marginEnd="30dip" + android:layout_gravity="center" android:inputType="textPassword" android:imeOptions="actionNext" android:gravity="center" - android:layout_gravity="center" android:textSize="32sp" - android:layout_marginTop="15dip" - android:layout_marginStart="30dip" - android:layout_marginEnd="30dip" - android:textAppearance="?android:attr/textAppearanceLarge" - android:textColor="#ffffffff" + style="@style/TextAppearance.PasswordEntry" /> <!-- Spacer between password entry and keyboard --> diff --git a/res/layout/choose_lock_password.xml b/res/layout/choose_lock_password.xml index 59f7f9f..c13d150 100644 --- a/res/layout/choose_lock_password.xml +++ b/res/layout/choose_lock_password.xml @@ -34,17 +34,14 @@ <EditText android:id="@+id/password_entry" android:layout_width="match_parent" android:layout_height="wrap_content" - android:singleLine="true" - android:textStyle="bold" + android:layout_gravity="center" + android:layout_marginStart="30dip" + android:layout_marginEnd="30dip" android:inputType="textPassword" android:imeOptions="actionNext" android:gravity="center" - android:layout_gravity="center" android:textSize="24sp" - android:layout_marginStart="30dip" - android:layout_marginEnd="30dip" - android:textAppearance="?android:attr/textAppearanceLarge" - android:textColor="#ffffffff" + style="@style/TextAppearance.PasswordEntry" /> <!-- Spacer between password entry and keyboard --> diff --git a/res/layout/confirm_lock_password.xml b/res/layout/confirm_lock_password.xml index ad73681..0ea4c52 100644 --- a/res/layout/confirm_lock_password.xml +++ b/res/layout/confirm_lock_password.xml @@ -37,17 +37,14 @@ <EditText android:id="@+id/password_entry" android:layout_width="match_parent" android:layout_height="wrap_content" - android:singleLine="true" - android:textStyle="bold" + android:layout_marginStart="30dip" + android:layout_marginEnd="30dip" + android:layout_gravity="center" android:inputType="textPassword" android:imeOptions="actionNext" android:gravity="center" - android:layout_gravity="center" android:textSize="24sp" - android:layout_marginStart="30dip" - android:layout_marginEnd="30dip" - android:textAppearance="?android:attr/textAppearanceLarge" - android:textColor="#ffffffff" + style="@style/TextAppearance.PasswordEntry" /> <!-- Spacer between password entry and keyboard --> diff --git a/res/values/styles.xml b/res/values/styles.xml index 3416b2c..ada9868 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -75,6 +75,13 @@ <item name="android:textStyle">normal</item> </style> + <style name="TextAppearance.PasswordEntry" parent="android:TextAppearance"> + <item name="android:gravity">center</item> + <item name="android:singleLine">true</item> + <item name="android:textStyle">bold</item> + <item name="android:textColor">?android:attr/textColorPrimary</item> + </style> + <style name="TallTitleBarTheme" parent="android:Theme.NoTitleBar"> <item name="android:windowContentOverlay">@null</item> </style> |