summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorVikram Aggarwal <viki@google.com>2012-05-02 16:29:10 -0700
committerVikram Aggarwal <viki@google.com>2012-05-03 12:48:48 -0700
commitc62d321e8dcb023e8c7299802a75a271b7ca98d9 (patch)
treed2bd2d40192b17d739e33eee4a8af137dfb3fcba /res
parent277cf8cc5b1481ff59a760f712f3892229023329 (diff)
downloadpackages_apps_settings-c62d321e8dcb023e8c7299802a75a271b7ca98d9.zip
packages_apps_settings-c62d321e8dcb023e8c7299802a75a271b7ca98d9.tar.gz
packages_apps_settings-c62d321e8dcb023e8c7299802a75a271b7ca98d9.tar.bz2
UI fixes for tablets
1. Center the clock on Xoom and large tablets. Fix b/5579000 2. Correctly remove the emergency call button if the device (*cough* Nakasi *cough*) does not have telephone capability. Change-Id: Ib7552dc35392a1b9d6c0381c6167949e2b163ddc
Diffstat (limited to 'res')
-rw-r--r--res/layout-sw600dp/crypt_keeper_password_entry.xml8
-rw-r--r--res/layout/crypt_keeper_status.xml2
2 files changed, 7 insertions, 3 deletions
diff --git a/res/layout-sw600dp/crypt_keeper_password_entry.xml b/res/layout-sw600dp/crypt_keeper_password_entry.xml
index fe6edaf..f8c113d 100644
--- a/res/layout-sw600dp/crypt_keeper_password_entry.xml
+++ b/res/layout-sw600dp/crypt_keeper_password_entry.xml
@@ -16,7 +16,8 @@
** 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_height="match_parent"
>
@@ -25,7 +26,7 @@
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_centerHorizontal="true"
+ android:layout_gravity="center_horizontal"
android:layout_marginTop="318dip"
>
<ImageView android:id="@+id/encroid"
@@ -53,10 +54,11 @@
android:layout_width="320dip"
android:layout_toRightOf="@+id/passwordLabel"
android:layout_marginTop="26dip"
+ android:layout_centerVertical="true"
android:orientation="horizontal"
>
<include layout="@layout/crypt_keeper_password_field" />
</LinearLayout>
</RelativeLayout>
-</RelativeLayout>
+</LinearLayout>
diff --git a/res/layout/crypt_keeper_status.xml b/res/layout/crypt_keeper_status.xml
index d94e66d..b92bbe8 100644
--- a/res/layout/crypt_keeper_status.xml
+++ b/res/layout/crypt_keeper_status.xml
@@ -23,6 +23,7 @@
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
>
<com.android.internal.widget.DigitalClock android:id="@+id/time"
@@ -31,6 +32,7 @@
android:layout_alignParentTop="true"
android:layout_alignParentLeft="true"
android:layout_marginTop="8dip"
+ android:layout_gravity="center"
android:layout_marginBottom="8dip"
>