Merge "Settings: Porting hotsopt function" (e53f2d35) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+17 −0

Original line number	Diff line number	Diff line
		@@ -2138,5 +2138,22 @@
		</intent-filter>
		</provider>

		<activity-alias
		android:name=".wifi.HotspotSettings"
		android:uiOptions="splitActionBarWhenNarrow"
		android:clearTaskOnLaunch="true"
		android:exported="true"
		android:label="@string/wifi_tether_checkbox_text"
		android:targetActivity="Settings$TetherSettingsActivity" >
		</activity-alias>

		<activity
		android:name=".wifi.HotspotSettingsHelp"
		android:clearTaskOnLaunch="true"
		android:exported="true"
		android:label="@string/hotspot_settings_menu_help"
		android:targetActivity="Settings$TetherSettingsActivity" >
		</activity>

		</application>
		</manifest>

res/layout/hotspot_checkbox.xml

+18 −15

Original line number	Diff line number	Diff line
		@@ -35,31 +35,34 @@ IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
		android:minHeight="48dp"
		android:paddingEnd="?android:attr/scrollbarSize" >

		<LinearLayout
		android:layout_width="wrap_content"
		<RelativeLayout
		android:layout_width="0dip"
		android:layout_height="wrap_content"
		android:layout_weight="1"
		android:orientation="vertical"
		android:paddingLeft="16px" >
		android:layout_marginStart="15dip"
		android:layout_marginEnd="6dip"
		android:layout_marginTop="6dip"
		android:layout_marginBottom="6dip"
		android:layout_weight="1">

		<TextView
		android:id="@+id/subtitle"
		<TextView android:id="@+id/subtitle"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:ellipsize="end"
		android:fadingEdge="horizontal"
		android:marqueeRepeatLimit="marquee_forever"
		android:singleLine="true"
		android:text="@string/wifi_tether_checkbox_text"
		android:textAppearance="?android:attr/textAppearanceMedium" />
		android:textAppearance="@style/TextAppearance.HotsoptTitle"
		android:ellipsize="marquee"
		android:fadingEdge="horizontal" />

		<TextView
		android:id="@+id/subsummary"
		<TextView android:id="@+id/subsummary"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_below="@+id/subtitle"
		android:layout_alignStart="@+id/subtitle"
		android:textAppearance="?android:attr/textAppearanceSmall" />
		</LinearLayout>
		android:textAppearance="?android:attr/textAppearanceSmall"
		android:textColor="?android:attr/textColorSecondary"
		android:maxLines="4" />

		</RelativeLayout>

		<Switch
		android:id="@+id/switchWidget"

res/values-zh-rCN/strings.xml

+11 −0

Original line number	Diff line number	Diff line
		@@ -2644,4 +2644,15 @@
		<string name="sim_enabler_disabling">"禁用中......"</string>
		<string name="sub_activate_success">"启用成功。"</string>

		<string name="wifi_ap_list_category">"已连接设备"</string>
		<string name="ap_device_name_default">"匿名"</string>
		<string name="hotspot_settings_menu_help">"帮助"</string>
		<string name="hotspot_settings_desc">"WLAN 热点可以通过 WLAN 分享此手机的数据网络给其他电脑/移动设备。"</string>
		<string name="hotspot_settings_indication">"打开 WLAN 热点后,其他电脑/移动设备可以通过以下步骤进行连接并使用网络:"</string>
		<string name="hotspot_settings_indication_step1">"1. 打开电脑/移动设备上的 WLAN"</string>
		<string name="hotspot_settings_indication_step2">"2. 在 WLAN 网络列表里找到“<xliff:g id="ssid_name">%s</xliff:g>”"</string>
		<string name="hotspot_settings_indication_step3_ssid">"3. 选择“<xliff:g id="ssid_name">%s</xliff:g>”"</string>
		<string name="hotspot_settings_indication_step3_all">"3. 选择“<xliff:g id="ssid_name">%s</xliff:g>”并输入密码“<xliff:g id="ssid_pwd">%s</xliff:g>”"</string>
		<string name="hotspot_settings_indication_step4">"4. 开始在电脑/移动设备上使用网络"</string>
		<string name="hotspot_turn_on_hint">"要使用 WLAN 热点，请先将其打开。"</string>
		</resources>

res/values/bools.xml

+3 −0

Original line number	Diff line number	Diff line
		@@ -80,4 +80,7 @@

		<!-- Whether to edit APN name-->
		<bool name="config_name_apn">true</bool>

		<!-- Whether to show hotspot settings -->
		<bool name="show_wifi_hotspot_settings">false</bool>
		</resources>

res/values/strings.xml

+12 −0

Original line number	Diff line number	Diff line
		@@ -6253,4 +6253,16 @@
		<string name="usb_sdcard_title">Mount SD card</string>
		<string name="external_storage_turn_on">External storage has been turned on</string>
		<string name="external_storage_turn_off">External storage has been turned off</string>
		<string name="wifi_ap_list_category">CONNECTED DEVICES</string>
		<string name="ap_device_name_default">Anonymous</string>
		<string name="hotspot_settings_menu_help">Help</string>
		<string name="hotspot_settings_desc">WLAN hotspot can share this phone\u2019s data Internet connection with other PC/mobile devices via WLAN.</string>
		<string name="hotspot_settings_indication">After the WLAN hotspot is turned on, other PC/mobile devices can connect to it and start using the internet by following steps:</string>
		<string name="hotspot_settings_indication_step1">1. Turn on WLAN on PC/Mobile device.</string>
		<string name="hotspot_settings_indication_step2">2. Find \u201c<xliff:g id="ssid_name">%s</xliff:g>\u201d in the list of WLAN networks.</string>
		<string name="hotspot_settings_indication_step3_ssid">3. Select \u201c<xliff:g id="ssid_name">%s</xliff:g>\u201d.</string>
		<string name="hotspot_settings_indication_step3_all">3. Select \u201c<xliff:g id="ssid_name">%s</xliff:g>\u201d and Enter \u201d<xliff:g id="ssid_pwd">%s</xliff:g>\u201d in the password field.</string>
		<string name="hotspot_settings_indication_step4">4. Start using the Internet on PC/Mobile device.</string>
		<string name="hotspot_turn_on_hint">To use WLAN hotspot, turn it on.</string>

		</resources>