summaryrefslogtreecommitdiff
path: root/app/src/main/res/layout-v14
diff options
context:
space:
mode:
Diffstat (limited to 'app/src/main/res/layout-v14')
-rw-r--r--app/src/main/res/layout-v14/authentication_dialog.xml10
-rw-r--r--app/src/main/res/layout-v14/directory_chooser.xml2
-rw-r--r--app/src/main/res/layout-v14/download_authentication_activity.xml12
-rw-r--r--app/src/main/res/layout-v14/time_dialog.xml73
4 files changed, 45 insertions, 52 deletions
diff --git a/app/src/main/res/layout-v14/authentication_dialog.xml b/app/src/main/res/layout-v14/authentication_dialog.xml
index ed05dab1c..00e74c9e1 100644
--- a/app/src/main/res/layout-v14/authentication_dialog.xml
+++ b/app/src/main/res/layout-v14/authentication_dialog.xml
@@ -15,7 +15,10 @@
android:layout_height="0dp"
android:layout_weight="1"
android:layout_margin="16dp"
- android:hint="@string/username_label"/>
+ android:hint="@string/username_label"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ android:cursorVisible="true"/>
<EditText
android:id="@+id/etxtPassword"
@@ -24,7 +27,10 @@
android:layout_weight="1"
android:layout_margin="16dp"
android:inputType="textPassword"
- android:hint="@string/password_label"/>
+ android:hint="@string/password_label"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ android:cursorVisible="true"/>
<CheckBox
android:id="@+id/chkSaveUsernamePassword"
diff --git a/app/src/main/res/layout-v14/directory_chooser.xml b/app/src/main/res/layout-v14/directory_chooser.xml
index 8f9c4ee93..14e2f6a38 100644
--- a/app/src/main/res/layout-v14/directory_chooser.xml
+++ b/app/src/main/res/layout-v14/directory_chooser.xml
@@ -101,7 +101,7 @@
android:layout_width="match_parent"
android:layout_height="1dp"
android:layout_below="@id/butNavUp"
- android:background="@color/bright_blue" />
+ android:background="@color/holo_blue_light" />
</RelativeLayout>
<ListView
diff --git a/app/src/main/res/layout-v14/download_authentication_activity.xml b/app/src/main/res/layout-v14/download_authentication_activity.xml
index c1fe55ceb..f6925dc3a 100644
--- a/app/src/main/res/layout-v14/download_authentication_activity.xml
+++ b/app/src/main/res/layout-v14/download_authentication_activity.xml
@@ -12,7 +12,7 @@
android:layout_alignParentTop="true"
android:textSize="@dimen/text_size_large"
android:layout_margin="16dp"
- android:textColor="@color/bright_blue"
+ android:textColor="@color/holo_blue_light"
android:textStyle="italic"/>
<TextView
@@ -31,7 +31,10 @@
android:layout_margin="16dp"
android:id="@+id/etxtUsername"
android:hint="@string/username_label"
- android:layout_below="@id/txtvDescription"/>
+ android:layout_below="@id/txtvDescription"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ android:cursorVisible="true"/>
<EditText
android:layout_width="match_parent"
@@ -40,7 +43,10 @@
android:id="@+id/etxtPassword"
android:hint="@string/password_label"
android:inputType="textPassword"
- android:layout_below="@id/etxtUsername"/>
+ android:layout_below="@id/etxtUsername"
+ android:focusable="true"
+ android:focusableInTouchMode="true"
+ android:cursorVisible="true"/>
<RelativeLayout
android:id="@+id/footer"
diff --git a/app/src/main/res/layout-v14/time_dialog.xml b/app/src/main/res/layout-v14/time_dialog.xml
index 7fd4309d5..06c2cce14 100644
--- a/app/src/main/res/layout-v14/time_dialog.xml
+++ b/app/src/main/res/layout-v14/time_dialog.xml
@@ -1,21 +1,22 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical" >
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical"
+ android:gravity="center">
<LinearLayout
- android:layout_width="match_parent"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="horizontal" >
<EditText
android:id="@+id/etxtTime"
- android:layout_width="0dp"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_weight="1"
android:layout_margin="8dp"
- android:ems="7"
+ android:ems="2"
android:hint="@string/enter_time_here_label"
android:inputType="number"
android:maxLength="2" >
@@ -25,54 +26,34 @@
<Spinner
android:id="@+id/spTimeUnit"
- android:layout_width="180dp"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp" />
</LinearLayout>
- <RelativeLayout
- android:id="@+id/footer"
- android:layout_width="fill_parent"
- android:layout_height="48dp" >
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:orientation="vertical">
- <View
- android:layout_width="match_parent"
- android:layout_height="1dip"
- android:layout_alignParentTop="true"
- android:background="?android:attr/dividerVertical" />
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginTop="8dp"
+ android:textSize="16sp"
+ android:text="@string/timer_about_to_expire_label"/>
- <View
- android:id="@+id/horizontal_divider"
- android:layout_width="1dip"
- android:layout_height="fill_parent"
- android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true"
- android:layout_marginBottom="4dp"
- android:layout_marginTop="4dp"
- android:background="?android:attr/dividerVertical" />
+ <CheckBox android:id="@+id/cbShakeToReset"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/shake_to_reset_label"/>
- <Button
- android:id="@+id/butCancel"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_alignParentLeft="true"
- android:layout_alignParentTop="true"
- android:layout_toLeftOf="@id/horizontal_divider"
- android:background="?android:attr/selectableItemBackground"
- android:text="@string/cancel_label" />
+ <CheckBox android:id="@+id/cbVibrate"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:text="@string/timer_vibration_label"/>
- <Button
- android:id="@+id/butConfirm"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true"
- android:layout_toRightOf="@id/horizontal_divider"
- android:background="?android:attr/selectableItemBackground"
- android:text="@string/confirm_label" />
- </RelativeLayout>
+ </LinearLayout>
</LinearLayout> \ No newline at end of file