Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 1d1bd0da authored by Ihab Awad's avatar Ihab Awad
Browse files

Rename Telecomm "Subscription" to "Account" (3/7) 

Change-Id: I866e9d4f629a2b23acb3d3d3f2baeb0a674522f7
parent e9b92901

res/layout/call_log_list_item.xml

+1 −1
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ 
                        android:layout_gravity="center_vertical"

                        />

                    <ImageView

                        android:id="@+id/call_subscription_icon"

                        android:id="@+id/call_account_icon"

                        android:layout_width="@dimen/call_provider_small_icon_size"

                        android:layout_height="@dimen/call_provider_small_icon_size"

                        android:layout_marginEnd="@dimen/call_log_icon_margin"

res/menu/dialpad_options.xml

+2 −2
Original line number Diff line number Diff line
@@ -19,8 +19,8 @@ 
        android:title="@string/add_contact"

        android:showAsAction="withText" />

    <item

        android:id="@+id/menu_select_subscription"

        android:title="@string/menu_select_subscription"

        android:id="@+id/menu_select_account"

        android:title="@string/menu_select_account"

        android:showAsAction="withText" />

    <item

        android:id="@+id/menu_2s_pause"

res/menu/dialtacts_options.xml

+2 −2
Original line number Diff line number Diff line
@@ -20,8 +20,8 @@ 
        android:icon="@drawable/ic_menu_history_lt"

        android:title="@string/action_menu_call_history_description" />

    <item

        android:id="@+id/menu_select_subscription"

        android:title="@string/menu_select_subscription" />

        android:id="@+id/menu_select_account"

        android:title="@string/menu_select_account" />

    <item

        android:id="@+id/menu_import_export"

        android:title="@string/menu_import_export" />

res/values/strings.xml

+2 −2
Original line number Diff line number Diff line
@@ -326,8 +326,8 @@ 
    <string name="add_2sec_pause">Add 2-sec pause</string>

    <string name="add_wait">Add wait</string>



    <!-- Menu item to select subscription (connection provider) to place call from [CHAR LIMIT=30] -->

    <string name="menu_select_subscription">Select Subscription</string>

    <!-- Menu item to select account used to make phone calls [CHAR LIMIT=30] -->

    <string name="menu_select_account">Select Account</string>



    <!-- Menu item label for call settings [CHAR LIMIT=30] -->

    <string name="call_settings">Settings</string>

src/com/android/dialer/CallDetailActivity.java

+10 −11
Original line number Diff line number Diff line
@@ -32,7 +32,6 @@ import android.provider.CallLog; 
import android.provider.CallLog.Calls;

import android.provider.ContactsContract.CommonDataKinds.Phone;

import android.provider.VoicemailContract.Voicemails;

import android.telecomm.Subscription;

import android.telephony.TelephonyManager;

import android.text.TextUtils;

import android.util.Log;
@@ -196,8 +195,8 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware 
        CallLog.Calls.COUNTRY_ISO,

        CallLog.Calls.GEOCODED_LOCATION,

        CallLog.Calls.NUMBER_PRESENTATION,

        CallLog.Calls.SUBSCRIPTION_COMPONENT_NAME,

        CallLog.Calls.SUBSCRIPTION_ID,

        CallLog.Calls.ACCOUNT_COMPONENT_NAME,

        CallLog.Calls.ACCOUNT_ID,

    };



    static final int DATE_COLUMN_INDEX = 0;
@@ -207,8 +206,8 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware 
    static final int COUNTRY_ISO_COLUMN_INDEX = 4;

    static final int GEOCODED_LOCATION_COLUMN_INDEX = 5;

    static final int NUMBER_PRESENTATION_COLUMN_INDEX = 6;

    static final int SUBSCRIPTION_COMPONENT_NAME = 7;

    static final int SUBSCRIPTION_ID = 8;

    static final int ACCOUNT_COMPONENT_NAME = 7;

    static final int ACCOUNT_ID = 8;



    @Override

    protected void onCreate(Bundle icicle) {
@@ -487,7 +486,7 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware 
            final int callType = callCursor.getInt(CALL_TYPE_COLUMN_INDEX);

            String countryIso = callCursor.getString(COUNTRY_ISO_COLUMN_INDEX);

            final String geocode = callCursor.getString(GEOCODED_LOCATION_COLUMN_INDEX);

            final Drawable subscriptionIcon = getSubscriptionIcon(callCursor);

            final Drawable accountIcon = getAccountIcon(callCursor);



            if (TextUtils.isEmpty(countryIso)) {

                countryIso = mDefaultCountryIso;
@@ -530,7 +529,7 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware 
                    formattedNumber, countryIso, geocode,

                    new int[]{ callType }, date, duration,

                    nameText, numberType, numberLabel, lookupUri, photoUri, sourceType,

                    subscriptionIcon);

                    accountIcon);

        } finally {

            if (callCursor != null) {

                callCursor.close();
@@ -539,11 +538,11 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware 
    }



    /**

     * Generate subscription object from data in Telecomm database

     * Generate account object from data in Telecomm database

     */

    private Drawable getSubscriptionIcon(Cursor c) {

        final String component_name = c.getString(SUBSCRIPTION_COMPONENT_NAME);

        final String subscription_id = c.getString(SUBSCRIPTION_ID);

    private Drawable getAccountIcon(Cursor c) {

        final String component_name = c.getString(ACCOUNT_COMPONENT_NAME);

        final String account_id = c.getString(ACCOUNT_ID);



        // TODO: actually pull data from the database

        return null;