Merge "Clean unused string arrays" (c613009c) · Commits · e / os / android_packages_apps_Settings

res/values/arrays.xml

+0 −200

Original line number	Diff line number	Diff line
		@@ -300,22 +300,6 @@
		<item>@string/wifi_ap_prefer_5G</item>
		</string-array>

		<string-array translatable="false" name="wifi_ap_band_config_2G_only">
		<item>@string/wifi_ap_choose_auto</item>
		<item>@string/wifi_ap_choose_2G</item>
		</string-array>

		<!-- Wi-Fi WPS setup for p2p connections. -->
		<!-- Note that adding/removing/moving the items will need wifi settings code change. -->
		<string-array name="wifi_p2p_wps_setup">
		<!-- Push button based configuration involves pushing a button on two connecting devices [CHAR LIMIT=30]-->
		<item>Push button</item>
		<!-- This involves entering a pin obtained from a peer device [CHAR LIMIT=30] -->
		<item>PIN from peer device</item>
		<!-- This involves generating a pin from this device [CHAR LIMIT=20] -->
		<item>PIN from this device</item>
		</string-array>

		<!-- Match this with the order of WifiP2pDevice.Status -->
		<!-- Wi-Fi p2p settings device status message -->
		<string-array name="wifi_p2p_status">
		@@ -329,14 +313,6 @@

		<!-- Bluetooth Settings -->

		<!-- Discoverable mode timeout options -->
		<string-array name="bluetooth_visibility_timeout_entries">
		<item>2 minutes</item>
		<item>5 minutes</item>
		<item>1 hour</item>
		<item>Never time out</item>
		</string-array>

		<!-- Bluetooth developer settings: Titles for maximum number of connected audio devices -->
		<string-array name="bluetooth_max_connected_audio_devices">
		<item>Use System Default: <xliff:g id="default_bluetooth_max_connected_audio_devices">%1$d</xliff:g></item>
		@@ -367,14 +343,6 @@
		<item>Excellent</item>
		</string-array>

		<!-- Data Usage settings. Range of data usage. -->
		<string-array name="data_usage_data_range">
		<!-- Last 30 days [CHAR LIMIT=25]-->
		<item>Last 30 days</item>
		<!-- Set usage cycle [CHAR LIMIT=25]-->
		<item>Set usage cycle...</item>
		</string-array>

		<!-- Display options for UsageStats class -->
		<string-array name="usage_stats_display_order_types">
		<item>Usage time</item>
		@@ -382,14 +350,6 @@
		<item>App name</item>
		</string-array>

		<!-- EAP method -->
		<string-array name="wifi_eap_entries">
		<item>PEAP</item>
		<item>TLS</item>
		<item>TTLS</item>
		<item>PWD</item>
		</string-array>

		<!-- Phase 2 options for PEAP -->
		<string-array name="wifi_peap_phase2_entries">
		<item>MSCHAPV2</item>
		@@ -559,15 +519,6 @@
		<item>auto</item>
		</string-array>

		<!-- Names of categories of app ops tabs -->
		<string-array name="app_ops_categories">
		<item>Location</item>
		<item>Personal</item>
		<item>Messaging</item>
		<item>Media</item>
		<item>Device</item>
		</string-array>

		<!-- User display names for app ops codes -->
		<string-array name="app_ops_summaries">
		<item>coarse location</item>
		@@ -1019,20 +970,6 @@
		<item>IKEv2/IPSec RSA</item>
		</string-array>

		<!-- Match this with the constants in VpnProfile. --> <skip />
		<!-- Longer descriptions for each VPN type. [CHAR LIMIT=100] -->
		<string-array name="vpn_types_long">
		<item>PPTP VPN</item>
		<item>L2TP/IPSec VPN with pre-shared keys</item>
		<item>L2TP/IPSec VPN with certificates</item>
		<item>IPSec VPN with pre-shared keys and Xauth authentication</item>
		<item>IPSec VPN with certificates and Xauth authentication</item>
		<item>IPSec VPN with certificates and hybrid authentication</item>
		<item>IKEv2/IPSec VPN with certificates and username/password authentication</item>
		<item>IKEv2/IPSec VPN with pre-shared keys</item>
		<item>IKEv2/IPSec VPN with certificates</item>
		</string-array>

		<!-- VPN proxy settings. -->
		<string-array name="vpn_proxy_settings">
		<!-- No HTTP proxy is used for the current VPN [CHAR LIMIT=25] -->
		@@ -1058,24 +995,6 @@
		<item>Unsuccessful</item>
		</string-array>

		<!-- User content ratings for restricted users [CHAR LIMIT=30] -->
		<string-array name="user_content_ratings_entries" translatable="false">
		<item>Ascended being</item>
		<item>Human</item>
		<item>Neanderthal</item>
		<item>Chimp</item>
		<item>Monkey</item>
		</string-array>

		<!-- Values for user content ratings for restricted users -->
		<string-array name="user_content_ratings_values" translatable="false">
		<item>5</item>
		<item>4</item>
		<item>3</item>
		<item>2</item>
		<item>1</item>
		</string-array>

		<!-- Values for premium SMS permission selector [CHAR LIMIT=30] -->
		<string-array name="security_settings_premium_sms_values">
		<!-- Ask user before sending to premium SMS short code. -->
		@@ -1117,13 +1036,6 @@
		<item>3</item>
		</integer-array>

		<!-- Summary for color space adjustment modes for accessibility -->
		<string-array name="daltonizer_mode_summaries" translatable="false">
		<item>@string/daltonizer_mode_deuteranomaly</item>
		<item>@string/daltonizer_mode_protanomaly</item>
		<item>@string/daltonizer_mode_tritanomaly</item>
		</string-array>

		<!-- Keys for color space adjustment modes for accessibility -->
		<string-array name="daltonizer_mode_keys" translatable="false">
		<item>daltonizer_mode_deuteranomaly</item>
		@@ -1140,41 +1052,6 @@
		<item>0</item>
		</integer-array>

		<!-- Battery saver mode: allowable trigger threshold levels. -->
		<integer-array name="battery_saver_trigger_values" translatable="false" >
		<item>0</item>
		<item>5</item>
		<item>15</item>
		<item>50</item>
		<item>100</item>
		</integer-array>

		<!-- Process stats memory use details: labels for memory states -->
		<string-array name="proc_stats_memory_states" >
		<item>Normal</item>
		<item>Moderate</item>
		<item>Low</item>
		<item>Critical</item>
		</string-array>

		<!-- Process stats memory use details: labels for process -->
		<string-array name="proc_stats_process_states" >
		<item>Persistent</item>
		<item>Top activity</item>
		<item>Important (foreground)</item>
		<item>Important (background)</item>
		<item>Backup</item>
		<item>Heavy weight</item>
		<item>Service (running)</item>
		<item>Service (restarting)</item>
		<item>Receiver</item>
		<item>Home</item>
		<item>Last activity</item>
		<item>Cached (activity)</item>
		<item>Cached (activity client)</item>
		<item>Cached (empty)</item>
		</string-array>

		<!-- Array of color for sim color for multi-sim in light mode -->
		<integer-array name="sim_color_light">
		<item>@color/SIM_color_cyan</item>
		@@ -1221,13 +1098,6 @@
		<item>either_charging_or_docked</item>
		</string-array>

		<string-array name="zen_mode_contacts_messages_entries" translatable="false">
		<item>@string/zen_mode_from_anyone</item>
		<item>@string/zen_mode_from_contacts</item>
		<item>@string/zen_mode_from_starred</item>
		<item>@string/zen_mode_none_messages</item>
		</string-array>

		<string-array name="zen_mode_contacts_calls_entries" translatable="false">
		<item>@string/zen_mode_from_anyone</item>
		<item>@string/zen_mode_from_contacts</item>
		@@ -1242,19 +1112,6 @@
		<item>zen_mode_from_none</item>
		</string-array>

		<string-array name="zen_mode_conversations_entries" translatable="false">
		<item>@string/zen_mode_from_all_conversations</item>
		<item>@string/zen_mode_from_important_conversations</item>
		<item>@string/zen_mode_from_no_conversations</item>
		</string-array>

		<!-- these values correspond with ZenPolicy.ConversationSenders -->
		<string-array name="zen_mode_conversations_values" translatable="false">
		<item>1</item>
		<item>2</item>
		<item>3</item>
		</string-array>

		<!--String arrays for notification swipe direction -->
		<string-array name="swipe_direction_titles">
		<item>@string/swipe_direction_rtl</item>
		@@ -1293,31 +1150,6 @@
		<item>0</item>
		</string-array>

		<!-- Titles for ui dark mode preference. -->
		<string-array name="dark_ui_mode_entries" >
		<item>Dark</item>
		<item>Light</item>
		</string-array>

		<!-- Values for ui dark mode preference. -->
		<string-array name="dark_ui_mode_values" translatable="false" >
		<item>yes</item>
		<item>no</item>
		</string-array>

		<string-array name="gesture_prevent_ringing_entries" translatable="false">
		<item>@string/prevent_ringing_option_vibrate</item>
		<item>@string/prevent_ringing_option_mute</item>
		<item>@string/prevent_ringing_option_none</item>
		</string-array>

		<!-- Keep in sync with Settings.Secure.VOLUME_HUSH_* -->
		<string-array name="gesture_prevent_ringing_values" translatable="false">
		<item>1</item>
		<item>2</item>
		<item>0</item>
		</string-array>

		<!-- Titles for autofill logging level preference. [CHAR LIMIT=50] -->
		<string-array name="autofill_logging_level_entries">
		<item>Off</item>
		@@ -1337,11 +1169,6 @@
		<item>@string/network_3G</item>
		<item>@string/network_2G</item>
		</string-array>
		<string-array name="enabled_networks_4g_choices" translatable="false">
		<item>@string/network_4G</item>
		<item>@string/network_3G</item>
		<item>@string/network_2G</item>
		</string-array>
		<string-array name="enabled_networks_values" translatable="false">
		<item>"9"</item>
		<item>"0"</item>
		@@ -1520,16 +1347,6 @@
		<item>@string/enhanced_4g_lte_mode_title_4g_calling</item>
		</string-array>

		<!-- Carrier variant of Enhaced 4G LTE Mode summary. [CHAR LIMIT=NONE] -->
		<string-array name="enhanced_4g_lte_mode_sumary_variant">
		<!-- 0: Default -->
		<item>@string/enhanced_4g_lte_mode_summary</item>
		<!-- 1: Verizon -->
		<item>@string/enhanced_4g_lte_mode_summary</item>
		<!-- 2: All carriers who want 4G -->
		<item>@string/enhanced_4g_lte_mode_summary_4g_calling</item>
		</string-array>

		<!-- Array of titles palette list for accessibility. -->
		<string-array name="setting_palette_data" translatable="false" >
		<item>@string/color_red</item>
		@@ -1574,23 +1391,6 @@
		<item>12</item>
		</string-array>

		<!-- Array of titles list for notification listener notification types. [DO NOT TRANSLATE] -->
		<string-array name="notif_types_titles" translatable="false">
		<item>@string/notif_type_ongoing</item>
		<item>@string/notif_type_conversation</item>
		<item>@string/notif_type_alerting</item>
		<item>@string/notif_type_silent</item>
		</string-array>

		<!-- Values of list for notification listener notification types. Values need to match
		android.service.notification.NotificationListenerService. [DO NOT TRANSLATE] -->
		<string-array name="notif_types_values" translatable="false">
		<item>8</item>
		<item>1</item>
		<item>2</item>
		<item>4</item>
		</string-array>

		<!-- All the preference when the open app supports TapPay -->
		<string-array name="nfc_payment_favor">
		<item>Always</item>

res/values/donottranslate.xml

deleted100644 → 0

+0 −36

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="utf-8"?>
		<!--
		/*
		**
		** Copyright 2010, The Android Open Source Project
		**
		** Licensed under the Apache License, Version 2.0 (the "License");
		** you may not use this file except in compliance with the License.
		** You may obtain a copy of the License at
		**
		** http://www.apache.org/licenses/LICENSE-2.0
		**
		** Unless required by applicable law or agreed to in writing, software
		** distributed under the License is distributed on an "AS IS" BASIS,
		** WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		** See the License for the specific language governing permissions and
		** limitations under the License.
		*/
		-->
		<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
		<string-array name="input_method_selector_titles">
		<item>@string/input_method_selector_show_automatically_title</item>
		<item>@string/input_method_selector_always_show_title</item>
		<item>@string/input_method_selector_always_hide_title</item>
		</string-array>
		<!-- values for input method selector should be corresponding to the array index of titles -->
		<string name="input_method_selector_show_automatically_value">0</string>
		<string name="input_method_selector_always_show_value">1</string>
		<string name="input_method_selector_always_hide_value">2</string>
		<string name="input_method_selector_visibility_default_value">0</string>
		<string-array name="input_method_selector_values">
		<item>@string/input_method_selector_show_automatically_value</item>
		<item>@string/input_method_selector_always_show_value</item>
		<item>@string/input_method_selector_always_hide_value</item>
		</string-array>
		</resources>

res/values/strings.xml

+0 −10

Original line number	Diff line number	Diff line
		@@ -2174,8 +2174,6 @@
		<string name="wifi_show_password">Show password</string>
		<!-- Label for the RadioGroup to choose wifi ap band -->
		<string name="wifi_ap_band_config">Select AP Band</string>
		<!-- Label for the radio button to choose wifi ap channel automatically-->
		<string name="wifi_ap_choose_auto">Auto</string>
		<!-- Label for the radio button to choose wifi ap 2.4 GHz band -->
		<string name="wifi_ap_choose_2G">2.4 GHz Band</string>
		<!-- Label for the radio button to only choose wifi ap 5GHz band -->
		@@ -4783,12 +4781,6 @@
		<string name="current_input_method">Current Keyboard</string>
		<!-- Title for setting the visibility of input method selector [CHAR LIMIT=35] -->
		<string name="input_method_selector">Input method selector</string>
		<!-- An option to always show input method selector automatically when needed [CHAR LIMIT=25] -->
		<string name="input_method_selector_show_automatically_title">Automatic</string>
		<!-- An option to always show input method selector [CHAR LIMIT=25] -->
		<string name="input_method_selector_always_show_title">Always show</string>
		<!-- An option to always hide input method selector [CHAR LIMIT=25] -->
		<string name="input_method_selector_always_hide_title">Always hide</string>
		<!-- Title for configuring input method settings [CHAR LIMIT=35] -->
		<string name="configure_input_method">Set up input methods</string>
		<!-- Title for settings of each IME [CHAR LIMIT=25] -->
		@@ -11969,8 +11961,6 @@
		<string name="prevent_ringing_option_vibrate">Vibrate</string>
		<!-- Option for prevent ringing setting -->
		<string name="prevent_ringing_option_mute">Mute</string>
		<!-- Option for prevent ringing setting -->
		<string name="prevent_ringing_option_none">Do nothing</string>
		<!-- Summary for prevent ringing setting -->
		<string name="prevent_ringing_option_vibrate_summary">Vibrate</string>
		<!-- Summary for prevent ringing setting -->