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

Commit 15a2252a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Dialer: Add support for operator name" into atel.lnx.2.0-dev

parents 71ab49fd 48809a44

res/layout-land/dialpad_fragment.xml

+11 −0
Original line number Diff line number Diff line
@@ -81,6 +81,17 @@ 


            </FrameLayout>



            <TextView

                android:id="@+id/dialpad_floating_operator"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:layout_above="@id/dialpad_floating_action_button_margin_bottom"

                android:layout_toRightOf="@+id/dialpad_floating_action_button_container"

                android:textColor="?attr/call_log_secondary_text_color"

                android:textSize="12sp"

                android:singleLine="true"

                android:visibility="gone" />



        </RelativeLayout>



    </LinearLayout>

res/layout/dialpad_fragment.xml

+10 −0
Original line number Diff line number Diff line
@@ -73,4 +73,14 @@ 


    </FrameLayout>



    <TextView

        android:id="@+id/dialpad_floating_operator"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_below="@id/dialpad_floating_action_button_container"

        android:layout_centerHorizontal="true"

        android:textColor="?attr/call_log_secondary_text_color"

        android:textSize="12sp"

        android:singleLine="true"

        android:visibility="gone" />

</view>

src/com/android/dialer/dialpad/DialpadFragment.java

+13 −0
Original line number Diff line number Diff line
@@ -44,6 +44,7 @@ import android.provider.Settings; 
import android.telecom.PhoneAccount;

import android.telecom.PhoneAccountHandle;

import android.telephony.PhoneNumberUtils;

import android.telephony.SubscriptionManager;

import android.telephony.TelephonyManager;

import android.text.Editable;

import android.text.TextUtils;
@@ -71,6 +72,7 @@ import android.widget.TextView; 
import com.android.contacts.common.CallUtil;

import com.android.contacts.common.GeoUtil;

import com.android.contacts.common.dialog.CallSubjectDialog;

import com.android.contacts.common.MoreContactUtils;

import com.android.contacts.common.util.PermissionsUtil;

import com.android.contacts.common.util.PhoneNumberFormatter;

import com.android.contacts.common.util.StopWatch;
@@ -299,6 +301,7 @@ public class DialpadFragment extends Fragment 
    private boolean mStartedFromNewIntent = false;

    private boolean mFirstLaunch = false;

    private boolean mAnimate = false;

    private TextView mOperator;



    private static final String PREF_DIGITS_FILLED_BY_INTENT = "pref_digits_filled_by_intent";
@@ -450,6 +453,7 @@ public class DialpadFragment extends Fragment 
        floatingActionButton.setOnClickListener(this);

        mFloatingActionButtonController = new FloatingActionButtonController(getActivity(),

                floatingActionButtonContainer, floatingActionButton);

        mOperator = (TextView)fragmentView.findViewById(R.id.dialpad_floating_operator);

        Trace.endSection();

        Trace.endSection();

        return fragmentView;
@@ -760,6 +764,15 @@ public class DialpadFragment extends Fragment 
        }



        mFirstLaunch = false;



        if (MoreContactUtils.shouldShowOperator(getContext())) {

                mOperator.setVisibility(View.VISIBLE);

                mOperator.setText(MoreContactUtils.getNetworkSpnName(getContext(),

                    SubscriptionManager.getDefaultVoiceSubscriptionId()));

        } else {

            mOperator.setVisibility(View.GONE);

        }



        Trace.endSection();

    }