diff options
| author | steckbrief <steckbrief@chefmail.de> | 2016-03-11 23:51:10 +0100 |
|---|---|---|
| committer | steckbrief <steckbrief@chefmail.de> | 2016-03-11 23:51:10 +0100 |
| commit | 3041cc74cefb4a25f4d1af7109fcb141ec3293d8 (patch) | |
| tree | 8eee0b9b56dd6ccbdecc2029a09166f9baf571a0 /src/main/res/drawable/switch_back_on.xml | |
| parent | 864bb77883b2f5d9f9122c102faa4af89d589653 (diff) | |
| parent | a4444026444c75678db1663e01de05df225cd9ed (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/drawable/switch_back_on.xml')
| -rw-r--r-- | src/main/res/drawable/switch_back_on.xml | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/src/main/res/drawable/switch_back_on.xml b/src/main/res/drawable/switch_back_on.xml deleted file mode 100644 index 45117a98..00000000 --- a/src/main/res/drawable/switch_back_on.xml +++ /dev/null @@ -1,16 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_enabled="false"> - <shape android:shape="rectangle"> - <solid android:color="#D5D5D5"/> - <corners android:radius="99dp"/> - </shape> - </item> - <item android:state_enabled="true"> - <shape android:shape="rectangle"> - <!-- 30% accent on white --> - <solid android:color="#b3ddf7"/> - <corners android:radius="99dp"/> - </shape> - </item> -</selector>
\ No newline at end of file |