Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Make backup/restore confirmation UI landscape-friendly"

Browse Source
This commit is contained in:
Christopher Tate
2011-08-03 17:37:56 -07:00
committed by Android (Google) Code Review
parent cffb287b44 31deacf6f5
commit ab104b2c03
2 changed files with 101 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
packages/BackupRestoreConfirmation/res/layout/confirm_backup.xml
View File

@@ -18,10 +18,20 @@
*/
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="16dp" >
<ScrollView
android:layout_height="0dp"
android:layout_weight="1"
android:layout_width="match_parent">
<LinearLayout
android:orientation="vertical"
android:layout_height="wrap_content"
android:padding="16dp" >
android:layout_width="match_parent">
<TextView android:id="@+id/confirm_text"
android:layout_width="match_parent"
@@ -63,13 +73,21 @@
android:layout_marginLeft="30dp"
android:layout_below="@id/enc_password"
android:layout_marginBottom="30dp" />
</LinearLayout>
</ScrollView>
<LinearLayout android:orientation="horizontal"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_gravity="bottom">
<Button android:id="@+id/button_allow"
android:filterTouchesWhenObscured="true"
android:text="@string/allow_backup_button_label"
android:layout_below="@id/package_name"
android:layout_height="wrap_content"
android:layout_width="wrap_content" />
android:layout_width="0dp"
android:layout_weight="1" />
<Button android:id="@+id/button_deny"
android:text="@string/deny_backup_button_label"
@@ -77,6 +95,9 @@
android:layout_toRightOf="@id/button_allow"
android:layout_alignTop="@id/button_allow"
android:layout_height="wrap_content"
android:layout_width="wrap_content" />
android:layout_width="0dp"
android:layout_weight="1" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>

127
packages/BackupRestoreConfirmation/res/layout/confirm_restore.xml
View File

@@ -18,65 +18,86 @@
*/
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:padding="16dp" >
<TextView android:id="@+id/confirm_text"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="30dp"
android:text="@string/restore_confirm_text" />
android:layout_height="match_parent"
android:orientation="vertical"
android:padding="16dp" >
<TextView android:id="@+id/password_desc"
android:layout_below="@id/confirm_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="@string/current_password_text" />
<ScrollView
android:layout_height="0dp"
android:layout_weight="1"
android:layout_width="match_parent">
<LinearLayout
android:orientation="vertical"
android:layout_height="wrap_content"
android:layout_width="match_parent">
<EditText android:id="@+id/password"
android:layout_below="@id/password_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="30dp"
android:password="true" />
<TextView android:id="@+id/confirm_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="30dp"
android:text="@string/restore_confirm_text" />
<TextView android:id="@+id/enc_password_desc"
android:layout_below="@id/password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="@string/restore_enc_password_text" />
<TextView android:id="@+id/password_desc"
android:layout_below="@id/confirm_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="@string/current_password_text" />
<EditText android:id="@+id/enc_password"
android:layout_below="@id/enc_password_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="30dp"
android:password="true" />
<EditText android:id="@+id/password"
android:layout_below="@id/password_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="30dp"
android:password="true" />
<TextView android:id="@+id/package_name"
android:layout_width="match_parent"
android:layout_height="20dp"
android:layout_marginLeft="30dp"
android:layout_below="@id/enc_password"
android:layout_marginBottom="30dp" />
<TextView android:id="@+id/enc_password_desc"
android:layout_below="@id/password"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="10dp"
android:text="@string/restore_enc_password_text" />
<Button android:id="@+id/button_allow"
android:filterTouchesWhenObscured="true"
android:text="@string/allow_restore_button_label"
android:layout_below="@id/package_name"
android:layout_height="wrap_content"
android:layout_width="wrap_content" />
<EditText android:id="@+id/enc_password"
android:layout_below="@id/enc_password_desc"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="30dp"
android:password="true" />
<Button android:id="@+id/button_deny"
android:text="@string/deny_restore_button_label"
android:layout_below="@id/package_name"
android:layout_toRightOf="@id/button_allow"
android:layout_alignTop="@id/button_allow"
android:layout_height="wrap_content"
android:layout_width="wrap_content" />
<TextView android:id="@+id/package_name"
android:layout_width="match_parent"
android:layout_height="20dp"
android:layout_marginLeft="30dp"
android:layout_below="@id/enc_password"
android:layout_marginBottom="10dp" />
</LinearLayout>
</ScrollView>
</RelativeLayout>
<LinearLayout android:orientation="horizontal"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_gravity="bottom">
<Button android:id="@+id/button_allow"
android:filterTouchesWhenObscured="true"
android:text="@string/allow_restore_button_label"
android:layout_below="@id/package_name"
android:layout_height="wrap_content"
android:layout_width="0dp"
android:layout_weight="1" />
<Button android:id="@+id/button_deny"
android:text="@string/deny_restore_button_label"
android:layout_below="@id/package_name"
android:layout_toRightOf="@id/button_allow"
android:layout_alignTop="@id/button_allow"
android:layout_height="wrap_content"
android:layout_width="0dp"
android:layout_weight="1" />
</LinearLayout>
</LinearLayout>