Merge commit 'a9c6618' into merge
David Brown [Tue, 5 May 2009 22:58:54 +0000 (15:58 -0700)]
Conflicts:
res/values/config.xml

Manually fix merge conflict in res/values/config.xml
(from import of perforce CL 148291).

1  2 
res/layout/sim_ndp.xml
res/values/config.xml
src/com/android/phone/IccNetworkDepersonalizationPanel.java

Simple merge
  <!-- Phone app resources that may need to be customized
       for different hardware or product builds. -->
  <resources>
 +    <!-- Flag indicating whether the Phone app should ignore
 +         EVENT_SIM_NETWORK_LOCKED events from the Sim.  If true, this will
 +         prevent the IccNetworkDepersonalizationPanel from being shown,
 +         and effectively disable the "Sim network lock" feature. -->
 +    <bool name="ignore_sim_network_locked_events">false</bool>
++
+     <!-- Flag indicating whether the Phone app should provide
+          a "Dismiss" button on the SIM network unlock screen.
+          The default value is true.
+          If set to false, there will be *no way* to dismiss the SIM
+          network unlock screen if you don't enter the correct unlock code.
+          (One important consequence: there will be no way to make an
+          Emergency Call if your SIM is network-locked and you don't know
+          the PIN.) -->
+     <bool name="sim_network_unlock_allow_dismiss">true</bool>
  </resources>
@@@ -191,7 -199,14 +204,14 @@@ public class IccNetworkDepersonalizatio
          mStatusPanel.setVisibility(View.GONE);
      }
  
+     View.OnClickListener mDismissListener = new View.OnClickListener() {
+             public void onClick(View v) {
+                 if (DBG) log("mDismissListener: skipping depersonalization...");
+                 dismiss();
+             }
+         };
      private void log(String msg) {
 -        Log.v(TAG, "[SimNetworkDepersonalizationPanel] " + msg);
 +        Log.v(TAG, "[IccNetworkDepersonalizationPanel] " + msg);
      }
  }