diff options
author | Adnan Begovic <adnan@cyngn.com> | 2015-01-16 16:31:29 +0000 |
---|---|---|
committer | Adnan Begovic <adnan@cyngn.com> | 2016-01-12 12:55:29 -0800 |
commit | 2c3e40d3af620990aaba1a4ac9f32629d2ff4b16 (patch) | |
tree | d00800bb85a93ae2132db8c8bbc93240f755c837 /src/com/android/settings/deviceinfo | |
parent | 35a185c53180b4e4996de3c7b49baf6a327cb647 (diff) | |
download | packages_apps_Settings-2c3e40d3af620990aaba1a4ac9f32629d2ff4b16.zip packages_apps_Settings-2c3e40d3af620990aaba1a4ac9f32629d2ff4b16.tar.gz packages_apps_Settings-2c3e40d3af620990aaba1a4ac9f32629d2ff4b16.tar.bz2 |
Squash commit of SAR and IC Code.
TICKET: CYNGNOS-1586
Settings: Show SAR on Regulatory Info (from CM11)
This brings these three commits from CM11:
Settings: Create SAR level preference, allow overlay.
Change-Id: I1af616696702f72b8a6276b3b01e940d61735137
Change Regulatory Info Activity to prefer string over image
Change-Id: I9ea5c2bf469af8f654ec4e4bb4f2a8a5738e6a95
Settings: Allow Regulator Information Dialog Title to be overlaid.
Change-Id: I5aead313589f5d5291d20a0388d2d8bc7242b711
Settings: Refactory regulatory dialog. Display IC Code.
Change-Id: Id268830404d09eed318e38474fe1a9062fc4e962
Diffstat (limited to 'src/com/android/settings/deviceinfo')
-rw-r--r-- | src/com/android/settings/deviceinfo/Status.java | 16 |
1 files changed, 16 insertions, 0 deletions
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; + } } |