diff options
Diffstat (limited to 'src/com/android/settings')
| -rw-r--r-- | src/com/android/settings/RegulatoryInfoDisplayActivity.java | 40 | ||||
| -rw-r--r-- | src/com/android/settings/deviceinfo/Status.java | 16 |
2 files changed, 41 insertions, 15 deletions
diff --git a/src/com/android/settings/RegulatoryInfoDisplayActivity.java b/src/com/android/settings/RegulatoryInfoDisplayActivity.java index 39776e0..42b0d22 100644 --- a/src/com/android/settings/RegulatoryInfoDisplayActivity.java +++ b/src/com/android/settings/RegulatoryInfoDisplayActivity.java @@ -25,9 +25,12 @@ import android.os.Bundle; import android.os.SystemProperties; import android.text.TextUtils; import android.view.Gravity; +import android.view.LayoutInflater; import android.view.View; +import android.view.ViewGroup; import android.widget.ImageView; import android.widget.TextView; +import com.android.settings.deviceinfo.Status; /** * {@link Activity} that displays regulatory information for the "Regulatory information" @@ -56,9 +59,11 @@ public class RegulatoryInfoDisplayActivity extends Activity implements } AlertDialog.Builder builder = new AlertDialog.Builder(this) - .setTitle(R.string.regulatory_information) + .setTitle(R.string.regulatory_information_dialog_title) .setOnDismissListener(this); + View view = getLayoutInflater().inflate(R.layout.regulatory_info, null); + boolean regulatoryInfoDrawableExists = false; int resId = getResourceId(); if (resId != 0) { @@ -73,24 +78,29 @@ public class RegulatoryInfoDisplayActivity extends Activity implements } } - CharSequence regulatoryText = resources.getText(R.string.regulatory_info_text); - if (regulatoryInfoDrawableExists) { - View view = getLayoutInflater().inflate(R.layout.regulatory_info, null); ImageView image = (ImageView) view.findViewById(R.id.regulatoryInfo); + image.setVisibility(View.VISIBLE); image.setImageResource(resId); - builder.setView(view); - builder.show(); - } else if (regulatoryText.length() > 0) { - builder.setMessage(regulatoryText); - AlertDialog dialog = builder.show(); - // we have to show the dialog first, or the setGravity() call will throw a NPE - TextView messageText = (TextView) dialog.findViewById(android.R.id.message); - messageText.setGravity(Gravity.CENTER); - } else { - // neither drawable nor text resource exists, finish activity - finish(); } + + String sarValues = Status.getSarValues(getResources()); + TextView sarText = (TextView) view.findViewById(R.id.sarValues); + if (!TextUtils.isEmpty(sarValues)) { + sarText.setVisibility(resources.getBoolean(R.bool.config_show_sar_enable) + ? View.VISIBLE : View.GONE); + sarText.setText(sarValues); + } + + String icCodes = Status.getIcCodes(getResources()); + TextView icCode = (TextView) view.findViewById(R.id.icCodes); + if (!TextUtils.isEmpty(icCodes)) { + icCode.setVisibility(resources.getBoolean(R.bool.config_show_ic_enable) + ? View.VISIBLE : View.GONE); + icCode.setText(icCodes); + } + builder.setView(view); + builder.show(); } private int getResourceId() { diff --git a/src/com/android/settings/deviceinfo/Status.java b/src/com/android/settings/deviceinfo/Status.java index 4125d88..4a7cb48 100644 --- a/src/com/android/settings/deviceinfo/Status.java +++ b/src/com/android/settings/deviceinfo/Status.java @@ -422,4 +422,20 @@ public class Status extends InstrumentedPreferenceActivity { return Build.SERIAL; } } + + public static String getSarValues(Resources res) { + String headLevel = String.format(res.getString(R.string.maximum_head_level, + res.getString(R.string.sar_head_level))); + String bodyLevel = String.format(res.getString(R.string.maximum_body_level, + res.getString(R.string.sar_body_level))); + return headLevel + "\n" + bodyLevel; + } + + public static String getIcCodes(Resources resources) { + String model = String.format(resources.getString(R.string.ic_code_model, + Build.MODEL)); + String icCode = String.format(resources.getString(R.string.ic_code_full, + resources.getString(R.string.ic_code))); + return model + "\n" + icCode; + } } |