summaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorYorke Lee <yorkelee@google.com>2014-04-16 16:08:56 -0700
committerYorke Lee <yorkelee@google.com>2014-04-16 16:10:01 -0700
commit0e8b0318a91143ad505cbf173a3f75a25a338696 (patch)
treef719ad7931a12e76716cb8d0f09c1154481c2af1 /res
parenteea6a884c719f4926ed7e2f4d47ce7d18df81b48 (diff)
Remove deprecated Actionbar tabs in CallLogActivity
Bug: 10510027 Change-Id: I05e9ee28b1bac74cf5f0dad349bce94659118fee
Diffstat (limited to 'res')
-rw-r--r--res/layout/call_log_activity.xml18
-rw-r--r--res/values/strings.xml6
2 files changed, 17 insertions, 7 deletions
diff --git a/res/layout/call_log_activity.xml b/res/layout/call_log_activity.xml
index 5a50823e4..6934fee48 100644
--- a/res/layout/call_log_activity.xml
+++ b/res/layout/call_log_activity.xml
@@ -14,12 +14,22 @@
limitations under the License.
-->
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:id="@+id/calllog_frame">
+ android:id="@+id/calllog_frame"
+ android:orientation="vertical">
+ <com.android.dialer.list.ViewPagerTabs
+ android:id="@+id/viewpager_header"
+ android:layout_width="match_parent"
+ android:layout_height="?android:attr/actionBarSize"
+ android:textAllCaps="true"
+ android:orientation="horizontal"
+ android:layout_gravity="top"
+ style="@style/DialtactsActionBarTabTextStyle" />
<android.support.v4.view.ViewPager
android:id="@+id/call_log_pager"
android:layout_width="match_parent"
- android:layout_height="match_parent"/>
-</FrameLayout>
+ android:layout_height="0dp"
+ android:layout_weight="1"/>
+</LinearLayout>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index d36af78ee..4832ee9df 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -698,15 +698,15 @@
<string name="dialpad_pound_letters"></string>
<!-- Title for the call log tab containing the list of all voicemails and calls
- [CHAR LIMIT=15] -->
+ [CHAR LIMIT=30] -->
<string name="call_log_all_title">All</string>
<!-- Title for the call log tab containing the list of all missed calls only
- [CHAR LIMIT=15] -->
+ [CHAR LIMIT=30] -->
<string name="call_log_missed_title">Missed</string>
<!-- Title for the call log tab containing the list of all voicemail calls only
- [CHAR LIMIT=15] -->
+ [CHAR LIMIT=30] -->
<string name="call_log_voicemail_title">Voicemail</string>
<string name="tab_speed_dial">Speed Dial</string>