projects
/
pub
/
Android
/
ownCloud.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'material_buttons' of https://github.com/owncloud/android into material_fab
[pub/Android/ownCloud.git]
/
res
/
layout
/
passcodelock.xml
diff --git
a/res/layout/passcodelock.xml
b/res/layout/passcodelock.xml
index
52a0d30
..
14c3cf6
100644
(file)
--- a/
res/layout/passcodelock.xml
+++ b/
res/layout/passcodelock.xml
@@
-82,7
+82,7
@@
<android.support.v7.widget.AppCompatButton
android:id="@+id/cancel"
<android.support.v7.widget.AppCompatButton
android:id="@+id/cancel"
-
style="@style/ownCloud.Button
"
+
android:theme="@style/Button.Primary
"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/common_cancel" />
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/common_cancel" />