update zh-cn translte and fix possible compile crash issue #14

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open

huoyan1231 wants to merge 24 commits into RisingOS-Revived:sixteen from huoyan1231:sixteen

res/layout/keybox_data_pref.xml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -1,10 +1,35 @@
  
    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"

    <LinearLayout

        xmlns:android="http://schemas.android.com/apk/res/android"

        xmlns:app="http://schemas.android.com/apk/res-auto"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center_vertical"

        android:minHeight="?android:attr/listPreferredItemHeightSmall"

        android:paddingStart="?android:attr/listPreferredItemPaddingStart"

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">

        android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"

        android:clipToPadding="false"

        android:baselineAligned="false">

        <LinearLayout

            android:id="@+id/icon_frame"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:minWidth="48dp"

            android:gravity="start|center_vertical"

            android:orientation="horizontal"

            android:paddingStart="0dp"

            android:paddingEnd="8dp"

            android:paddingTop="4dp"

            android:paddingBottom="4dp">

            <androidx.preference.internal.PreferenceImageView

                android:id="@android:id/icon"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:contentDescription="@null"

                app:maxWidth="48dp"

                app:maxHeight="48dp" />

        </LinearLayout>

        <LinearLayout

            android:layout_width="0dp"

    @@ -16,28 +41,33 @@
  
            <TextView

                android:id="@+id/title"

                android:layout_width="match_parent"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:textAppearance="?android:attr/textAppearanceListItem"

                android:maxLines="1"

                android:ellipsize="end"

                android:maxLines="1" />

                android:textAppearance="?android:attr/textAppearanceListItem" />

            <TextView

                android:id="@+id/summary"

                android:layout_width="match_parent"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content"

                android:textAppearance="?android:attr/textAppearanceSmall"

                android:textAppearance="?android:attr/textAppearanceListItemSecondary"

                android:textColor="?android:attr/textColorSecondary"

                android:ellipsize="marquee" />

                android:maxLines="5"

                android:ellipsize="end" />

        </LinearLayout>

        <ImageButton

            android:id="@+id/delete_button"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:minWidth="48dp"

            android:minHeight="48dp"

            android:layout_gravity="center_vertical"

            android:src="@drawable/ic_trash_can"

            android:background="?android:attr/selectableItemBackgroundBorderless"

            android:scaleType="centerInside"

            android:contentDescription="@string/keybox_delete_content_description"

            android:duplicateParentState="true"

            android:layout_marginStart="16dp"

            android:layout_marginEnd="8dp" />

    </LinearLayout>

res/raw-night/lottie_gesture_screenshot.json

Large diffs are not rendered by default.

res/raw-night/nt_power_off_verify.json

Large diffs are not rendered by default.

res/raw/lottie_gesture_screenshot.json

Large diffs are not rendered by default.

res/raw/nt_power_off_verify.json

Large diffs are not rendered by default.

res/values-zh-rCN/custom_strings.xml

Large diffs are not rendered by default.

res/values/custom_arrays.xml

            
                      Original file line number
                      Diff line number
                      Diff line change
                  
    @@ -15,6 +15,100 @@
  
         limitations under the License.

    -->

    <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

        <!--Brightness Slider Shape -->

        <string-array name="qs_brightness_slider_shape_entries">

            <item>@string/default_value</item>

            <item>@string/quick_settings_tile_shape_circle</item>

            <item>@string/quick_settings_tile_shape_rounded_square</item>

            <item>@string/quick_settings_tile_shape_square</item>

        </string-array>

        <string-array name="qs_brightness_slider_shape_values">

            <item>0</item>

            <item>1</item>

            <item>2</item>

            <item>3</item>

        </string-array>

        <!-- Themes - Lock/Unlock Sounds -->

        <string-array name="themes_lock_unlock_sounds_entries" translatable="false">

            <item>Default</item>

            <item>Amazon Fire</item>

            <item>Asus Zenfone Max</item>

            <item>Essential PH-1</item>

            <item>HTC M8</item>

            <item>Huawei</item>

            <item>Hyper OS</item>

            <item>Iqoo</item>

            <item>LG G3</item>

            <item>Minecraft door</item>

            <item>MIUI 10</item>

            <item>MIUI 11</item>

            <item>Nextbit</item>

            <item>Nokia X</item>

            <item>Old School IOS</item>

            <item>One UI</item>

            <item>OOS 14</item>

            <item>Razer Phone</item>

            <item>Soong</item>

            <item>Windows Device</item>

            <item>Windows Error</item>

        </string-array>

        <string-array name="themes_lock_sounds_values" translatable="false">

            <item>/product/media/audio/ui/Lock.ogg</item>

            <item>/product/media/audio/ui/Amazon_Fire_Lock.ogg</item>

            <item>/product/media/audio/ui/Asus_Zenfone_Max_Lock.ogg</item>

            <item>/product/media/audio/ui/Essential_PH-1_Lock.ogg</item>

            <item>/product/media/audio/ui/HTC_M8_Lock.ogg</item>

            <item>/product/media/audio/ui/Huawei_Lock.ogg</item>

            <item>/product/media/audio/ui/Hyper_OS_Lock.ogg</item>

            <item>/product/media/audio/ui/Iqoo_Lock.ogg</item>

            <item>/product/media/audio/ui/LG_G3_Lock.ogg</item>

            <item>/product/media/audio/ui/Minecraft_Door_Lock.ogg</item>

            <item>/product/media/audio/ui/MIUI_10_Lock.ogg</item>

            <item>/product/media/audio/ui/MIUI_11_Lock.ogg</item>

            <item>/product/media/audio/ui/Nextbit_Lock.ogg</item>

            <item>/product/media/audio/ui/Nokia_X_Lock.ogg</item>

            <item>/product/media/audio/ui/Old_School_IOS_Lock.ogg</item>

            <item>/product/media/audio/ui/One_UI_Lock.ogg</item>

            <item>/product/media/audio/ui/OOS_14_Lock.ogg</item>

            <item>/product/media/audio/ui/Razer_Phone_Lock.ogg</item>

            <item>/product/media/audio/ui/Soong_Lock.ogg</item>

            <item>/product/media/audio/ui/Windows_Device_Lock.ogg</item>

            <item>/product/media/audio/ui/Windows_Error_Lock.ogg</item>

        </string-array>

        <string-array name="themes_unlock_sounds_values" translatable="false">

            <item>/product/media/audio/ui/Unlock.ogg</item>

            <item>/product/media/audio/ui/Amazon_Fire_Unlock.ogg</item>

            <item>/product/media/audio/ui/Asus_Zenfone_Max_Unlock.ogg</item>

            <item>/product/media/audio/ui/Essential_PH-1_Unlock.ogg</item>

            <item>/product/media/audio/ui/HTC_M8_Unlock.ogg</item>

            <item>/product/media/audio/ui/Huawei_Unlock.ogg</item>

            <item>/product/media/audio/ui/Hyper_OS_Unlock.ogg</item>

            <item>/product/media/audio/ui/Iqoo_Unlock.ogg</item>

            <item>/product/media/audio/ui/LG_G3_Unlock.ogg</item>

            <item>/product/media/audio/ui/Minecraft_Door_Unlock.ogg</item>

            <item>/product/media/audio/ui/MIUI_10_Unlock.ogg</item>

            <item>/product/media/audio/ui/MIUI_11_Unlock.ogg</item>

            <item>/product/media/audio/ui/Nextbit_Unlock.ogg</item>

            <item>/product/media/audio/ui/Nokia_X_Unlock.ogg</item>

            <item>/product/media/audio/ui/Old_School_IOS_Unlock.ogg</item>

            <item>/product/media/audio/ui/One_UI_Unlock.ogg</item>

            <item>/product/media/audio/ui/OOS_14_Unlock.ogg</item>

            <item>/product/media/audio/ui/Razer_Phone_Unlock.ogg</item>

            <item>/product/media/audio/ui/Soong_Unlock.ogg</item>

            <item>/product/media/audio/ui/Windows_Device_Unlock.ogg</item>

            <item>/product/media/audio/ui/Windows_Error_Unlock.ogg</item>

        </string-array>

        <!-- Base attributes available to OverlaySwitchPreference. -->

        <declare-styleable name="OverlaySwitchPreference">

            <attr name="dkey" format="string" />

            <attr name="dkeyNightOnly" format="boolean" />

        </declare-styleable>

        <!-- Pop-Up View -->

        <string-array name="pop_up_view_tap_action_entries">

            <item>@string/pop_up_view_action_enter_pinned</item>

    @@ -176,12 +270,14 @@
  
            <item>@string/color_default</item>

            <item>@string/pie_system_animation_style</item>

            <item>@string/scale_system_animation_style</item>

            <item>@string/slide_system_animation_style</item>

        </string-array>

        <string-array name="system_animation_styles_values" translatable="false">

            <item>0</item>

            <item>1</item>

            <item>2</item>

            <item>3</item>

        </string-array>

        <!-- Power Menu styles  -->

    @@ -191,6 +287,7 @@
  
            <item>@string/powermenu_style2</item>

            <item>@string/powermenu_style3</item>

            <item>@string/powermenu_style4</item>

            <item>@string/powermenu_style5</item>

        </string-array>

        <string-array name="powermenu_style_values" translatable="false">

    @@ -199,6 +296,7 @@
  
            <item>2</item>

            <item>3</item>

            <item>4</item>

            <item>5</item>

        </string-array>

        <!-- QS Header clock styles  -->

    @@ -892,7 +990,7 @@
  
        </string-array>

        <!-- Hardware key rebinding -->

        <string-array name="hardware_keys_action_entries" translatable="false">

        <string-array name="gesture_actions_entries" translatable="false">

            <item>@string/hardware_keys_action_nothing</item>

            <item>@string/hardware_keys_action_menu</item>

            <item>@string/hardware_keys_action_app_switch</item>

    @@ -914,7 +1012,7 @@
  
            <item>@string/hardware_keys_action_ringer_modes</item>

        </string-array>

        <string-array name="hardware_keys_action_values" translatable="false">

        <string-array name="gesture_actions_values" translatable="false">

            <item>0</item>

            <item>1</item>

            <item>2</item>

res/values/custom_strings.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -15,6 +15,50 @@ @@
          limitations under the License.
     -->
     <resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+        <!-- Brightness Slider Style -->
+        <string name="qs_brightness_slider_shape_title">New QS Brightness slider shape</string>
+        <string name="quick_settings_tile_shape_circle">Circle</string>
+        <string name="quick_settings_tile_shape_rounded_square">Rounded square</string>
+        <string name="quick_settings_tile_shape_square">Square</string>
+        <!-- Power off verify -->
+        <string name="power_off_verify_footer">Power off verification protects your device by preventing others from turning it off immediately after it\'s lost, increasing the chances of recovery. You only need to enter your lock screen password when powering off or restarting the phone from the lock screen.</string>
+        <string name="power_off_verify_summary">When your device is locked, you\'ll need to use your password to power off or restart.</string>
+        <string name="power_off_verify_title">Power off verify</string>
+        <!-- Lock screen charging time -->
+        <string name="lock_screen_charging_time_title">Lock screen charging time</string>
+        <string name="lock_screen_charging_time_summary">Display the remaining time for charging to finish</string>
+        <!-- Notification Row -->
+        <string name="notification_row_transparency_title">Notification row transparency</string>
+        <string name="notification_row_transparency_summary">Show translucent quicksettings notifications</string>
+        <!-- NT Three finger -->
+        <string name="nt_gesture_three_finger_swipe">Three finger swipe</string>
+        <string name="nt_gesture_three_finger_swipe_summary">Swipe down with three fingers to perform actions.</string>
+        <string name="nt_gesture_three_finger_long_press">Three finger long press</string>
+        <string name="nt_gesture_three_finger_long_press_summary">Press and hold with three fingers and then swipe down to take an area screenshot.</string>
+        <string name="nt_combination_power_volume_click">Disable power button &amp; volume down button</string>
+        <string name="nt_combination_power_volume_click_summary">Disable the function of taking a screenshot by pressing and holding the power button and the volume down button.</string>
+        <!-- Small landscape notifications -->
+        <string name="small_landscape_notification_title">Small landscape notifications</string>
+        <string name="small_landscape_notification_summary">Shows notifications smaller in width in notification panel in landscape mode just as AOSP intended</string>
+        <!-- Lock/Unlock sound -->
+        <string name="themes_audio_category">Audio</string>
+        <string name="themes_lock_sound_title">Lock sound</string>
+        <string name="themes_unlock_sound_title">Unlock sound</string>
+        <!-- Single tap for keyguard affordance -->
+        <string name="keyguard_affordance_single_tap_title">Keyguard affordance single tap</string>
+        <string name="keyguard_affordance_single_tap_summary">Toggle keyguard affordances with a single tap</string>
+        <!-- AOD wallpaper -->
+        <string name="aod_wallpaper_title">AOD wallpaper</string>
+        <string name="aod_wallpaper_summary">Show wallpaper when aod on</string>
         <!-- Per-app configs -->
         <string name="per_app_config_empty_text">No installed apps support current settings</string>
         <string name="per_app_config_no_result_text">No apps found matching \"%1$s\"</string>
@@ Expand Down Expand Up / @@ -85,8 +129,16 @@ @@
         <string name="spoofing_photos_summary">Spoof the Google Photos app as a Pixel XL</string>
         <string name="spoofing_snap_title">Snapchat</string>
         <string name="spoofing_snap_summary">Spoof Snapchat as a Pixel XL to fix possible chat issues</string>
-        <string name="keybox_data_title">Select keybox XML to spoof</string>
-        <string name="keybox_data_summary">Select keybox XML used for key attestation spoofing for all apps system wide. Click the delete button in order to reset the keybox data values used by the system.</string>
+        <string name="keybox_data_title">Keybox attestation override</string>
+        <string name="keybox_data_summary">Load a custom keybox XML to override device key attestation</string>
+        <string name="keybox_data_loaded_summary">Custom keybox XML loaded. Delete to clear.</string>
+        <string name="keybox_delete_content_description">Clear keybox data</string>
+        <string name="keybox_toast_invalid_file_selected">Not an XML file. Choose a valid keybox XML.</string>
+        <string name="keybox_toast_missing_data">Invalid keybox XML: required fields missing</string>
+        <string name="keybox_toast_file_loaded">Keybox loaded</string>
+        <string name="keybox_toast_file_cleared">Keybox cleared</string>
+        <string name="keybox_check_title">Private Keybox spoof</string>
+        <string name="keybox_check_summary">Spoof the private key only if you have a valid Keybox for proper Strong Integrity.</string>
         <!-- Screen off AOD -->
         <string name="screen_off_aod_enabled_title">Screen Off AOD</string>
@@ Expand Down Expand Up / @@ -271,8 +323,9 @@ @@
         <string name="powermenu_style_title">Power Menu Style</string>
         <string name="powermenu_style1">Cyberpunk</string>
         <string name="powermenu_style2">Duoline</string>
-        <string name="powermenu_style3">IOS</string>
-        <string name="powermenu_style4">Layers</string>
+        <string name="powermenu_style3">Fluid (Transparent)</string>
+        <string name="powermenu_style4">IOS</string>
+        <string name="powermenu_style5">Layers</string>
         <!-- QS Header Clock Styles -->
         <string name="qs_header_clock_style_title">QS Header clock style</string>
@@ Expand Down Expand Up / @@ -317,6 +370,12 @@ @@
         <string name="peek_display_notifications_summary">Minimal lockscreen notification style</string>
         <string name="peek_display_location_title">Peek display location</string>
         <string name="peek_display_bottom_margin_title">Peek display (bottom) top margin</string>
+        <string name="peek_display_vertical_offset_title">Vertical offset</string>
+        <string name="peek_display_vertical_offset_summary">Adjust the vertical position of peek display notifications</string>
+        <string name="peek_display_always_visible_title">Always visible</string>
+        <string name="peek_display_always_visible_summary">Keep peek display notifications visible until manually dismissed</string>
+        <string name="peek_display_timeout_title">Auto dismiss timeout</string>
+        <string name="peek_display_timeout_summary">Time in seconds before peek display notifications automatically disappear</string>
         <!-- Dashboard Revamped -->
         <string name="colors_title">Colours</string>
@@ Expand Down Expand Up / @@ -2442,6 +2501,7 @@ @@
         <string name="system_animation_style_title">System animation style</string>
         <string name="pie_system_animation_style">Android P</string>
         <string name="scale_system_animation_style">Scale</string>
+        <string name="slide_system_animation_style">Slide</string>
         <!-- Selected app spoofing -->
         <string name="select_apps_to_spoof">Select Apps to Spoof</string>
@@ Expand Down @@

res/xml/power_off_verify.xml

-Original file line number
+Diff line change
@@ -0,0 +1,15 @@
+    <?xml version="1.0" encoding="utf-8"?>
+    <PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android" xmlns:settings="http://schemas.android.com/apk/res-auto" android:title="@string/power_off_verify_title">
+        <com.android.settingslib.widget.IllustrationPreference
+            android:selectable="false"
+            settings:lottie_rawRes="@raw/nt_power_off_verify"
+            settings:searchable="false"/>
+        <com.android.settings.preferences.SecureSettingSwitchPreference
+            android:title="@string/power_off_verify_title"
+            android:key="power_off_verify"
+            android:summary="@string/power_off_verify_summary"/>
+        <com.android.settingslib.widget.FooterPreference
+            android:title="@string/power_off_verify_footer"
+            android:selectable="false"
+            settings:searchable="false"/>
+    </PreferenceScreen>

res/xml/pulse_settings.xml

-Original file line number
+Diff line change
@@ Expand Up / @@ -103,6 +103,7 @@ @@
                 android:defaultValue="14"
                 android:max="30"
                 settings:min="1"
+                settings:interval="1"
                 settings:units="@string/unit_pixels"
                 android:dependency="pulse_fading_bars_category"
                 lineage:position="top"/>
@@ Expand All / @@ -123,6 +124,7 @@ @@
                 android:defaultValue="4"
                 android:max="8"
                 settings:min="4"
+                settings:interval="1"
                 settings:units="@string/unit_pixels"
                 android:dependency="pulse_fading_bars_category"/>
@@ Expand All / @@ -132,6 +134,7 @@ @@
                 android:defaultValue="1"
                 android:max="4"
                 settings:min="0"
+                settings:interval="1"
                 settings:units="@string/unit_pixels"
                 android:dependency="pulse_fading_bars_category"/>
@@ Expand All / @@ -141,6 +144,7 @@ @@
                 android:defaultValue="4"
                 android:max="6"
                 settings:min="2"
+                settings:interval="1"
                 android:dependency="pulse_fading_bars_category"
                 lineage:position="bottom"/>
         </PreferenceCategory>
@@ Expand All / @@ -163,6 +167,7 @@ @@
                 android:defaultValue="200"
                 android:max="255"
                 settings:min="0"
+                settings:interval="1"
                 android:dependency="pulse_2"/>
             <com.android.settings.preferences.SecureSettingSeekBarPreference
@@ Expand All / @@ -180,6 +185,7 @@ @@
                 android:defaultValue="4"
                 android:max="8"
                 settings:min="1"
+                settings:interval="1"
                 android:dependency="pulse_2"
                 lineage:position="bottom"/>
         </PreferenceCategory>
@@ Expand Down @@