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

Merge "Disallow OEM unlock when DISALLOW_FACTORY_RESET applies" into nyc-mr1-dev am: e6e8c92134

Browse Source 
am: 150dd9cc4f

* commit '150dd9cc4fecbfd58db2f9e994077b9968368a2b':
  Disallow OEM unlock when DISALLOW_FACTORY_RESET applies

Change-Id: I386ad26655446801d1b6a221cdb8c6446b5a6ba9
This commit is contained in:
Mahaver Chopra
2016-05-24 12:38:04 +00:00
committed by android-build-merger
parent ce16ccb792 150dd9cc4f
commit 2d15f81ee8
2 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
res/xml/development_prefs.xml
View File

@@ -51,10 +51,11 @@
android:title="@string/bt_hci_snoop_log"
android:summary="@string/bt_hci_snoop_log_summary"/>
<SwitchPreference
<com.android.settingslib.RestrictedSwitchPreference
android:key="oem_unlock_enable"
android:title="@string/oem_unlock_enable"
android:summary="@string/oem_unlock_enable_summary"/>
android:summary="@string/oem_unlock_enable_summary"
settings:useAdditionalSummary="true"/>
<PreferenceScreen
android:key="running_apps"