Merge "Fix an RTL issue in Network dashboard's summary text." into pi-dev am: d743f20618

am: fc47444c61

Change-Id: I0de8b7e6780768fe32fe5fe0eb3ae42c2f78f8d4
This commit is contained in:
Fan Zhang
2018-04-16 18:47:22 -07:00
committed by android-build-merger

View File

@@ -25,6 +25,7 @@ import android.app.Fragment;
import android.content.Context; import android.content.Context;
import android.provider.SearchIndexableResource; import android.provider.SearchIndexableResource;
import android.support.annotation.VisibleForTesting; import android.support.annotation.VisibleForTesting;
import android.text.BidiFormatter;
import android.util.Log; import android.util.Log;
import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto;
@@ -174,7 +175,8 @@ public class NetworkDashboardFragment extends DashboardFragment implements
@Override @Override
public void setListening(boolean listening) { public void setListening(boolean listening) {
if (listening) { if (listening) {
String summary = mContext.getString(R.string.wifi_settings_title); String summary = BidiFormatter.getInstance()
.unicodeWrap(mContext.getString(R.string.wifi_settings_title));
if (mMobileNetworkPreferenceController.isAvailable()) { if (mMobileNetworkPreferenceController.isAvailable()) {
final String mobileSettingSummary = mContext.getString( final String mobileSettingSummary = mContext.getString(
R.string.network_dashboard_summary_mobile); R.string.network_dashboard_summary_mobile);