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

Commit 710effc5 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "AppOps: Add Chinese support for AppOps dialog."

parents 253dcc1c 588d6797

core/res/res/values-zh-rCN/strings.xml

+43 −0
Original line number Diff line number Diff line
@@ -1650,4 +1650,47 @@ 
  </plurals>

    <string name="restr_pin_try_later" msgid="973144472490532377">"稍后重试"</string>

    <string name="immersive_mode_confirmation" msgid="7227416894979047467">"从顶部向下滑动即可退出全屏模式。"</string>



    <!-- App Ops -->

    <string name="permission_remember_choice">记住</string>

    <string name="permission">权限</string>

    <string-array name="app_ops_labels">

        <item>试图获取位置信息</item>

        <item>试图获取位置信息</item>

        <item>试图获取位置信息</item>

        <item>试图使用震动器</item>

        <item>试图读取联系人</item>

        <item>试图修改联系人</item>

        <item>试图读取通话记录</item>

        <item>试图修改通话记录</item>

        <item>试图读取日程表</item>

        <item>试图修改日程表</item>

        <item>试图获取位置信息</item>

        <item>试图发出通知</item>

        <item>试图获取位置信息</item>

        <item>试图拨打电话</item>

        <item>试图读取短信</item>

        <item>试图修改短信</item>

        <item>试图收取短信</item>

        <item>试图收取短信</item>

        <item>试图收取彩信</item>

        <item>试图收取短信</item>

        <item>试图发送短信</item>

        <item>试图读取短信</item>

        <item>试图修改短信</item>

        <item>试图修改设置</item>

        <item>试图在顶层绘图</item>

        <item>试图获取通知</item>

        <item>试图使用相机</item>

        <item>试图录音</item>

        <item>试图放音</item>

        <item>试图读取剪贴板</item>

        <item>试图修改剪贴板</item>

        <item>试图开关Wifi</item>

        <item>试图开关蓝牙</item>

        <item>试图开关移动数据</item>

        <item>试图发送彩信</item>

        <item>试图读取彩信</item>

        <item>试图修改彩信</item>

    </string-array>

</resources>

core/res/res/values/strings.xml

+1 −0
Original line number Diff line number Diff line
@@ -4519,4 +4519,5 @@ 


    <!-- Text of the checkbox for the permission confirmation dialog to remember the user's choice. [CHAR LIMIT=40] -->

    <string name="permission_remember_choice">Remember</string>

    <string name="permission">Permission</string>

</resources>

core/res/res/values/symbols.xml

+3 −0
Original line number Diff line number Diff line
@@ -401,6 +401,7 @@ 
  <java-symbol type="string" name="activity_chooser_view_see_all" />

  <java-symbol type="string" name="activitychooserview_choose_application" />

  <java-symbol type="string" name="alternate_eri_file" />

  <java-symbol type="string" name="allow" />

  <java-symbol type="string" name="alwaysUse" />

  <java-symbol type="string" name="autofill_address_line_1_label_re" />

  <java-symbol type="string" name="autofill_address_line_1_re" />
@@ -507,6 +508,7 @@ 
  <java-symbol type="string" name="db_wal_sync_mode" />

  <java-symbol type="string" name="decline" />

  <java-symbol type="string" name="default_text_encoding" />

  <java-symbol type="string" name="deny" />

  <java-symbol type="string" name="description_target_unlock_tablet" />

  <java-symbol type="string" name="display_manager_built_in_display_name" />

  <java-symbol type="string" name="display_manager_hdmi_display_name" />
@@ -640,6 +642,7 @@ 
  <java-symbol type="string" name="orgTypeWork" />

  <java-symbol type="string" name="passwordIncorrect" />

  <java-symbol type="string" name="enablePin" />

  <java-symbol type="string" name="permission" />

  <java-symbol type="string" name="perms_description_app" />

  <java-symbol type="string" name="perms_new_perm_prefix" />

  <java-symbol type="string" name="petabyteShort" />

services/java/com/android/server/PermissionDialog.java

+3 −3
Original line number Diff line number Diff line
@@ -71,12 +71,12 @@ class PermissionDialog extends BasePermissionDialog { 
        setCancelable(false);



        setButton(DialogInterface.BUTTON_POSITIVE,

                  "Allow", mHandler.obtainMessage(ACTION_ALLOWED));

                  res.getString(com.android.internal.R.string.allow), mHandler.obtainMessage(ACTION_ALLOWED));



        setButton(DialogInterface.BUTTON_NEGATIVE,

                  "Denied", mHandler.obtainMessage(ACTION_IGNORED));

                    res.getString(com.android.internal.R.string.deny), mHandler.obtainMessage(ACTION_IGNORED));



        setTitle("Permission");

        setTitle(res.getString(com.android.internal.R.string.permission));

        WindowManager.LayoutParams attrs = getWindow().getAttributes();

        attrs.setTitle("Permission info: " + getAppName(mPackageName));

        attrs.privateFlags |= WindowManager.LayoutParams.PRIVATE_FLAG_SYSTEM_ERROR