summaryrefslogtreecommitdiff
path: root/res/layout
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-03-29 01:48:07 +0100
committerParménides GV <parmegv@sdf.org>2014-03-29 01:48:07 +0100
commit40c58015378ca9f9b7e8ad060eacf51eaaf00057 (patch)
tree2b5329c1bdee338c1c180c1a1b116fc4dbf0b657 /res/layout
parent59a3efd287a71648f478ca46fd6be000d9014760 (diff)
parent9aa13d7a9a5c9ea8b0ca42fd1090051b89b2129e (diff)
Merge branch 'bug/font-size-too-small-for-10'-devices-#5211' into develop
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/log_in_dialog.xml2
-rw-r--r--res/layout/provider_list_item.xml43
2 files changed, 45 insertions, 0 deletions
diff --git a/res/layout/log_in_dialog.xml b/res/layout/log_in_dialog.xml
index 3a9eebb8..c8a2f0a8 100644
--- a/res/layout/log_in_dialog.xml
+++ b/res/layout/log_in_dialog.xml
@@ -21,6 +21,7 @@
android:layout_marginLeft="4dp"
android:layout_marginRight="4dp"
android:layout_marginTop="16dp"
+ android:textSize="24sp"
android:ems="10"
android:hint="@string/username_hint"
android:inputType="textUri" >
@@ -32,6 +33,7 @@
android:id="@+id/password_entered"
android:layout_width="match_parent"
android:layout_height="wrap_content"
+ android:textSize="24sp"
android:ems="10"
android:hint="@string/password_hint"
android:inputType="textPassword" />
diff --git a/res/layout/provider_list_item.xml b/res/layout/provider_list_item.xml
new file mode 100644
index 00000000..8746f6f8
--- /dev/null
+++ b/res/layout/provider_list_item.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Copyright (C) 2010 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.
+-->
+
+<TwoLineListItem xmlns:android="http://schemas.android.com/apk/res/android"
+ android:paddingTop="2dip"
+ android:paddingBottom="2dip"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="?android:attr/activatedBackgroundIndicator"
+ android:minHeight="?android:attr/listPreferredItemHeight"
+ android:mode="twoLine"
+>
+
+ <TextView android:id="@android:id/text1"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="?android:attr/listPreferredItemPaddingLeft"
+ android:layout_marginTop="6dip"
+ android:textAppearance="?android:attr/textAppearanceListItem"
+ />
+
+ <TextView android:id="@android:id/text2"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_below="@android:id/text1"
+ android:layout_alignLeft="@android:id/text1"
+ android:textAppearance="?android:attr/textAppearanceSmall"
+ />
+
+</TwoLineListItem>