PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix issue that the wifi calling text cannot be customized based on sim"

Browse Source
This commit is contained in:
Youming Ye
2019-02-22 21:53:12 +00:00
committed by Gerrit Code Review
parent b837a44716 82aa55bcda
commit 5b3ee7afaa
3 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
src/com/android/settings/wifi/calling/WifiCallingSettings.java
View File

@@ -29,6 +29,7 @@ import android.view.ViewGroup;
import com.android.ims.ImsManager;
import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
import com.android.internal.util.CollectionUtils;
import com.android.settings.R;
import com.android.settings.core.InstrumentedFragment;
import com.android.settings.search.actionbar.SearchMenuController;
@@ -52,6 +53,24 @@ public class WifiCallingSettings extends InstrumentedFragment implements HelpRes
private WifiCallingViewPagerAdapter mPagerAdapter;
private SlidingTabLayout mTabLayout;
private final class InternalViewPagerListener implements
RtlCompatibleViewPager.OnPageChangeListener {
@Override
public void onPageScrolled(int position, float positionOffset, int positionOffsetPixels) {
// Do nothing.
}
@Override
public void onPageSelected(int position) {
updateTitleForCurrentSub();
}
@Override
public void onPageScrollStateChanged(int state) {
// Do nothing.
}
}
@Override
public int getMetricsCategory() {
return MetricsEvent.WIFI_CALLING;
@@ -67,6 +86,7 @@ public class WifiCallingSettings extends InstrumentedFragment implements HelpRes
mPagerAdapter = new WifiCallingViewPagerAdapter(getChildFragmentManager(), mViewPager);
mViewPager.setAdapter(mPagerAdapter);
mViewPager.addOnPageChangeListener(new InternalViewPagerListener());
return view;
}
@@ -92,6 +112,8 @@ public class WifiCallingSettings extends InstrumentedFragment implements HelpRes
} else {
mTabLayout.setVisibility(View.GONE);
}
updateTitleForCurrentSub();
}
@Override
@@ -162,4 +184,13 @@ public class WifiCallingSettings extends InstrumentedFragment implements HelpRes
}
}
}
private void updateTitleForCurrentSub() {
if (CollectionUtils.size(mSil) > 1) {
final int subId = mSil.get(mViewPager.getCurrentItem()).getSubscriptionId();
final String title = SubscriptionManager.getResourcesForSubId(getContext(), subId)
.getString(R.string.wifi_calling_settings_title);
getActivity().getActionBar().setTitle(title);
}
}
}

6
src/com/android/settings/wifi/calling/WifiCallingSettingsForSub.java
View File

@@ -23,6 +23,7 @@ import android.content.ComponentName;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
import android.content.res.Resources;
import android.os.Bundle;
import android.os.PersistableBundle;
import androidx.preference.ListPreference;
@@ -174,8 +175,9 @@ public class WifiCallingSettingsForSub extends SettingsPreferenceFragment
mEmptyView = getView().findViewById(android.R.id.empty);
setEmptyView(mEmptyView);
String emptyViewText = activity.getString(R.string.wifi_calling_off_explanation)
+ activity.getString(R.string.wifi_calling_off_explanation_2);
final Resources res = SubscriptionManager.getResourcesForSubId(getActivity(), mSubId);
String emptyViewText = res.getString(R.string.wifi_calling_off_explanation,
res.getString(R.string.wifi_calling_off_explanation_2));
mEmptyView.setText(emptyViewText);
mSwitchBar = getView().findViewById(R.id.switch_bar);