Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Wei Liu
2015-10-13 21:23:35 +00:00
committed by Android (Google) Code Review
parent 59e52b9f00 4f1cbad283
commit 430a769a94
2 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
core/res/res/values/config.xml
View File

@@ -938,6 +938,9 @@
<!-- Is the device capable of hot swapping an UICC Card --> <!-- Is the device capable of hot swapping an UICC Card -->
<bool name="config_hotswapCapable">false</bool> <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. <!-- Enable puk unlockscreen by default.
If unlock screen is disabled, the puk should be unlocked through Emergency Dialer --> If unlock screen is disabled, the puk should be unlocked through Emergency Dialer -->
<bool name="config_enable_puk_unlock_screen">true</bool> <bool name="config_enable_puk_unlock_screen">true</bool>

2
core/res/res/values/symbols.xml
View File

@@ -2336,4 +2336,6 @@
<java-symbol type="string" name="config_networkPolicyNotificationComponent" /> <java-symbol type="string" name="config_networkPolicyNotificationComponent" />
<java-symbol type="drawable" name="platlogo_m" /> <java-symbol type="drawable" name="platlogo_m" />
<java-symbol type="string" name="config_iccHotswapPromptForRestartDialogComponent" />
</resources> </resources>