diff options
author | Ben Komalo <benkomalo@google.com> | 2011-08-16 17:48:42 -0700 |
---|---|---|
committer | Ben Komalo <benkomalo@google.com> | 2011-08-17 11:08:26 -0700 |
commit | f0104df823a93ef4c3336118ddb02a0924e520da (patch) | |
tree | 0d397fc4a5cb44e8ddcc1f24ac3468b18dd2dc58 /res/layout-land/crypt_keeper_progress.xml | |
parent | 25bad16da6e6b361752464cb7fae3911d5d3cefc (diff) | |
download | packages_apps_Settings-f0104df823a93ef4c3336118ddb02a0924e520da.zip packages_apps_Settings-f0104df823a93ef4c3336118ddb02a0924e520da.tar.gz packages_apps_Settings-f0104df823a93ef4c3336118ddb02a0924e520da.tar.bz2 |
Fixes to CryptKeeper layout for phones
- prevents crash when trying to show error state
- makes progress screen not look horribly broken
Bug: 5174783
Bug: 4671153
Change-Id: Ia72830e2fdb72f174b3ed01b6fc14be7152d1932
Diffstat (limited to 'res/layout-land/crypt_keeper_progress.xml')
-rw-r--r-- | res/layout-land/crypt_keeper_progress.xml | 85 |
1 files changed, 85 insertions, 0 deletions
diff --git a/res/layout-land/crypt_keeper_progress.xml b/res/layout-land/crypt_keeper_progress.xml new file mode 100644 index 0000000..62fb297 --- /dev/null +++ b/res/layout-land/crypt_keeper_progress.xml @@ -0,0 +1,85 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2011 The Android Open Source Project + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> + +<LinearLayout + xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:padding="16dip" + android:orientation="vertical" +> + + <TextView + android:id="@+id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:minHeight="48dip" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + 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" + > + <ProgressBar + android:id="@+id/progress_bar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + style="?android:attr/progressBarStyleHorizontal" + /> + </RelativeLayout> + + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="0dip" + android:layout_weight="1" + android:orientation="horizontal" + > + <TextView + android:id="@+id/status" + android:textAppearance="?android:attr/textAppearanceMedium" + android:layout_width="0dip" + android:layout_height="wrap_content" + android:layout_weight="1" + /> + + <ImageView + android:id="@+id/encroid" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:src="@drawable/encroid_waiting" + /> + + <Button + android:id="@+id/factory_reset" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="32dip" + android:text="@string/master_clear_button_text" + android:visibility="gone" + /> + </LinearLayout> + +</LinearLayout> + |