diff options
author | Ben Komalo <benkomalo@google.com> | 2011-06-02 11:40:00 -0700 |
---|---|---|
committer | Ben Komalo <benkomalo@google.com> | 2011-06-02 13:59:03 -0700 |
commit | a1d57709c297f7a9144c7a86477adb1c7623ca3e (patch) | |
tree | 809161250789dfcada3ea643c090ac9aeeb104af /res/layout-sw600dp/crypt_keeper_progress.xml | |
parent | 8ac8456491e1409a071c7cf4e164440aeec7c4dd (diff) | |
download | packages_apps_Settings-a1d57709c297f7a9144c7a86477adb1c7623ca3e.zip packages_apps_Settings-a1d57709c297f7a9144c7a86477adb1c7623ca3e.tar.gz packages_apps_Settings-a1d57709c297f7a9144c7a86477adb1c7623ca3e.tar.bz2 |
Fix cryptkeeper UI for 7" tablets.
- fixes pw entry/keyboard overlap on landscape
- fixes progress screen to be centered
Bug: 4478944
Change-Id: I411ad3507f42029022815ec001d0d8e5464ac0a1
Diffstat (limited to 'res/layout-sw600dp/crypt_keeper_progress.xml')
-rw-r--r-- | res/layout-sw600dp/crypt_keeper_progress.xml | 142 |
1 files changed, 72 insertions, 70 deletions
diff --git a/res/layout-sw600dp/crypt_keeper_progress.xml b/res/layout-sw600dp/crypt_keeper_progress.xml index 7bad7ba..b55781a 100644 --- a/res/layout-sw600dp/crypt_keeper_progress.xml +++ b/res/layout-sw600dp/crypt_keeper_progress.xml @@ -14,89 +14,91 @@ limitations under the License. --> -<RelativeLayout +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:paddingTop="154dip" - android:paddingLeft="128dip" - android:paddingRight="128dip" - android:paddingBottom="16dip" > - - <ImageView - android:id="@+id/encroid" + <RelativeLayout android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_alignParentBottom="true" - android:paddingRight="65dip" - android:src="@drawable/encroid_waiting" - /> + android:layout_gravity="center" + > + <ImageView + android:id="@+id/encroid" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_alignParentBottom="true" + android:paddingRight="65dip" + android:src="@drawable/encroid_waiting" + /> - <TextView - android:id="@+id/title" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:minHeight="48dip" - android:layout_alignParentTop="true" - android:layout_alignParentLeft="true" - android:layout_marginLeft="16dip" - android:textSize="30dip" - android:textColor="#ff99cc00" - android:text="@string/crypt_keeper_setup_title" - android:gravity="bottom" - /> + <TextView + android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:minHeight="48dip" + android:layout_alignParentTop="true" + android:layout_alignParentLeft="true" + android:layout_marginLeft="16dip" + android:textSize="30dip" + android:textColor="#ff99cc00" + android:text="@string/crypt_keeper_setup_title" + android:gravity="bottom" + /> - <!-- Divider --> - <RelativeLayout - android:id="@+id/top_divider" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@+id/title" - > - <ProgressBar - android:id="@+id/progress_bar" + <!-- Divider --> + <RelativeLayout + android:id="@+id/top_divider" android:layout_width="match_parent" android:layout_height="wrap_content" - style="?android:attr/progressBarStyleHorizontal" - /> - </RelativeLayout> + android:layout_below="@+id/title" + > + <ProgressBar + android:id="@+id/progress_bar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + style="?android:attr/progressBarStyleHorizontal" + /> + </RelativeLayout> - <TextView - android:id="@+id/status" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_below="@+id/top_divider" - android:paddingLeft="152dip" - android:paddingTop="21dip" - android:textAppearance="?android:attr/textAppearanceMedium" - /> + <TextView + android:id="@+id/status" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@+id/top_divider" + android:paddingLeft="152dip" + android:paddingTop="21dip" + android:textAppearance="?android:attr/textAppearanceMedium" + /> - <!-- Divider --> - <RelativeLayout - android:id="@+id/bottom_divider" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingLeft="152dip" - android:layout_above="@+id/factory_reset" - android:visibility="gone" - > - <ProgressBar + <!-- Divider --> + <RelativeLayout + android:id="@+id/bottom_divider" android:layout_width="match_parent" android:layout_height="wrap_content" - style="?android:attr/progressBarStyleHorizontal" + android:paddingLeft="152dip" + android:layout_above="@+id/factory_reset" + android:visibility="gone" + > + <ProgressBar + android:layout_width="match_parent" + android:layout_height="wrap_content" + style="?android:attr/progressBarStyleHorizontal" + /> + </RelativeLayout> + + <Button + android:id="@+id/factory_reset" + android:layout_width="208dip" + android:layout_height="48dip" + android:layout_alignParentRight="true" + android:layout_alignParentBottom="true" + android:layout_marginBottom="80dip" + android:text="@string/master_clear_button_text" + android:visibility="gone" /> - </RelativeLayout> - <Button - android:id="@+id/factory_reset" - android:layout_width="208dip" - android:layout_height="48dip" - android:layout_alignParentRight="true" - android:layout_alignParentBottom="true" - android:layout_marginBottom="80dip" - android:text="@string/master_clear_button_text" - android:visibility="gone" - /> -</RelativeLayout>
\ No newline at end of file + </RelativeLayout> +</FrameLayout> |