MD Settings: Network: SIM unlock: Fix focus and cancel

chrome/browser/resources/settings/internet_page/network_siminfo.html

 <link rel="import" href="chrome://resources/cr_elements/cr_dialog/cr_dialog.html">
 <link rel="import" href="chrome://resources/cr_elements/network/cr_onc_types.html">
 <link rel="import" href="chrome://resources/html/polymer.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-a11y-keys/iron-a11y-keys.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-button.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-input/paper-input.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/paper-toggle-button/paper-toggle-button.html">
 <link rel="import" href="../icons.html">
 <link rel="import" href="internet_shared_css.html">
@@ skipping 66 matching lines @@
     <div class="settings-box two-line"
         hidden$="[[!showSimUnlocked_(networkProperties)]]">
       <div id="simLockToggleLabel" class="start">
         $i18n{networkSimLockEnable}
       </div>
       <paper-button id="changePinButton" on-tap="onChangePinTap_"
           hidden$="[[!networkProperties.Cellular.SIMLockStatus.LockEnabled]]">
         $i18n{networkSimChangePin}
       </paper-button>
       <paper-toggle-button id="simLockButton"
-          on-change="onSimLockEnabledChange_"
-          checked="[[networkProperties.Cellular.SIMLockStatus.LockEnabled]]"
+          on-change="onSimLockEnabledChange_" checked="{{lockEnabled_}}"
           aria-labelledby="simLockToggleLabel">
       </paper-toggle-button>
     </div>
 
     <!-- Enter PIN dialog -->
     <dialog is="cr-dialog" id="enterPinDialog" close-text="$i18n{close}"
-        on-close="onEnterPinDialogClosed_">
+        on-cancel="onEnterPinDialogCancel_"
+        on-close="onEnterPinDialogClose_">
       <div class="title">$i18n{networkSimEnterPinTitle}</div>
       <div class="body">
-        <paper-input id="enterPin" class="pin" no-label-float
+        <paper-input id="enterPin" class="pin" no-label-float autofocus
             label="$i18n{networkSimEnterPin}">
           <iron-a11y-keys keys="enter" on-keys-pressed="sendEnterPin_">
           </iron-a11y-keys>
         </paper-input>
         <div class="dialog-error">
           [[getErrorMsg_(error_, networkProperties)]]
         </div>
       </div>
       <div class="button-container">
         <paper-button on-tap="sendEnterPin_">
           $i18n{networkSimEnter}
         </paper-button>
       </div>
     </dialog>
 
     <!-- Change PIN dialog -->
     <dialog is="cr-dialog" id="changePinDialog" close-text="$i18n{close}"
         on-close="onChangePinDialogClose_">
       <div class="title">$i18n{networkSimChangePinTitle}</div>
       <div class="body">
-        <paper-input id="changePinOld" class="pin" no-label-float
+        <paper-input id="changePinOld" class="pin" no-label-float autofocus
             label="$i18n{networkSimEnterOldPin}">
         </paper-input>
         <paper-input id="changePinNew1" class="pin" no-label-float
             label="$i18n{networkSimEnterNewPin}">
         </paper-input>
         <paper-input id="changePinNew2" class="pin" no-label-float
             label="$i18n{networkSimReEnterNewPin}">
           <iron-a11y-keys keys="enter" on-keys-pressed="sendChangePin_">
           </iron-a11y-keys>
         </paper-input>
         <div class="dialog-error">
           [[getErrorMsg_(error_, networkProperties)]]
         </div>
       </div>
       <div class="button-container">
         <paper-button on-tap="sendChangePin_">
           $i18n{networkSimChange}
         </paper-button>
       </div>
     </dialog>
 
     <!-- Unlock PIN dialog -->
     <dialog is="cr-dialog" id="unlockPinDialog" close-text="$i18n{close}"
         on-close="onUnlockPinDialogClose_">
       <div class="title">$i18n{networkSimLockedTitle}</div>
       <div class="body">
-        <paper-input id="unlockPin" class="pin" no-label-float
+        <paper-input id="unlockPin" class="pin" no-label-float autofocus
             label="$i18n{networkSimEnterPin}">
           <iron-a11y-keys keys="enter" on-keys-pressed="sendUnlockPin_">
           </iron-a11y-keys>
         </paper-input>
         <div class="dialog-error">
           [[getErrorMsg_(error_, networkProperties)]]
         </div>
       </div>
       <div class="button-container">
         <paper-button on-tap="sendUnlockPin_">
           $i18n{networkSimUnlock}
         </paper-button>
       </div>
     </dialog>
 
     <!-- Unlock PUK dialog -->
     <dialog is="cr-dialog" id="unlockPukDialog" close-text="$i18n{close}"
         on-close="onUnlockPinDialogClose_">
       <div class="title">$i18n{networkSimLockedTitle}</div>
       <div class="body">
         <div>
           Enter the 8-digit PIN Unblocking Key provided by your carrier
         </div>
-        <paper-input id="unlockPuk" class="puk" no-label-float
+        <paper-input id="unlockPuk" class="puk" no-label-float autofocus
             label="$i18n{networkSimEnterPuk}">
         </paper-input>
         <paper-input id="unlockPin1" class="pin" no-label-float
             label="$i18n{networkSimEnterNewPin}">
         </paper-input>
         <paper-input id="unlockPin2" class="pin" no-label-float
             label="$i18n{networkSimReEnterNewPin}">
           <iron-a11y-keys keys="enter" on-keys-pressed="sendUnlockPuk_">
           </iron-a11y-keys>
         </paper-input>
         <div class="dialog-error">
           $i18n{networkSimLockedWarning}
         </div>
         <div class="dialog-error">
           [[getErrorMsg_(error_, networkProperties)]]
         </div>
       </div>
       <div class="button-container">
         <paper-button on-tap="sendUnlockPuk_">
           $i18n{networkSimUnlock}
         </paper-button>
       </div>
     </dialog>
   </template>
   <script src="network_siminfo.js"></script>
 </dom-module>