am 0e8b0318: Remove deprecated Actionbar tabs in CallLogActivity
* commit '0e8b0318a91143ad505cbf173a3f75a25a338696':
Remove deprecated Actionbar tabs in CallLogActivity
diff --git a/res/layout/call_log_activity.xml b/res/layout/call_log_activity.xml
index 5a50823..6934fee 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 76979ab..e901cb6 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>
diff --git a/src/com/android/dialer/calllog/CallLogActivity.java b/src/com/android/dialer/calllog/CallLogActivity.java
index eb1f45e..cdd0baf 100644
--- a/src/com/android/dialer/calllog/CallLogActivity.java
+++ b/src/com/android/dialer/calllog/CallLogActivity.java
@@ -19,21 +19,18 @@
import android.app.Activity;
import android.app.Fragment;
import android.app.FragmentManager;
-import android.app.ActionBar.Tab;
-import android.app.ActionBar.TabListener;
-import android.app.FragmentTransaction;
import android.content.Intent;
import android.os.Bundle;
import android.provider.CallLog.Calls;
import android.support.v13.app.FragmentPagerAdapter;
import android.support.v4.view.ViewPager;
-import android.support.v4.view.ViewPager.OnPageChangeListener;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import com.android.dialer.DialtactsActivity;
import com.android.dialer.R;
+import com.android.dialer.list.ViewPagerTabs;
public class CallLogActivity extends Activity {
@@ -43,6 +40,8 @@
private CallLogFragment mMissedCallsFragment;
private CallLogFragment mVoicemailFragment;
+ private String[] mTabTitles;
+
private static final int TAB_INDEX_ALL = 0;
private static final int TAB_INDEX_MISSED = 1;
private static final int TAB_INDEX_VOICEMAIL = 2;
@@ -71,45 +70,16 @@
}
@Override
+ public CharSequence getPageTitle(int position) {
+ return mTabTitles[position];
+ }
+
+ @Override
public int getCount() {
return TAB_INDEX_COUNT;
}
}
- private final TabListener mTabListener = new TabListener() {
- @Override
- public void onTabUnselected(Tab tab, FragmentTransaction ft) {
- }
-
- @Override
- public void onTabSelected(Tab tab, FragmentTransaction ft) {
- if (mViewPager != null && mViewPager.getCurrentItem() != tab.getPosition()) {
- mViewPager.setCurrentItem(tab.getPosition(), true);
- }
- }
-
- @Override
- public void onTabReselected(Tab tab, FragmentTransaction ft) {
- }
- };
-
- private final OnPageChangeListener mOnPageChangeListener = new OnPageChangeListener() {
-
- @Override
- public void onPageScrolled(
- int position, float positionOffset, int positionOffsetPixels) {}
-
- @Override
- public void onPageSelected(int position) {
- final ActionBar actionBar = getActionBar();
- actionBar.selectTab(actionBar.getTabAt(position));
- }
-
- @Override
- public void onPageScrollStateChanged(int arg0) {
- }
- };
-
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -118,20 +88,23 @@
getWindow().setBackgroundDrawable(null);
final ActionBar actionBar = getActionBar();
- actionBar.setNavigationMode(ActionBar.NAVIGATION_MODE_TABS);
actionBar.setDisplayShowHomeEnabled(true);
actionBar.setDisplayHomeAsUpEnabled(true);
actionBar.setDisplayShowTitleEnabled(true);
- addTab(actionBar, getString(R.string.call_log_all_title));
- addTab(actionBar, getString(R.string.call_log_missed_title));
- addTab(actionBar, getString(R.string.call_log_voicemail_title));
+ mTabTitles = new String[TAB_INDEX_COUNT];
+ mTabTitles[0] = getString(R.string.call_log_all_title);
+ mTabTitles[1] = getString(R.string.call_log_missed_title);
+ mTabTitles[2] = getString(R.string.call_log_voicemail_title);
mViewPager = (ViewPager) findViewById(R.id.call_log_pager);
+
mViewPagerAdapter = new ViewPagerAdapter(getFragmentManager());
mViewPager.setAdapter(mViewPagerAdapter);
- mViewPager.setOnPageChangeListener(mOnPageChangeListener);
mViewPager.setOffscreenPageLimit(2);
+
+ ViewPagerTabs tabs = (ViewPagerTabs) findViewById(R.id.viewpager_header);
+ tabs.setViewPager(mViewPager);
}
@Override
@@ -167,12 +140,4 @@
}
return super.onOptionsItemSelected(item);
}
-
- private void addTab(ActionBar actionBar, String title) {
- final Tab tab = actionBar.newTab();
- tab.setContentDescription(title);
- tab.setText(title);
- tab.setTabListener(mTabListener);
- actionBar.addTab(tab);
- }
}
\ No newline at end of file