<Preference
android:key="device_model"
android:title="@string/model_info"
- android:summary="@string/device_info_default"/>
+ android:summary="@string/summary_placeholder"/>
<!-- Device firmware version -->
<Preference android:key="firmware_version"
android:title="@string/firmware_version"
- android:summary="@string/device_info_default"/>
+ android:summary="@string/summary_placeholder"/>
<!-- Security patch level -->
<Preference android:key="security_patch"
android:title="@string/security_patch"
- android:summary="@string/device_info_default">
+ android:summary="@string/summary_placeholder">
<intent android:action="android.intent.action.VIEW"
android:data="https://source.android.com/security/bulletin/" />
</Preference>
<Preference
android:key="fcc_equipment_id"
android:title="@string/fcc_equipment_id"
- android:summary="@string/device_info_default"/>
+ android:summary="@string/summary_placeholder"/>
<!-- Device Baseband version -->
<Preference
android:key="baseband_version"
android:title="@string/baseband_version"
- android:summary="@string/device_info_default"/>
+ android:summary="@string/summary_placeholder"/>
<!-- Device Kernel version -->
<Preference
android:key="kernel_version"
android:title="@string/kernel_version"
- android:summary="@string/device_info_default"/>
+ android:summary="@string/summary_placeholder"/>
<!-- Detailed build version -->
<Preference
android:key="build_number"
android:title="@string/build_number"
- android:summary="@string/device_info_default"/>
+ android:summary="@string/summary_placeholder"/>
<!-- SELinux status information -->
<Preference
import android.os.UserManager;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import android.text.BidiFormatter;
import android.text.TextUtils;
import android.util.Pair;
import android.widget.Toast;
final Preference preference = screen.findPreference(KEY_BUILD_NUMBER);
if (preference != null) {
try {
- preference.setSummary(Build.DISPLAY);
+ preference.setSummary(BidiFormatter.getInstance().unicodeWrap(Build.DISPLAY));
preference.setEnabled(true);
} catch (Exception e) {
preference.setSummary(R.string.device_info_default);
import android.provider.Settings;
import android.support.v7.preference.Preference;
import android.support.v7.preference.PreferenceScreen;
+import android.text.BidiFormatter;
import com.android.internal.logging.nano.MetricsProto;
-import com.android.settings.development.DevelopmentSettings;
-import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settings.TestConfig;
+import com.android.settings.development.DevelopmentSettings;
import com.android.settings.search.DatabaseIndexingManager;
import com.android.settings.testutils.FakeFeatureFactory;
+import com.android.settings.testutils.SettingsRobolectricTestRunner;
import com.android.settingslib.core.lifecycle.Lifecycle;
import org.junit.Before;
public void displayPref_shouldAlwaysDisplay() {
mController.displayPreference(mScreen);
- verify(mScreen.findPreference(mController.getPreferenceKey())).setSummary(Build.DISPLAY);
+ verify(mScreen.findPreference(mController.getPreferenceKey()))
+ .setSummary(BidiFormatter.getInstance().unicodeWrap(Build.DISPLAY));
verify(mScreen, never()).removePreference(any(Preference.class));
}