diff options
| author | Richard MacGregor <rmacgregor@cyngn.com> | 2015-08-06 16:54:07 -0700 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2016-11-02 21:16:10 -0700 |
| commit | 8f4c557f583c63bb95fdb3528bab4eb1cd96443d (patch) | |
| tree | 73802deeebbfd3f68a72399d10ef9bc8bf6a33dd | |
| parent | b99469b09cecf59488fa044919d3e9f1d24c312f (diff) | |
| download | android_packages_apps_CMFileManager-8f4c557f583c63bb95fdb3528bab4eb1cd96443d.tar.gz android_packages_apps_CMFileManager-8f4c557f583c63bb95fdb3528bab4eb1cd96443d.tar.bz2 android_packages_apps_CMFileManager-8f4c557f583c63bb95fdb3528bab4eb1cd96443d.zip | |
Fix navigation view background and selection ripples
Change-Id: I68eb5c7f433175c6fa11a449bd6043916cb64ded
| -rw-r--r-- | res/drawable/navigation_item_background.xml | 22 | ||||
| -rw-r--r-- | res/layout/navigation_view_details.xml | 11 | ||||
| -rw-r--r-- | res/layout/navigation_view_simple.xml | 1 |
3 files changed, 27 insertions, 7 deletions
diff --git a/res/drawable/navigation_item_background.xml b/res/drawable/navigation_item_background.xml index 2b959ea4..e1dd74f9 100644 --- a/res/drawable/navigation_item_background.xml +++ b/res/drawable/navigation_item_background.xml @@ -1,5 +1,19 @@ <?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android" > +<!-- Copyright (C) 2015 The CyanogenMod Project + + 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. + --> +<selector xmlns:android="http://schemas.android.com/apk/res/android"> <item android:state_selected="true" android:drawable="@color/navigation_view_item_selected_fill"/> @@ -9,5 +23,9 @@ <item android:state_activated="true" android:drawable="@color/navigation_view_item_selected_fill"/> - <item android:drawable="@color/navigation_view_item_default_fill"/> + <ripple android:color="?android:colorControlHighlight"> + <item android:id="@android:id/mask"> + <color android:color="@color/navigation_view_item_default_fill" /> + </item> + </ripple> </selector>
\ No newline at end of file diff --git a/res/layout/navigation_view_details.xml b/res/layout/navigation_view_details.xml index ec9c6697..cf137c3d 100644 --- a/res/layout/navigation_view_details.xml +++ b/res/layout/navigation_view_details.xml @@ -15,8 +15,9 @@ --> <com.cyanogenmod.filemanager.ui.widgets.FlingerListView - xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/navigation_view_layout" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:divider="@null" /> + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/navigation_view_layout" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:background="@color/navigation_view_item_default_fill" + android:divider="@null" /> diff --git a/res/layout/navigation_view_simple.xml b/res/layout/navigation_view_simple.xml index 1ebe95d8..cf137c3d 100644 --- a/res/layout/navigation_view_simple.xml +++ b/res/layout/navigation_view_simple.xml @@ -19,4 +19,5 @@ android:id="@+id/navigation_view_layout" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/navigation_view_item_default_fill" android:divider="@null" /> |