summaryrefslogtreecommitdiffstats
path: root/packages/SystemUI/res
diff options
context:
space:
mode:
authorShufeng Hou <shou@codeaurora.org>2015-12-04 16:38:52 +0800
committerSteve Kondik <steve@cyngn.com>2016-01-23 23:28:18 -0800
commit8c78865c55eca516154ae6ca1ff51f560bb1f7fb (patch)
treed876b7bbb0717ca1980288a7634eea2cfb5c3bfd /packages/SystemUI/res
parentd97c3417adfa64530af18afde74d198349e09b0a (diff)
downloadframeworks_base-8c78865c55eca516154ae6ca1ff51f560bb1f7fb.zip
frameworks_base-8c78865c55eca516154ae6ca1ff51f560bb1f7fb.tar.gz
frameworks_base-8c78865c55eca516154ae6ca1ff51f560bb1f7fb.tar.bz2
SystemUI: Do not turn on Wifi hotspot in APM Mode
Do not turn on hotspot in APM Mode and show clear alert message Change-Id: I3afcc92a93707e15cd436ebc1cffb74567443483 CRs-Fixed: 926474
Diffstat (limited to 'packages/SystemUI/res')
-rw-r--r--packages/SystemUI/res/values-zh-rCN/strings.xml1
-rw-r--r--packages/SystemUI/res/values-zh-rHK/strings.xml1
-rw-r--r--packages/SystemUI/res/values/strings.xml2
3 files changed, 4 insertions, 0 deletions
diff --git a/packages/SystemUI/res/values-zh-rCN/strings.xml b/packages/SystemUI/res/values-zh-rCN/strings.xml
index 06acce2..ab5a8eb 100644
--- a/packages/SystemUI/res/values-zh-rCN/strings.xml
+++ b/packages/SystemUI/res/values-zh-rCN/strings.xml
@@ -433,4 +433,5 @@
<string name="enable_bluetooth_title" msgid="5027037706500635269">"要开启蓝牙吗?"</string>
<string name="enable_bluetooth_message" msgid="9106595990708985385">"要将您的键盘连接到平板电脑,您必须先开启蓝牙。"</string>
<string name="enable_bluetooth_confirmation_ok" msgid="6258074250948309715">"开启"</string>
+ <string name="hotspot_apm_message">"飞行模式开启的情况下不能够链接到移动网络,请关闭飞行模式后重试。"</string>
</resources>
diff --git a/packages/SystemUI/res/values-zh-rHK/strings.xml b/packages/SystemUI/res/values-zh-rHK/strings.xml
index ef5cd39..b1e53b1 100644
--- a/packages/SystemUI/res/values-zh-rHK/strings.xml
+++ b/packages/SystemUI/res/values-zh-rHK/strings.xml
@@ -433,4 +433,5 @@
<string name="enable_bluetooth_title" msgid="5027037706500635269">"要開啟藍牙嗎?"</string>
<string name="enable_bluetooth_message" msgid="9106595990708985385">"如要將鍵盤連接至平板電腦,請先開啟藍牙。"</string>
<string name="enable_bluetooth_confirmation_ok" msgid="6258074250948309715">"開啟"</string>
+ <string name="hotspot_apm_message">"飛行模式開啟的情況下不能夠鏈接到移動網絡,請關閉飛行模式後重試。"</string>
</resources>
diff --git a/packages/SystemUI/res/values/strings.xml b/packages/SystemUI/res/values/strings.xml
index dc9c9fd..2c3de9a 100644
--- a/packages/SystemUI/res/values/strings.xml
+++ b/packages/SystemUI/res/values/strings.xml
@@ -1135,5 +1135,7 @@
<!-- Bluetooth enablement ok text [CHAR LIMIT=40] -->
<string name="enable_bluetooth_confirmation_ok">Turn on</string>
+ <!-- Hotspot dialog message -->
+ <string name="hotspot_apm_message">Unable to connect to mobile networks while Airplane mode is enabled. Disable Airplane mode and try again.</string>
</resources>