aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res/values
diff options
context:
space:
mode:
authorsteckbrief <steckbrief@chefmail.de>2016-03-11 23:51:10 +0100
committersteckbrief <steckbrief@chefmail.de>2016-03-11 23:51:10 +0100
commit3041cc74cefb4a25f4d1af7109fcb141ec3293d8 (patch)
tree8eee0b9b56dd6ccbdecc2029a09166f9baf571a0 /src/main/res/values
parent864bb77883b2f5d9f9122c102faa4af89d589653 (diff)
parenta4444026444c75678db1663e01de05df225cd9ed (diff)
Merge remote-tracking branch 'remotes/origin/trz/rename' into trz/rebase
Conflicts: src/main/java/eu/siacs/conversations/ui/XmppActivity.java src/main/java/eu/siacs/conversations/ui/adapter/AccountAdapter.java src/main/java/eu/siacs/conversations/ui/widget/Switch.java src/main/res/layout/account_row.xml src/main/res/layout/contact_key.xml
Diffstat (limited to 'src/main/res/values')
-rw-r--r--src/main/res/values/styles.xml13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml
index e8572d9d..450cf183 100644
--- a/src/main/res/values/styles.xml
+++ b/src/main/res/values/styles.xml
@@ -4,18 +4,5 @@
<item name="android:layout_height">1.5dp</item>
<item name="android:background">@color/black12</item>
</style>
- <style name="MD">
- <item name="animationVelocity">6</item>
- <item name="insetBottom">16dp</item>
- <item name="insetTop">16dp</item>
- <item name="insetLeft">16dp</item>
- <item name="insetRight">16dp</item>
- <item name="measureFactor">1.4</item>
- <item name="offDrawable">@drawable/switch_back_off</item>
- <item name="onDrawable">@drawable/switch_back_on</item>
- <item name="thumbDrawable">@drawable/switch_thumb</item>
- <item name="thumb_margin">-17dp</item>
- <item name="android:padding">16dp</item>
- </style>
</resources> \ No newline at end of file