diff options
author | Brian Attwell <brianattwell@google.com> | 2014-07-21 14:55:10 -0700 |
---|---|---|
committer | Brian Attwell <brianattwell@google.com> | 2014-07-22 12:05:21 -0700 |
commit | 7437058d4c9fd10fdeb4e78166591e68629cd03c (patch) | |
tree | 730819071403f42d11b09b56fe68de759334b0e8 /res | |
parent | 80c81b1170c692cccdfe76f695fee74525e04a75 (diff) |
Move ViewPagerTabs out of Dialer repo
Bug: 16158921
Bug: 15616182
Change-Id: Ie648d78dd4df402936c4665eca7c6998e463ca2b
Diffstat (limited to 'res')
-rw-r--r-- | res/drawable/view_pager_tab_background.xml | 22 | ||||
-rw-r--r-- | res/layout/call_log_activity.xml | 2 | ||||
-rw-r--r-- | res/layout/lists_fragment.xml | 2 | ||||
-rw-r--r-- | res/values/colors.xml | 3 | ||||
-rw-r--r-- | res/values/dimens.xml | 1 |
5 files changed, 2 insertions, 28 deletions
diff --git a/res/drawable/view_pager_tab_background.xml b/res/drawable/view_pager_tab_background.xml deleted file mode 100644 index 1ba6c57e0..000000000 --- a/res/drawable/view_pager_tab_background.xml +++ /dev/null @@ -1,22 +0,0 @@ -<?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:color="@color/tab_ripple_color"> - <item android:id="@android:id/mask"> - <color android:color="@android:color/white" /> - </item> -</ripple>
\ No newline at end of file diff --git a/res/layout/call_log_activity.xml b/res/layout/call_log_activity.xml index 3b7609fae..0109df7d6 100644 --- a/res/layout/call_log_activity.xml +++ b/res/layout/call_log_activity.xml @@ -19,7 +19,7 @@ android:layout_height="match_parent" android:id="@+id/calllog_frame" android:orientation="vertical"> - <com.android.dialer.list.ViewPagerTabs + <com.android.contacts.common.list.ViewPagerTabs android:id="@+id/viewpager_header" android:layout_width="match_parent" android:layout_height="@dimen/tab_height" diff --git a/res/layout/lists_fragment.xml b/res/layout/lists_fragment.xml index 1de8364b7..987c61f99 100644 --- a/res/layout/lists_fragment.xml +++ b/res/layout/lists_fragment.xml @@ -40,7 +40,7 @@ android:layout_height="match_parent" android:orientation="vertical"> - <com.android.dialer.list.ViewPagerTabs + <com.android.contacts.common.list.ViewPagerTabs android:id="@+id/lists_pager_header" android:layout_width="match_parent" android:layout_height="@dimen/tab_height" diff --git a/res/values/colors.xml b/res/values/colors.xml index 0b75de5d0..d7a929fda 100644 --- a/res/values/colors.xml +++ b/res/values/colors.xml @@ -93,7 +93,4 @@ <color name="actionbar_icon_color">#ffffff</color> <color name="dialer_dialpad_touch_tint">#331dc7db</color> - - <color name="tab_ripple_color">@color/dialer_accent_color</color> - <color name="tab_selected_underline_color">@color/dialer_accent_color</color> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index cdeff85bd..b7aceef28 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -84,7 +84,6 @@ room to the search box--> <dimen name="action_bar_height">64dp</dimen> <dimen name="tab_height">43dp</dimen> - <dimen name="tab_elevation">2dp</dimen> <!-- actionbar height + tab height --> <dimen name="actionbar_and_tab_height">107dp</dimen> |