diff options
| author | Andrew Lee <anwlee@google.com> | 2014-05-30 21:15:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-30 21:15:32 +0000 |
| commit | 4f6169980eeffeca0caa5d97203daa603563ceb2 (patch) | |
| tree | 9c617d8e643c3f6f7453dd187edd11a5f2b08c95 /res | |
| parent | f61fbfa3ed742027ffbefdf255d498e6a37c31dd (diff) | |
| parent | 3a406566ee0753a50dac2a376ebb598baf08e4dd (diff) | |
am 3a406566: Merge "Add dynamically scrolling underline to view pager tabs." into lmp-preview-dev
* commit '3a406566ee0753a50dac2a376ebb598baf08e4dd':
Add dynamically scrolling underline to view pager tabs.
Diffstat (limited to 'res')
| -rw-r--r-- | res/drawable/view_pager_tab_background.xml | 25 | ||||
| -rw-r--r-- | res/values/colors.xml | 4 |
2 files changed, 28 insertions, 1 deletions
diff --git a/res/drawable/view_pager_tab_background.xml b/res/drawable/view_pager_tab_background.xml new file mode 100644 index 000000000..7dae671ad --- /dev/null +++ b/res/drawable/view_pager_tab_background.xml @@ -0,0 +1,25 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- + ~ Copyright (C) 2014 The Android Open Source 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 + --> +<ripple xmlns:android="http://schemas.android.com/apk/res/android" + android:tint="@color/tab_ripple_color"> + <item> + <selector> + <item android:state_focused="true" + android:drawable="@drawable/tab_unselected_focused" /> + </selector> + </item> +</ripple>
\ No newline at end of file diff --git a/res/values/colors.xml b/res/values/colors.xml index c79f4cff4..8bba479c7 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -100,6 +100,8 @@ <!-- Color for icons in the actionbar --> <color name="actionbar_icon_color">#ffffff</color> - <!-- 10% opacity, theme color. --> <color name="dialer_dialpad_touch_tint">#1a1dc7db</color> + + <color name="tab_ripple_color">@color/dialer_accent_color</color> + <color name="tab_selected_underline_color">@color/dialer_accent_color</color> </resources> |