projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix crash in navigation in FileList
[pub/Android/ownCloud.git]
/
res
/
layout
/
pincodelock.xml
diff --git
a/res/layout/pincodelock.xml
b/res/layout/pincodelock.xml
index
b1b6ce8
..
8c95c72
100644
(file)
--- a/
res/layout/pincodelock.xml
+++ b/
res/layout/pincodelock.xml
@@
-3,7
+3,7
@@
ownCloud Android client application
\r
\r
Copyright (C) 2012 Bartek Przybylski
\r
ownCloud Android client application
\r
\r
Copyright (C) 2012 Bartek Przybylski
\r
- Copyright (C) 201
2-2013
ownCloud Inc.
\r
+ Copyright (C) 201
5
ownCloud Inc.
\r
\r
This program is free software: you can redistribute it and/or modify
\r
it under the terms of the GNU General Public License version 2,
\r
\r
This program is free software: you can redistribute it and/or modify
\r
it under the terms of the GNU General Public License version 2,
\r
@@
-34,7
+34,8
@@
android:textColor="@android:color/black"
\r
android:gravity="center_horizontal"
\r
/>
\r
android:textColor="@android:color/black"
\r
android:gravity="center_horizontal"
\r
/>
\r
-
\r
<TextView
\r
+
\r
+ <TextView
\r
android:id="@+id/pinHdrExpl"
\r
android:layout_width="wrap_content"
\r
android:layout_height="wrap_content"
\r
android:id="@+id/pinHdrExpl"
\r
android:layout_width="wrap_content"
\r
android:layout_height="wrap_content"
\r
@@
-68,9
+69,10
@@
style="@style/PassCodeStyle" />
\r
</LinearLayout>
\r
\r
style="@style/PassCodeStyle" />
\r
</LinearLayout>
\r
\r
- <Button android:layout_width="wrap_content"
\r
+ <Button
\r
+ android:id="@+id/cancel"
\r
+ android:layout_width="wrap_content"
\r
android:layout_height="wrap_content"
\r
android:layout_height="wrap_content"
\r
- android:text="@string/common_cancel"
\r
- android:textColor="@android:color/black"
\r
- android:id="@+id/cancel"/>
\r
+ android:text="@string/common_cancel" />
\r
+
\r
</LinearLayout>
\r
</LinearLayout>
\r