diff options
| author | Trevor Johns <trevor@sparkledog.net> | 2015-01-29 11:19:23 +1100 |
|---|---|---|
| committer | Trevor Johns <trevor@sparkledog.net> | 2015-01-29 11:19:23 +1100 |
| commit | d7bab489f24cae9d33f84295e0820ebbb3f3ad4c (patch) | |
| tree | 3c93ffece8f8cfee376292a78b6e22a182bc343a | |
| parent | 3dd9e15b0641adc415035af07c8cae9d780a2091 (diff) | |
| parent | dd7ed72a7eb2d223203db079bd99d31c6ef3061e (diff) | |
| download | iosched-d7bab489f24cae9d33f84295e0820ebbb3f3ad4c.tar.gz | |
Merge pull request #119 from eeVoskos/master
Fix for crashing navigation item background drawable
| -rw-r--r-- | android/src/main/res/drawable-v21/selected_navdrawer_item_background.xml | 23 | ||||
| -rw-r--r-- | android/src/main/res/drawable/selected_navdrawer_item_background.xml | 11 |
2 files changed, 26 insertions, 8 deletions
diff --git a/android/src/main/res/drawable-v21/selected_navdrawer_item_background.xml b/android/src/main/res/drawable-v21/selected_navdrawer_item_background.xml new file mode 100644 index 0000000..88a1670 --- /dev/null +++ b/android/src/main/res/drawable-v21/selected_navdrawer_item_background.xml @@ -0,0 +1,23 @@ +<!-- + Copyright 2014 Google Inc. All rights reserved. + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. + --> +<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> + <item> + <shape> + <solid android:color="#12000000" /> + </shape> + </item> + <item android:drawable="?android:selectableItemBackground" /> +</layer-list>
\ No newline at end of file diff --git a/android/src/main/res/drawable/selected_navdrawer_item_background.xml b/android/src/main/res/drawable/selected_navdrawer_item_background.xml index 88a1670..8345b37 100644 --- a/android/src/main/res/drawable/selected_navdrawer_item_background.xml +++ b/android/src/main/res/drawable/selected_navdrawer_item_background.xml @@ -13,11 +13,6 @@ See the License for the specific language governing permissions and limitations under the License. --> -<layer-list xmlns:android="http://schemas.android.com/apk/res/android"> - <item> - <shape> - <solid android:color="#12000000" /> - </shape> - </item> - <item android:drawable="?android:selectableItemBackground" /> -</layer-list>
\ No newline at end of file +<shape xmlns:android="http://schemas.android.com/apk/res/android"> + <solid android:color="#12000000" /> +</shape>
\ No newline at end of file |