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

Merge "Update OEM unlock summary string" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-08-08 19:51:32 +00:00
committed by Android (Google) Code Review
parent a409b4126a 63f791a1e9
commit 2de8fd95a3
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -7749,6 +7749,8 @@
<string name="oem_unlock_enable_disabled_summary_bootloader_unlocked">Bootloader is already unlocked</string> <string name="oem_unlock_enable_disabled_summary_bootloader_unlocked">Bootloader is already unlocked</string>
<!-- setting enable OEM unlock Checkbox's summary to explain this Checkbox is disabled because there is no connectivity. [CHAR_LIMIT=60] --> <!-- setting enable OEM unlock Checkbox's summary to explain this Checkbox is disabled because there is no connectivity. [CHAR_LIMIT=60] -->
<string name="oem_unlock_enable_disabled_summary_connectivity">Connect to the Internet first</string> <string name="oem_unlock_enable_disabled_summary_connectivity">Connect to the Internet first</string>
<!-- setting enable OEM unlock Checkbox's summary to explain this Checkbox is disabled because there is no connectivity or the device is locked by the carrier [CHAR_LIMIT=60] -->
<string name="oem_unlock_enable_disabled_summary_connectivity_or_locked">Connect to the Internet or contact your carrier</string>
<!-- setting enable OEM unlock Checkbox's summary to explain this Checkbox is disabled because this setting is unavailable on sim-locked devices. [CHAR_LIMIT=60] --> <!-- setting enable OEM unlock Checkbox's summary to explain this Checkbox is disabled because this setting is unavailable on sim-locked devices. [CHAR_LIMIT=60] -->
<string name="oem_unlock_enable_disabled_summary_sim_locked_device">Unavailable on carrier-locked devices</string> <string name="oem_unlock_enable_disabled_summary_sim_locked_device">Unavailable on carrier-locked devices</string>

11
src/com/android/settings/DevelopmentSettings.java
View File

@@ -2350,11 +2350,12 @@ public class DevelopmentSettings extends RestrictedSettingsFragment
} else if (isSimLockedDevice()) { } else if (isSimLockedDevice()) {
oemUnlockSummary = R.string.oem_unlock_enable_disabled_summary_sim_locked_device; oemUnlockSummary = R.string.oem_unlock_enable_disabled_summary_sim_locked_device;
} else if (!isOemUnlockAllowed()) { } else if (!isOemUnlockAllowed()) {
// If the device isn't SIM-locked but OEM unlock is disabled by user restriction, // If the device isn't SIM-locked but OEM unlock is disabled by the system via the
// this means the device hasn't been able to confirm whether SIM-lock or any other // user restriction, this means either some other carrier restriction is in place or
// restrictions apply (or hasn't been able to apply such restrictions yet). Ask the // the device hasn't been able to confirm which restrictions (SIM-lock or otherwise)
// user to connect to the internet in order to retrieve all restrictions. // apply.
oemUnlockSummary = R.string.oem_unlock_enable_disabled_summary_connectivity; oemUnlockSummary =
R.string.oem_unlock_enable_disabled_summary_connectivity_or_locked;
} }
mEnableOemUnlock.setSummary(getString(oemUnlockSummary)); mEnableOemUnlock.setSummary(getString(oemUnlockSummary));
} }