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

Commit f1f4499a authored by shibom's avatar shibom Committed by Xiaojing Zhang
Browse files

Settings: Add UMS and charge mode support 

Android only supports MTP and PTP mode in UsbSettings screen, the change
is to add USB mass storage mode and charging mode.

Conflicts:
	res/values-zh-rTW/strings.xml
	res/values/strings.xml

Change-Id: I5c9febe49f7ec76f6962bacda292700bc770e648
parent c76b0d6f

res/values-zh-rCN/strings.xml

+8 −1
Original line number Diff line number Diff line
@@ -2393,6 +2393,13 @@ 
    <string name="keywords_keyboard_and_ime" msgid="1103378692379215672">"文字 更正 提示音 振动 自动 语言 手势 建议 主题 令人反感的字词 输入 表情符号"</string>

    <string name="keywords_lockscreen" msgid="4806191868723291541">"滑动 密码 图案 PIN码"</string>

    <string name="setup_wifi_nfc_tag" msgid="9028353016222911016">"设置WLANNFC标签"</string>

    <string name="usb_sdcard_title">挂载 SD 卡</string>

    <string name="usb_sdcard_summary">"让您在电脑上传输 SD 卡上的媒体文件"</string>

    <string name="usb_charging_title">充电模式</string>

    <string name="usb_charging_summary">连接电脑时，对手机进行充电</string>

    <string name="external_storage_turn_on">"外部存储器已打开"</string>

    <string name="external_storage_turn_off">"外部存储器已关闭"</string>



    <string name="write_tag" msgid="8571858602896222537">"写入"</string>

    <string name="status_awaiting_tap" msgid="2130145523773160617">"点按标签即可写入…"</string>

    <string name="status_invalid_password" msgid="2575271864572897406">"密码无效，请重试。"</string>

res/values-zh-rHK/strings.xml

+8 −0
Original line number Diff line number Diff line
@@ -2327,6 +2327,14 @@ 
    <string name="sim_pref_divider" msgid="4194064766764348209">"活動"</string>

    <string name="sim_calls_ask_first_prefs_title" msgid="2897913529999035350">"先詢問我"</string>

    <string name="sim_selection_required_pref" msgid="3446721423206414652">"請選取偏好設定"</string>

    <!-- modify for usb settings start -->

    <string name="usb_sdcard_title">掛載 SD 卡</string>

    <string name="usb_sdcard_summary">"讓您在電腦上傳輸 SD 卡上的媒體文件"</string>

    <string name="usb_charging_title">充電模式</string>

    <string name="usb_charging_summary">連接電腦時，對手機進行充電</string>

    <string name="external_storage_turn_on">"外部存儲器已打開"</string>

    <string name="external_storage_turn_off">"外部存儲器已關閉"</string>

    <!-- modify for usb settings end  -->

    <string name="dashboard_title" msgid="5453710313046681820">"設定"</string>

    <string name="search_results_title" msgid="1796252422574886932">"設定"</string>

    <string name="search_menu" msgid="7053532283559077164">"搜尋"</string>

res/values-zh-rTW/strings.xml

+9 −0
Original line number Diff line number Diff line
@@ -2481,6 +2481,15 @@ 


    <string name="show_search_function">搜索</string>

    

    <!-- modify for usb settings start -->

    <string name="usb_sdcard_title">掛載 SD 卡</string>

    <string name="usb_sdcard_summary">"讓您在電腦上傳輸 SD 卡上的媒體文件"</string>

    <string name="usb_charging_title">充電模式</string>

    <string name="usb_charging_summary">連接電腦時，對手機進行充電</string>

    <string name="external_storage_turn_on">"外部存儲器已打開"</string>

    <string name="external_storage_turn_off">"外部存儲器已關閉"</string>

    <!-- modify for usb settings end  -->



    <string name="display_auto_rotate_title" msgid="6176450657107806043">"當裝置旋轉時"</string>

    <string name="display_auto_rotate_rotate" msgid="4544299861233497728">"旋轉畫面內容"</string>

    <string name="display_auto_rotate_stay_in_portrait" msgid="292745182318093651">"保持直向畫面"</string>

res/values/strings.xml

+6 −0
Original line number Diff line number Diff line
@@ -6186,6 +6186,12 @@ 
    <string name="data_to_wifi_connect_value_auto">0</string>

    <string name="data_to_wifi_connect_value_manul">1</string>

    <string name="data_to_wifi_connect_value_ask">2</string>

    <string name="usb_sdcard_summary">Lets you transfer media files in the SD card on computer</string>

    <string name="usb_sdcard_title">Mount SD card</string>

    <string name="usb_charging_title">Charging</string>

    <string name="usb_charging_summary">Lets you only charge the device</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="usb_charging_title">Charging</string>

    <string name="usb_charging_summary">Lets you disable all data and file transfer connection with computer and put device in charging only mode.</string>

    <string name="primary_sub_select_title">Default 4G/3G Subscription</string>

res/xml/usb_settings.xml

+6 −0
Original line number Diff line number Diff line
@@ -32,6 +32,12 @@ 
        android:summary="@string/usb_ptp_summary"

        />

        

    <CheckBoxPreference

        android:key="usb_sdcard"

        android:title="@string/usb_sdcard_title"

        android:summary="@string/usb_sdcard_summary"

        />



    <CheckBoxPreference

        android:key="usb_charging"

        android:title="@string/usb_charging_title"

src/com/android/settings/deviceinfo/UsbSettings.java

+1 −1

File changed.

Contains only whitespace changes.