PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix cryptkeeper UI for 7" tablets." into honeycomb-mr2

Browse Source
This commit is contained in:
Ben Komalo
2011-06-02 17:21:39 -07:00
committed by Android (Google) Code Review
parent 3a5b3494a7 a1d57709c2
commit 57b17f5043
2 changed files with 83 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
res/layout-sw600dp-land/crypt_keeper_password_entry.xml
View File

@@ -16,20 +16,21 @@
** limitations under the License. ** limitations under the License.
*/ */
--> -->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
> >
<RelativeLayout <RelativeLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="0dip"
android:layout_centerHorizontal="true" android:layout_weight="1"
android:layout_marginTop="206dip" android:layout_gravity="center_horizontal"
> >
<ImageView android:id="@+id/encroid" <ImageView android:id="@+id/encroid"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentTop="true" android:layout_centerVertical="true"
android:src="@drawable/encroid_resignin" android:src="@drawable/encroid_resignin"
/> />
@@ -37,7 +38,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_toRightOf="@+id/encroid" android:layout_toRightOf="@+id/encroid"
android:layout_marginTop="37dip" android:layout_centerVertical="true"
android:paddingRight="17dip" android:paddingRight="17dip"
android:singleLine="true" android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
@@ -51,7 +52,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_width="320dip" android:layout_width="320dip"
android:layout_toRightOf="@+id/passwordLabel" android:layout_toRightOf="@+id/passwordLabel"
android:layout_marginTop="26dip" android:layout_centerVertical="true"
android:singleLine="true" android:singleLine="true"
android:inputType="textPassword" android:inputType="textPassword"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
@@ -75,10 +76,9 @@
<com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard" <com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:background="#00000000" android:background="#00000000"
android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans" android:keyBackground="@*android:drawable/btn_keyboard_key_fulltrans"
android:visibility="visible" android:visibility="visible"
/> />
</RelativeLayout> </LinearLayout>

146
res/layout-sw600dp/crypt_keeper_progress.xml
View File

@@ -14,89 +14,91 @@
limitations under the License. limitations under the License.
--> -->
<RelativeLayout <FrameLayout
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingTop="154dip"
android:paddingLeft="128dip"
android:paddingRight="128dip"
android:paddingBottom="16dip"
> >
<RelativeLayout
<ImageView
android:id="@+id/encroid"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentRight="true" android:layout_gravity="center"
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"
/>
<!-- Divider -->
<RelativeLayout
android:id="@+id/top_divider"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@+id/title"
> >
<ProgressBar <ImageView
android:id="@+id/progress_bar" 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"
/>
<!-- Divider -->
<RelativeLayout
android:id="@+id/top_divider"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?android:attr/progressBarStyleHorizontal" android:layout_below="@+id/title"
/> >
</RelativeLayout> <ProgressBar
android:id="@+id/progress_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
style="?android:attr/progressBarStyleHorizontal"
/>
</RelativeLayout>
<TextView <TextView
android:id="@+id/status" 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
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
style="?android:attr/progressBarStyleHorizontal" android:layout_below="@+id/top_divider"
android:paddingLeft="152dip"
android:paddingTop="21dip"
android:textAppearance="?android:attr/textAppearanceMedium"
/> />
</RelativeLayout>
<Button <!-- Divider -->
android:id="@+id/factory_reset" <RelativeLayout
android:layout_width="208dip" android:id="@+id/bottom_divider"
android:layout_height="48dip" android:layout_width="match_parent"
android:layout_alignParentRight="true" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:paddingLeft="152dip"
android:layout_marginBottom="80dip" android:layout_above="@+id/factory_reset"
android:text="@string/master_clear_button_text" android:visibility="gone"
android:visibility="gone" >
/> <ProgressBar
</RelativeLayout> 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>
</FrameLayout>