summaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/crypt_keeper_password_entry.xml7
-rw-r--r--res/layout/crypt_keeper_password_field.xml1
-rw-r--r--res/layout/crypt_keeper_pattern_entry.xml3
-rw-r--r--res/layout/crypt_keeper_pin_entry.xml3
-rw-r--r--res/layout/crypt_keeper_pin_field.xml1
-rw-r--r--res/layout/wifi_assistant_card.xml90
6 files changed, 97 insertions, 8 deletions
diff --git a/res/layout/crypt_keeper_password_entry.xml b/res/layout/crypt_keeper_password_entry.xml
index b26f542..ecbfefd 100644
--- a/res/layout/crypt_keeper_password_entry.xml
+++ b/res/layout/crypt_keeper_password_entry.xml
@@ -33,17 +33,16 @@
>
<include layout="@layout/crypt_keeper_password_field" />
</LinearLayout>
-
<!-- Emergency call button.
- Text and icon are set by CryptKeeper.updateEmergencyCallButtonState() -->
+ Text is set by CryptKeeper.updateEmergencyCallButtonState() -->
<Button android:id="@+id/emergencyCallButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="16dip"
- style="@*android:style/Widget.Button.Transparent"
+ style="?android:attr/borderlessButtonStyle"
android:textSize="14sp"
android:drawablePadding="6dip"
- />
+ />
</LinearLayout>
diff --git a/res/layout/crypt_keeper_password_field.xml b/res/layout/crypt_keeper_password_field.xml
index 97afe6a..9a2a24d 100644
--- a/res/layout/crypt_keeper_password_field.xml
+++ b/res/layout/crypt_keeper_password_field.xml
@@ -28,6 +28,7 @@
android:inputType="textPassword"
android:imeOptions="flagForceAscii|actionDone"
android:textAppearance="?android:attr/textAppearanceMedium"
+ android:gravity="center_horizontal"
/>
<ImageView android:id="@+id/switch_ime_button"
diff --git a/res/layout/crypt_keeper_pattern_entry.xml b/res/layout/crypt_keeper_pattern_entry.xml
index a59d36f..2538809 100644
--- a/res/layout/crypt_keeper_pattern_entry.xml
+++ b/res/layout/crypt_keeper_pattern_entry.xml
@@ -41,8 +41,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="16dip"
- style="@*android:style/Widget.Button.Transparent"
- android:textSize="14sp"
+ style="?android:attr/borderlessButtonStyle"
android:drawablePadding="6dip"
/>
diff --git a/res/layout/crypt_keeper_pin_entry.xml b/res/layout/crypt_keeper_pin_entry.xml
index dfc5fb5..0f1f1e7 100644
--- a/res/layout/crypt_keeper_pin_entry.xml
+++ b/res/layout/crypt_keeper_pin_entry.xml
@@ -41,8 +41,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="16dip"
- style="@*android:style/Widget.Button.Transparent"
- android:textSize="14sp"
+ style="?android:attr/borderlessButtonStyle"
android:drawablePadding="6dip"
/>
diff --git a/res/layout/crypt_keeper_pin_field.xml b/res/layout/crypt_keeper_pin_field.xml
index 270b26b..dd9d233 100644
--- a/res/layout/crypt_keeper_pin_field.xml
+++ b/res/layout/crypt_keeper_pin_field.xml
@@ -28,6 +28,7 @@
android:inputType="numberPassword"
android:imeOptions="flagForceAscii|actionDone"
android:textAppearance="?android:attr/textAppearanceMedium"
+ android:gravity="center_horizontal"
/>
<ImageView android:id="@+id/switch_ime_button"
diff --git a/res/layout/wifi_assistant_card.xml b/res/layout/wifi_assistant_card.xml
new file mode 100644
index 0000000..a1917ba
--- /dev/null
+++ b/res/layout/wifi_assistant_card.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2014 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:id="@+id/wifi_assistant_card"
+ android:background="@android:color/transparent"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:gravity="center_vertical"
+ android:orientation="vertical"
+ android:padding="@dimen/wifi_assistant_padding">
+
+ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content">
+
+ <ImageView
+ android:id="@+id/cardBackground"
+ android:background="@color/setup_add_wifi_network_text_color"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center"
+ android:src="@drawable/wifi_assistant_card" />
+
+ <TextView
+ android:id="@+id/backgroundText"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/wifi_assistant_text_padding"
+ android:gravity="start"
+ android:text="@string/wifi_assistant_intro_setup"
+ style="@style/WifiAssistantText" />
+
+ </RelativeLayout>
+
+ <TextView
+ android:id="@+id/wifi_assistant_text"
+ android:background="@android:color/transparent"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:layout_marginBottom="@dimen/wifi_assistant_padding_top_bottom"
+ android:layout_marginTop="@dimen/wifi_assistant_padding_top_bottom"
+ android:layout_marginLeft="@dimen/wifi_assistant_padding_start_end"
+ android:layout_marginRight="@dimen/wifi_assistant_padding_start_end"
+ android:gravity="start"
+ android:text="@string/wifi_assistant_title_message"
+ android:textAppearance="?android:attr/textAppearanceMedium" />
+
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:background="@android:color/transparent"
+ android:layout_height="wrap_content"
+ android:layout_width="fill_parent"
+ android:gravity="end"
+ android:orientation="horizontal">
+
+ <Button
+ android:id="@+id/no_thanks_button"
+ android:background="@android:color/white"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:text="@string/wifi_assistant_no_thanks"
+ android:paddingLeft="@dimen/wifi_assistant_text_padding"
+ android:paddingRight="@dimen/wifi_assistant_text_padding" />
+
+ <Button
+ android:id="@+id/setup"
+ android:background="@android:color/white"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content"
+ android:paddingLeft="@dimen/wifi_assistant_text_padding"
+ android:paddingRight="@dimen/wifi_assistant_text_padding"
+ android:text="@string/wifi_assistant_setup"
+ style="@style/WifiAssistantButton" />
+
+ </LinearLayout>
+
+</LinearLayout>