am 2768ae05: am f7fd4ca8: Merge "Disable change PIN when PIN is inactive"

* commit '2768ae05bc675e08ab84499d6d0ef83231ff2b04':
  Disable change PIN when PIN is inactive
This commit is contained in:
Amith Yamasani
2011-01-18 09:14:14 -08:00
committed by Android Git Automerger

View File

@@ -25,6 +25,7 @@
android:summaryOff="@string/sim_lock_off"/> android:summaryOff="@string/sim_lock_off"/>
<com.android.settings.EditPinPreference <com.android.settings.EditPinPreference
android:key="sim_pin" android:key="sim_pin"
android:dependency="sim_toggle"
android:title="@string/sim_pin_change" android:title="@string/sim_pin_change"
android:dialogTitle="@string/sim_change_pin" android:dialogTitle="@string/sim_change_pin"
android:dialogMessage="@string/sim_enter_old" android:dialogMessage="@string/sim_enter_old"