Update SpinnerContent class from CM 13.

Change-Id: I5743da53e8e140131c3cfcb1ac23a363252d45ad

6 files changed, 35 insertions, 25 deletions

diff --git a/res/values-zh-rCN/strings.xml b/res/values-zh-rCN/strings.xml
index 14990d6ad..e06db32ba 100644
--- a/res/values-zh-rCN/strings.xml
+++ b/res/values-zh-rCN/strings.xml
@@ -291,8 +291,6 @@
     <string name="dialog_speed_dial_airplane_mode_message">关飞行模式后使用快速拨号</string>
     <string name="yes">是</string>
     <string name="no">否</string>
-    <string name="call_log_show_all_slots">"所有 SIM 卡"</string>
-    <string name="call_log_all_calls_header">"所有通话"</string>
     <string name="calllog_search_hint">"搜索通话记录"</string>
     <string name="no_call_log">没有通话记录</string>
     <string name="clear">清除</string>
diff --git a/res/values/cm_strings.xml b/res/values/cm_strings.xml
index 19255155c..1314f5e07 100644
--- a/res/values/cm_strings.xml
+++ b/res/values/cm_strings.xml
@@ -46,4 +46,8 @@
 
     <string name="speed_dial_edit_title">Edit speed dial <xliff:g id="index" example="2">%1$d</xliff:g></string>
     <string name="speed_dial_input_hint">Please enter a number</string>
+
+    <string name="call_log_show_all_slots">All SIMs</string>
+    <string name="call_log_all_calls_header">All calls</string>
+    <string name="call_log_blacklist_header">Blocked calls only</string>
 </resources>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 27f56b2a1..ad7f457d5 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1123,10 +1123,6 @@ e mode.</string>
 
     <string name="no">No</string>
 
-    <string name="call_log_show_all_slots">All SIMs</string>
-
-    <string name="call_log_all_calls_header">All calls</string>
-
     <!-- Text displayed when the list of incoming calls is empty -->
     <string name="recentIncoming_empty">You have no incoming calls.</string>
 
diff --git a/res/values/styles.xml b/res/values/styles.xml
index dbe32447a..7049ce013 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -440,11 +440,15 @@
     </style>
 
     <style name="CallLogSpinnerStyle">
-        <item name="android:textSize">@dimen/call_log_spinner_text_size</item>
+        <item name="android:textAppearance">?android:attr/textAppearanceSmall</item>
+        <item name="android:textStyle">bold</item>
+        <item name="android:textColor">@android:color/black</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:ellipsize">marquee</item>
         <item name="android:singleLine">true</item>
+        <item name="android:textAllCaps">true</item>
     </style>
+
     <style name="NOCallLOG">
         <item name="android:textStyle">bold</item>
         <item name="android:textColor">#000000</item>
diff --git a/src/com/android/dialer/calllog/MSimCallLogFragment.java b/src/com/android/dialer/calllog/MSimCallLogFragment.java
index 1eefe53ab..d94f5c247 100644
--- a/src/com/android/dialer/calllog/MSimCallLogFragment.java
+++ b/src/com/android/dialer/calllog/MSimCallLogFragment.java
@@ -630,7 +630,7 @@ public class MSimCallLogFragment extends Fragment implements CallLogQueryHandler
         // Update the status filter's content.
         ArrayAdapter<SpinnerContent> filterStatusAdapter = new ArrayAdapter<SpinnerContent>(
                 getActivity(), R.layout.msim_call_log_spinner_item,
-                SpinnerContent.setupStatusFilterContent(getActivity()));
+                SpinnerContent.setupStatusFilterContent(getActivity(), false));
         mFilterStatusSpinnerView.setAdapter(filterStatusAdapter);
         mFilterStatusSpinnerView.setOnItemSelectedListener(mStatusSelectedListener);
         SpinnerContent.setSpinnerContentValue(mFilterStatusSpinnerView, mCallTypeFilter);
diff --git a/src/com/android/dialer/calllog/SpinnerContent.java b/src/com/android/dialer/calllog/SpinnerContent.java
index 43bdbbb7a..f8d1f3f78 100644
--- a/src/com/android/dialer/calllog/SpinnerContent.java
+++ b/src/com/android/dialer/calllog/SpinnerContent.java
@@ -1,6 +1,4 @@
 /*
- * Copyright (c) 2016, The Linux Foundation. All rights reserved
- * Not a Contribution.
  * Copyright (C) 2014 The CyanogenMod Project
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,11 +17,10 @@ package com.android.dialer.calllog;
 
 import android.content.Context;
 import android.provider.CallLog;
-import android.telephony.TelephonyManager;
+import android.telecom.PhoneAccountHandle;
 import android.text.TextUtils;
 import android.util.Log;
 import android.widget.Spinner;
-import android.telecom.PhoneAccountHandle;
 
 import com.android.contacts.common.MoreContactUtils;
 import com.android.dialer.R;
@@ -35,15 +32,18 @@ import java.util.List;
  * To save the spinner content.
  */
 public class SpinnerContent {
-    private static String TAG = "SpinnerContent";
+    private static String TAG = SpinnerContent.class.getSimpleName();
 
     public final int value;
-    private final String label;
+    public final String label;
+
     // The index for call type spinner.
     private static final int INDEX_CALL_TYPE_ALL = 0;
     private static final int INDEX_CALL_TYPE_INCOMING = 1;
     private static final int INDEX_CALL_TYPE_OUTGOING = 2;
     private static final int INDEX_CALL_TYPE_MISSED = 3;
+    private static final int INDEX_CALL_TYPE_BLOCKED = 4;
+    private static final int INDEX_CALL_TYPE_VOICEMAIL = 5;
 
     public static void setSpinnerContentValue(Spinner spinner, int value) {
         for (int i = 0, count = spinner.getCount(); i < count; i++) {
@@ -70,20 +70,17 @@ public class SpinnerContent {
      * @return the spinner contents for the different sims (all, sim0, sim1 etc)
      */
     public static List<SpinnerContent> setupSubFilterContent(Context context) {
-        TelephonyManager telephonyManager =
-                (TelephonyManager) context.getSystemService(Context.TELEPHONY_SERVICE);
-        int count = telephonyManager.getPhoneCount();
+        List<PhoneAccountHandle> accountHandles =
+                PhoneAccountUtils.getSubscriptionPhoneAccounts(context);
+        int count = accountHandles.size();
         // Update the filter sub content.
         ArrayList<SpinnerContent> values = new ArrayList<SpinnerContent>(count + 1);
         values.add(new SpinnerContent(CallLogQueryHandler.CALL_SUB_ALL,
                 context.getString(R.string.call_log_show_all_slots)));
-
-        List<PhoneAccountHandle>  mPhoneAccountHandle =
-                PhoneAccountUtils.getSubscriptionPhoneAccounts(context);
-        for (int i = 0; i < mPhoneAccountHandle.size(); i++) {
+        for (int i = 0; i < count; i++) {
             String subDisplayName = PhoneAccountUtils.getAccountLabel(context,
-                    mPhoneAccountHandle.get(i));
-            if (!TextUtils.isEmpty(subDisplayName) && subDisplayName.indexOf("Unknown") == -1) {
+                    accountHandles.get(i));
+            if (!TextUtils.isEmpty(subDisplayName)) {
                 values.add(new SpinnerContent(i, subDisplayName));
             }
         }
@@ -91,10 +88,13 @@ public class SpinnerContent {
     }
 
     /**
+     * @param voicemailAvailable true if voicemail should be included in the return values
      * @return the spinner contents for the different call types (incoming, outgoing etc)
      */
-    public static List<SpinnerContent> setupStatusFilterContent(Context context) {
-        int statusCount = 4;
+    public static List<SpinnerContent> setupStatusFilterContent(Context context,
+            boolean voicemailAvailable) {
+        // Didn't show the voice mail item if not available.
+        int statusCount = voicemailAvailable ? 6 : 5;
         ArrayList<SpinnerContent> values = new ArrayList<SpinnerContent>(statusCount);
         for (int i = 0; i < statusCount; i++) {
             int value = CallLogQueryHandler.CALL_TYPE_ALL;
@@ -116,6 +116,14 @@ public class SpinnerContent {
                     value = CallLog.Calls.MISSED_TYPE;
                     label = context.getString(R.string.call_log_missed_header);
                     break;
+                case INDEX_CALL_TYPE_BLOCKED:
+                    value = CallLog.Calls.BLOCKED_TYPE;
+                    label = context.getString(R.string.call_log_blacklist_header);
+                    break;
+                case INDEX_CALL_TYPE_VOICEMAIL:
+                    value = CallLog.Calls.VOICEMAIL_TYPE;
+                    label = context.getString(R.string.call_log_voicemail_header);
+                    break;
             }
             values.add(new SpinnerContent(value, label));
         }