diff options
| -rw-r--r-- | AndroidManifest.xml | 2 | ||||
| -rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 14 | ||||
| -rw-r--r-- | src/com/android/dialer/list/RegularSearchFragment.java | 35 |
3 files changed, 43 insertions, 8 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 48eae66fa..684e29a8a 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -89,7 +89,7 @@ android:clearTaskOnLaunch="true" android:icon="@mipmap/ic_launcher_phone" android:enabled="@*android:bool/config_voice_capable" - android:windowSoftInputMode="adjustResize"> + android:windowSoftInputMode="stateAlwaysHidden|adjustResize"> <intent-filter> <action android:name="android.intent.action.DIAL" /> <category android:name="android.intent.category.DEFAULT" /> diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index 9196c2642..a1c1ecc35 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -104,6 +104,7 @@ import com.android.dialerbind.DatabaseHelperManager; import com.android.internal.telephony.TelephonyIntents; import com.android.phone.common.animation.AnimUtils; import com.android.phone.common.ambient.AmbientConnection; +import com.android.phone.common.dialpad.CreditBarHelper; import com.android.phone.common.incall.CallMethodInfo; import com.android.phone.common.incall.CallMethodHelper; import com.android.phone.common.incall.CallMethodSpinnerAdapter; @@ -873,6 +874,15 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O ft.show(mDialpadFragment); } + CreditBarHelper.CreditBarVisibilityListener cbvl = + new CreditBarHelper.CreditBarVisibilityListener() { + @Override + public void creditsBarVisibilityChanged(int visibility) { + // do nothing yet + } + }; + CreditBarHelper.clearCallRateInformation(getGlobalCreditsBar(), cbvl); + if (mCurrentCallMethod != null && mDialpadFragment.isAdded()) { // ensure the call method is updated in the fragment mDialpadFragment.onCallMethodChanged(mCurrentCallMethod); @@ -937,6 +947,10 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O commitDialpadFragmentHide(); } + if (mInRegularSearch) { + mRegularSearchFragment.updateCallCreditInfo(); + } + mActionBarController.onDialpadDown(); if (isInSearchUi()) { diff --git a/src/com/android/dialer/list/RegularSearchFragment.java b/src/com/android/dialer/list/RegularSearchFragment.java index ca1d56f33..c6e24a33e 100644 --- a/src/com/android/dialer/list/RegularSearchFragment.java +++ b/src/com/android/dialer/list/RegularSearchFragment.java @@ -58,6 +58,23 @@ public class RegularSearchFragment extends SearchFragment } @Override + public void onPause() { + super.onPause(); + + DialtactsActivity da = (DialtactsActivity) getActivity(); + if (da != null) { + CreditBarHelper.clearCallRateInformation(da.getGlobalCreditsBar(), this); + } + } + + @Override + public void onResume() { + super.onResume(); + + updateCallCreditInfo(); + } + + @Override public void onStart() { super.onStart(); AnalyticsUtil.sendScreenView(this); @@ -81,14 +98,18 @@ public class RegularSearchFragment extends SearchFragment public void setCurrentCallMethod(CallMethodInfo cmi) { super.setCurrentCallMethod(cmi); + updateCallCreditInfo(); + } + + public void updateCallCreditInfo() { DialtactsActivity da = (DialtactsActivity) getActivity(); - if (da == null && !isAdded()) { - return; - } - if (cmi != null && cmi.mIsInCallProvider) { - CreditBarHelper.callMethodCredits(da.getGlobalCreditsBar(), cmi, getResources(), this); - } else { - CreditBarHelper.clearCallRateInformation(da.getGlobalCreditsBar(), this); + if (da != null) { + CallMethodInfo cmi = getCurrentCallMethod(); + if (cmi != null && cmi.mIsInCallProvider && !da.isDialpadShown()) { + CreditBarHelper.callMethodCredits(da.getGlobalCreditsBar(), cmi, getResources(), this); + } else { + CreditBarHelper.clearCallRateInformation(da.getGlobalCreditsBar(), this); + } } } |