diff options
author | Ben Komalo <benkomalo@google.com> | 2011-06-03 15:30:14 -0700 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-03 15:30:14 -0700 |
commit | 11fc3c2044737f41be5f8240e40c4c782a2d26e0 (patch) | |
tree | 0b34c4ecdb2a253e442f4e6d7dfd8651a244e51d /res/layout-sw600dp | |
parent | 2a18319a1a3d39b8c2bc4efb8c13137612ccc91a (diff) | |
parent | 657a7ad8b279c7a5bbda47c92961a6fbc7473b0b (diff) | |
download | packages_apps_Settings-11fc3c2044737f41be5f8240e40c4c782a2d26e0.zip packages_apps_Settings-11fc3c2044737f41be5f8240e40c4c782a2d26e0.tar.gz packages_apps_Settings-11fc3c2044737f41be5f8240e40c4c782a2d26e0.tar.bz2 |
am 657a7ad8: am 1e43e694: am 57b17f50: Merge "Fix cryptkeeper UI for 7" tablets." into honeycomb-mr2
* commit '657a7ad8b279c7a5bbda47c92961a6fbc7473b0b':
Fix cryptkeeper UI for 7" tablets.
Diffstat (limited to 'res/layout-sw600dp')
-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> |