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

More CryptKeeper UI work.

Browse Source 
* Implemented failure case.
* More pixel perfect
* Remove the animation
* Display the encroid on the blank screen
* Remove the back button.
* Fix portrait mode screens

Bug: 3384231
Bug: 3394103
Bug: 3388721
Bug: 3381450
Bug: 3406278
Bug: 3351832
Change-Id: Ib763c8b577198deb45255acc767bc6d5409efc0c
This commit is contained in:
Andy Stadler
2011-01-31 19:21:37 -08:00
parent ba681faf73
commit 13d62049f7
21 changed files with 218 additions and 115 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
res/layout-xlarge/crypt_keeper_password_entry.xml
View File

@@ -16,42 +16,59 @@
** limitations under the License.
*/
-->
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
>
<!-- left side: status -->
<include layout="@layout/crypt_keeper_status"
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="134dip"
android:paddingTop="50dip"
android:layout_alignParentTop="true"
android:layout_gravity="center_horizontal"
android:layout_centerHorizontal="true"
/>
android:layout_marginTop="318dip"
>
<ImageView android:id="@+id/encroid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:src="@drawable/encroid_resignin"
/>
<!-- Password entry field -->
<EditText android:id="@+id/passwordEntry"
android:layout_above="@id/keyboard"
android:layout_height="wrap_content"
android:layout_width="450dip"
android:singleLine="true"
android:textStyle="normal"
android:inputType="textPassword"
android:gravity="center"
android:layout_gravity="center_horizontal"
android:layout_centerHorizontal="true"
android:textSize="24sp"
android:layout_marginTop="120dip"
android:layout_marginBottom="5dip"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textColor="#ffffffff"
android:editable="false"
/>
<TextView android:id="@+id/passwordLabel"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_toRightOf="@+id/encroid"
android:layout_marginTop="37dip"
android:paddingRight="17dip"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium"
android:text="@string/crypt_keeper_enter_password"
/>
<!-- Password entry field -->
<EditText android:id="@+id/passwordEntry"
android:layout_height="wrap_content"
android:layout_width="320dip"
android:layout_toRightOf="@+id/passwordLabel"
android:layout_marginTop="26dip"
android:singleLine="true"
android:inputType="textPassword"
android:textAppearance="?android:attr/textAppearanceMedium"
android:editable="false"
/>
<TextView android:id="@+id/status"
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_toRightOf="@+id/passwordLabel"
android:layout_below="@+id/passwordEntry"
android:paddingTop="8dip"
android:singleLine="true"
android:textSize="17sp"
android:textAppearance="?android:attr/textAppearanceMedium"
android:drawableLeft="@*android:drawable/ic_lock_idle_lock"
android:visibility="gone"
/>
</RelativeLayout>
<com.android.internal.widget.PasswordEntryKeyboardView android:id="@+id/keyboard"
android:layout_width="match_parent"

58
res/layout-xlarge/crypt_keeper_progress.xml
View File

@@ -14,24 +14,33 @@
limitations under the License.
-->
<LinearLayout
<RelativeLayout
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="0dip"
android:orientation="vertical"
android:background="@drawable/encryption_bg_waiting"
android:paddingBottom="16dip"
>
<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_centerVertical="true"
android:layout_marginLeft="16dip"
android:textSize="30dip"
android:textColor="#ff99cc00"
@@ -44,6 +53,7 @@
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"
@@ -52,17 +62,41 @@
style="?android:attr/progressBarStyleHorizontal"
/>
</RelativeLayout>
<TextView
android:id="@+id/status"
android:layout_width="match_parent"
android:layout_height="0dip"
android:layout_weight="1"
android:layout_height="wrap_content"
android:layout_below="@+id/top_divider"
android:paddingLeft="152dip"
android:paddingTop="21dip"
android:textSize="18dip"
android:textColor="#ffffffff"
android:text="@string/crypt_keeper_setup_description"
android:textAppearance="?android:attr/textAppearanceMedium"
/>
</LinearLayout>
<!-- 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_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>