diff options
author | Fang Yunong <yunong@codeaurora.org> | 2016-07-21 12:06:52 +0800 |
---|---|---|
committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2016-08-25 23:17:35 -0700 |
commit | 48809a44bbd40933fcbc9bd0b8efd2c40e0958a2 (patch) | |
tree | 0d53179affadb5fda6027daa12eea16882a210fd | |
parent | b69e6e5dbbe1c9e6a2f308eff508c8fae36a1ca8 (diff) | |
download | android_packages_apps_Dialer-48809a44bbd40933fcbc9bd0b8efd2c40e0958a2.tar.gz android_packages_apps_Dialer-48809a44bbd40933fcbc9bd0b8efd2c40e0958a2.tar.bz2 android_packages_apps_Dialer-48809a44bbd40933fcbc9bd0b8efd2c40e0958a2.zip |
Dialer: Add support for operator name
Add operator name in dialer screen
Change-Id: I57003cea82dce7eebbfa417ce0cb04caefa1f8a1
CRs-Fixed: 1043367
-rw-r--r-- | res/layout-land/dialpad_fragment.xml | 11 | ||||
-rw-r--r-- | res/layout/dialpad_fragment.xml | 10 | ||||
-rw-r--r-- | src/com/android/dialer/dialpad/DialpadFragment.java | 13 |
3 files changed, 34 insertions, 0 deletions
diff --git a/res/layout-land/dialpad_fragment.xml b/res/layout-land/dialpad_fragment.xml index 70a38ae20..0639899ea 100644 --- a/res/layout-land/dialpad_fragment.xml +++ b/res/layout-land/dialpad_fragment.xml @@ -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> diff --git a/res/layout/dialpad_fragment.xml b/res/layout/dialpad_fragment.xml index 21cb58654..5748f5de1 100644 --- a/res/layout/dialpad_fragment.xml +++ b/res/layout/dialpad_fragment.xml @@ -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> diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java index bd61c8ff4..ea777229a 100644 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -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(); } |