diff options
author | Ryan Hansberry <hansberry@google.com> | 2015-09-17 13:09:48 -0700 |
---|---|---|
committer | Ryan Hansberry <hansberry@google.com> | 2015-09-17 13:09:48 -0700 |
commit | 83673e2a25130eea74faf0d3ae01c1786449d481 (patch) | |
tree | 20e9a74af1b5203ede4fa7652f7f52e166cd7abc /app/src/main/res/values | |
parent | f8a77f6d7ee4e8093525a9c5da4bb80fa41a1e72 (diff) | |
parent | afaf6ea6a1a06a8b11fcbd75faa94e65049fabfe (diff) | |
download | connectbot-83673e2a25130eea74faf0d3ae01c1786449d481.tar.gz connectbot-83673e2a25130eea74faf0d3ae01c1786449d481.tar.bz2 connectbot-83673e2a25130eea74faf0d3ae01c1786449d481.zip |
Merge branch 'master' into use-switches-not-checkboxes
Diffstat (limited to 'app/src/main/res/values')
-rw-r--r-- | app/src/main/res/values/styles.xml | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index b73a4a6..322f5e1 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -70,6 +70,9 @@ <item name="android:textColor">@color/blue</item> </style> + <!-- This value is overridden for v11 and higher, but left empty here. --> + <style name="SelectableItem"></style> + <style name="SwitchCompatTheme" parent="Theme.AppCompat"> <item name="colorAccent">@color/accent</item> </style> |