Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 595a93ec authored by Wei Liu's avatar Wei Liu Committed by Android Git Automerger
Browse files

am 430a769a: Merge "Use wear style dialog for ICC hotswap restart dialog." into cw-e-dev 

* commit '430a769a':
  Use wear style dialog for ICC hotswap restart dialog.
parents a14c5795 430a769a

core/res/res/values/config.xml

+3 −0
Original line number Diff line number Diff line
@@ -938,6 +938,9 @@ 
    <!-- Is the device capable of hot swapping an UICC Card -->

    <bool name="config_hotswapCapable">false</bool>



    <!-- Component name of the ICC hotswap prompt for restart dialog -->

    <string name="config_iccHotswapPromptForRestartDialogComponent" translateable="false">@null</string>



    <!-- Enable puk unlockscreen by default.

         If unlock screen is disabled, the puk should be unlocked through Emergency Dialer -->

    <bool name="config_enable_puk_unlock_screen">true</bool>

core/res/res/values/symbols.xml

+2 −0
Original line number Diff line number Diff line
@@ -2336,4 +2336,6 @@ 


  <java-symbol type="string" name="config_networkPolicyNotificationComponent" />

  <java-symbol type="drawable" name="platlogo_m" />



  <java-symbol type="string" name="config_iccHotswapPromptForRestartDialogComponent" />

</resources>