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

Commit 498eed33 authored by huiwan's avatar huiwan Committed by Linux Build Service Account
Browse files

Settings: add USB OTG & UICC features' UI support. 

 - Modified string resources for appropriate alerts based on volume type

 - Changed title/summary strings for preferences based on volume type

 - There are two mountable partitions coming with UICC. But
   only one volume supports UMS. Only that should be shown in
   Settings->Storage screen.

 - UICC storage and OTG storage is shown, Hide not supported hardware UI.

 - Showing mount options for UICC, based on a system property
   Within Storage Settings, 'UICC Storage' category is shown based
   on a system property - persist.sys.isUICCEnabled
   It shall be not set by default, so UI will hide the 'UICC'
   mount/unmount menus.

 - Add UMS mode support, Android only supports MTP and PTP mode in
   UsbSettings screen, this change is to add USB mass storage mode.

Change-Id: I02f111e98517052ed13de0b81b463bc455392edb
parent 9d7f8789

res/layout/media_format_final.xml

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
        xmlns:android="http://schemas.android.com/apk/res/android"

        style="@style/info_layout">        



    <TextView

    <TextView android:id="@+id/execute_media_format_label"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textSize="20sp"

res/layout/media_format_primary.xml

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 
        xmlns:android="http://schemas.android.com/apk/res/android"

        style="@style/info_layout">



    <TextView

    <TextView android:id="@+id/initiate_media_format_label"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:textSize="18sp"

res/values-zh-rCN/strings.xml

+51 −14
Original line number Diff line number Diff line
@@ -922,20 +922,13 @@ 
    <string name="memory_music_usage" msgid="1363785144783011606">"音频（音乐、铃声、播客等）"</string>

    <string name="memory_media_misc_usage" msgid="235452944021647124">"其他"</string>

    <string name="memory_media_cache_usage" msgid="6704293333141177910">"缓存数据"</string>

    <string name="sd_eject" product="nosdcard" msgid="4988563376492400073">"卸载共享存储设备"</string>

    <string name="sd_eject" product="default" msgid="6915293408836853020">"卸载SD卡"</string>

    <string name="sd_eject_summary" product="nosdcard" msgid="5009296896648072891">"卸载内部USB存储设备"</string>

    <string name="sd_eject_summary" product="default" msgid="3300599435073550246">"需要先卸载SD卡，然后才能将其安全移除"</string>

    <string name="sd_insert_summary" product="nosdcard" msgid="5264016886409577313">"插入要装载的USB存储设备"</string>

    <string name="sd_insert_summary" product="default" msgid="2048640010381803841">"插入SD卡进行安装"</string>

    <string name="sd_mount" product="nosdcard" msgid="8966695015677343116">"装载USB存储设备"</string>

    <string name="sd_mount" product="default" msgid="5940523765187704135">"安装SD卡"</string>

    <string name="sd_mount_summary" product="nosdcard" msgid="4673411327373419641"></string>

    <string name="sd_mount_summary" product="default" msgid="4673411327373419641"></string>

    <string name="sd_format" product="nosdcard" msgid="2148179271623099054">"格式化USB存储设备"</string>

    <string name="sd_format" product="default" msgid="2576054280507119870">"格式化SD卡"</string>

    <string name="sd_format_summary" product="nosdcard" msgid="6331905044907914603">"清除内部USB存储设备中的全部数据，例如音乐和照片"</string>

    <string name="sd_format_summary" product="default" msgid="212703692181793109">"清除SD卡中的全部数据，例如音乐和照片"</string>

    <string name="sd_eject" msgid="6915293408836853020">"卸载SD卡"</string>

    <string name="sd_eject_summary" msgid="3300599435073550246">"需要先卸载SD卡，然后才能将其安全移除"</string>

    <string name="sd_insert_summary" msgid="2048640010381803841">"插入SD卡进行安装"</string>

    <string name="sd_mount" msgid="5940523765187704135">"安装SD卡"</string>

    <string name="sd_mount_summary" msgid="4673411327373419641"></string>

    <string name="sd_format" msgid="2576054280507119870">"格式化SD卡"</string>

    <string name="sd_format_summary" msgid="212703692181793109">"清除SD卡中的全部数据，例如音乐和照片"</string>

    <string name="memory_clear_cache_title" msgid="5423840272171286191">"是否清除缓存数据？"</string>

    <string name="memory_clear_cache_message" msgid="4550262490807415948">"此操作会清除所有应用的缓存数据。"</string>

    <string name="mtp_ptp_mode_summary" msgid="3710436114807789270">"已开启MTP或PTP功能"</string>
@@ -2488,4 +2481,48 @@ 
    <string name="encrypt_talkback_dialog_message_pattern" msgid="4474332516537386384">"当您绘制解锁图案以启动此设备时，<xliff:g id="SERVICE">%1$s</xliff:g>等辅助功能服务还未开启。"</string>

    <string name="encrypt_talkback_dialog_message_password" msgid="8166099418487083927">"当您输入密码以启动此设备时，<xliff:g id="SERVICE">%1$s</xliff:g>等辅助功能服务还未开启。"</string>

    <string name="primary_sub_select_title">默认4G/3G SIM卡</string>



    <!-- string resources for USB OTG & UICC features -->

    <string name="storage_usb">"USB 存储器"</string>

    <string name="storage_uicc">"电话卡存储设备"</string>

    <string name="usb_eject" product="default">"卸载 USB 存储设备"</string>

    <string name="usb_eject_summary" product="default">"需要先卸载 USB 存储设备，然后才能将其安全移除"</string>

    <string name="usb_format" product="default">"格式化 USB 存储设备"</string>

    <string name="usb_format_summary" product="default">"清除 USB 存储设备中的全部数据，例如音乐和照片"</string>

    <string name="usb_mount" product="default">"装载 USB 存储设备"</string>

    <string name="usb_mount_summary" product="default"></string>

    <string name="usb_insert_summary" product="default">"插入要装载的 USB 存储设备"</string>

    <string name="uicc_eject" product="default">"卸载 UICC 存储设备"</string>

    <string name="uicc_eject_summary" product="default">"需要先卸载 UICC 存储设备，然后才能将其安全移除"</string>

    <string name="uicc_format" product="default">"格式化 UICC 存储设备"</string>

    <string name="uicc_format_summary" product="default">"清除 UICC 存储设备中的全部数据，例如音乐和照片"</string>

    <string name="uicc_mount" product="default">"装载 UICC 存储设备"</string>

    <string name="uicc_mount_summary" product="default"></string>

    <string name="uicc_insert_summary" product="default">"插入要装载的 UICC 存储设备"</string>



    <string name="dlg_confirm_usb_unmount_title" product="default">"要卸载 USB 存储设备吗？"</string>

    <string name="dlg_confirm_uicc_unmount_title" product="default">"要卸载 UICC 存储设备吗？"</string>

    <string name="dlg_confirm_usb_unmount_text" product="default">"如果卸载该 USB 存储设备，您当前使用的某些应用会停止运行，并且在您重新装载该设备前可能都无法使用。"</string>

    <string name="dlg_confirm_uicc_unmount_text" product="default">"如果卸载该 UICC 存储设备，您当前使用的某些应用会停止运行，并且在您重新装载该设备前可能都无法使用。"</string>

    <string name="dlg_error_usb_unmount_text" product="default">"无法卸载 USB 存储设备，请稍后重试。"</string>

    <string name="dlg_error_uicc_unmount_text" product="default">"无法卸载 UICC 存储设备，请稍后重试。"</string>

    <string name="usb_unmount_inform_text" product="default">"系统将会卸载 USB 存储设备。"</string>

    <string name="uicc_unmount_inform_text" product="default">"系统将会卸载 UICC 存储设备。"</string>



    <string name="usb_media_format_title" product="default">"格式化 USB 存储设备"</string>

    <string name="uicc_media_format_title" product="default">"格式化 UICC 存储设备"</string>

    <string name="usb_media_format_summary" product="default">"清除 USB 存储设备中的全部数据"</string>

    <string name="uicc_media_format_summary" product="default">"清除 UICC 存储设备中的全部数据"</string>

    <string name="usb_media_format_desc" product="default">"要清空 USB 存储设备吗？如果这样做，您会丢失其中存储的"<b>"全部"</b>"数据！"</string>

    <string name="uicc_media_format_desc" product="default">"要清空 UICC 存储设备吗？如果这样做，您会丢失其中存储的"<b>"全部"</b>"数据！"</string>

    <string name="usb_media_format_button_text" product="default">"格式化 USB 存储设备"</string>

    <string name="uicc_media_format_button_text" product="default">"格式化 UICC 存储设备"</string>

    <string name="usb_media_format_final_desc" product="default">"要清空 USB 存储设备（此操作会删除其中存储的全部文件）吗？请注意，此操作无法撤消！"</string>

    <string name="uicc_media_format_final_desc" product="default">"要清空 UICC 存储设备（此操作会删除其中存储的全部文件）吗？请注意，此操作无法撤消！"</string>

    <string name="usb_media_format_gesture_explanation" product="default">"您需要绘制解锁图案以确认要格式化 USB 存储设备。"</string>

    <string name="uicc_media_format_gesture_explanation" product="default">"您需要绘制解锁图案以确认要格式化 UICC 存储设备。"</string>

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

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

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

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

</resources>

res/values/strings.xml

+45 −0
Original line number Diff line number Diff line
@@ -2316,6 +2316,46 @@ 
    <string name="sd_format_summary" product="default">Erases all data on the SD card, such as music and photos</string>

    <!-- SD card status when it is mounted as read only. Will be appended to size, starts with an unbreakable space -->



    <!-- string resources for USB OTG & UICC features -->

    <string name="storage_usb">USB storage</string>

    <string name="storage_uicc">UICC storage</string>

    <string name="usb_eject" product="default">Unmount USB storage</string>

    <string name="usb_eject_summary" product="default">Unmount the USB storage so you can safely remove it</string>

    <string name="usb_format" product="default">Erase USB storage</string>

    <string name="usb_format_summary" product="default">Erases all data on the USB storage, such as music and photos</string>

    <string name="usb_mount" product="default">Mount USB storage</string>

    <string name="usb_mount_summary" product="default"></string>

    <string name="usb_insert_summary" product="default">Insert an USB storage for mounting</string>

    <string name="uicc_eject" product="default">Unmount UICC storage</string>

    <string name="uicc_eject_summary" product="default">Unmount the UICC storage so you can safely remove it</string>

    <string name="uicc_format" product="default">Erase UICC storage</string>

    <string name="uicc_format_summary" product="default">Erases all data on the UICC storage, such as music and photos</string>

    <string name="uicc_mount" product="default">Mount UICC storage</string>

    <string name="uicc_mount_summary" product="default"></string>

    <string name="uicc_insert_summary" product="default">Insert an UICC storage for mounting</string>



    <string name="dlg_confirm_usb_unmount_title" product="default">Unmount USB storage?</string>

    <string name="dlg_confirm_uicc_unmount_title" product="default">Unmount UICC storage?</string>

    <string name="dlg_confirm_usb_unmount_text" product="default">If you unmount the USB storage, some apps you are using will stop and may be unavailable until you remount the USB storage.</string>

    <string name="dlg_confirm_uicc_unmount_text" product="default">If you unmount the UICC storage, some apps you are using will stop and may be unavailable until you remount the UICC storage.</string>

    <string name="dlg_error_usb_unmount_text" product="default">Couldn\'t unmount USB storage. Try again later.</string>

    <string name="dlg_error_uicc_unmount_text" product="default">Couldn\'t unmount UICC storage. Try again later.</string>

    <string name="usb_unmount_inform_text" product="default">USB storage will be unmounted.</string>

    <string name="uicc_unmount_inform_text" product="default">UICC storage will be unmounted.</string>



    <string name="usb_media_format_title" product="default">Erase USB storage</string>

    <string name="uicc_media_format_title" product="default">Erase UICC storage</string>

    <string name="usb_media_format_summary" product="default">Erases all data on the USB storage</string>

    <string name="uicc_media_format_summary" product="default">Erases all data on the UICC storage</string>

    <string name="usb_media_format_desc" product="default">Erase the USB storage? You will lose <b>all</b> data on the storage!</string>

    <string name="uicc_media_format_desc" product="default">Erase the UICC storage? You will lose <b>all</b> data on the storage!</string>

    <string name="usb_media_format_button_text" product="default">Erase USB storage</string>

    <string name="uicc_media_format_button_text" product="default">Erase UICC storage</string>

    <string name="usb_media_format_final_desc" product="default">Erase the USB storage, deleting all files stored there? You can\'t reverse this action!</string>

    <string name="uicc_media_format_final_desc" product="default">Erase the UICC storage, deleting all files stored there? You can\'t reverse this action!</string>

    <string name="usb_media_format_gesture_explanation" product="default">You need to draw your unlock pattern to confirm that you want to erase the USB storage.</string>

    <string name="uicc_media_format_gesture_explanation" product="default">You need to draw your unlock pattern to confirm that you want to erase the UICC storage.</string>



    <!-- Title of dialog asking user to confirm before clearing all caches. [CHAR LIMIT=48] -->

    <string name="memory_clear_cache_title">Clear cached data?</string>

    <!-- Message of dialog asking user to confirm before clearing all caches. [CHAR LIMIT=48] -->
@@ -6053,4 +6093,9 @@ 
    <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>



    <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="external_storage_turn_on">External storage has been turned on</string>

    <string name="external_storage_turn_off">External storage has been turned off</string>

</resources>

res/xml/usb_settings.xml

+6 −0
Original line number Diff line number Diff line
@@ -38,4 +38,10 @@ 
        android:summary="@string/usb_charging_summary"

        />



    <CheckBoxPreference

        android:key="usb_sdcard"

        android:title="@string/usb_sdcard_title"

        android:summary="@string/usb_sdcard_summary"

        />



</PreferenceScreen>