Merge pi-dr1-dev to aosp-master (c1fe9e6a) · Commits · e / os / android_packages_apps_Settings

AndroidManifest.xml

+16 −0

Original line number	Diff line number	Diff line
		@@ -463,6 +463,20 @@
		android:value="com.android.settings.TetherSettings" />
		</activity>

		<activity
		android:name="Settings$WifiTetherSettingsActivity"
		android:label="@string/wifi_hotspot_checkbox_text"
		android:icon="@drawable/ic_wifi_tethering"
		android:parentActivityName="Settings">
		<intent-filter>
		<action android:name="com.android.settings.WIFI_TETHER_SETTINGS" />
		<category android:name="android.intent.category.DEFAULT" />
		</intent-filter>
		<meta-data android:name="com.android.settings.FRAGMENT_CLASS"
		android:value="com.android.settings.wifi.tether.WifiTetherSettings" />
		</activity>


		<!-- Keep compatibility with old shortcuts. -->
		<activity-alias android:name=".TetherSettings"
		android:label="@string/tether_settings_title_all"
		@@ -2620,6 +2634,7 @@
		android:name="Settings$ConfigureNotificationSettingsActivity"
		android:label="@string/configure_notification_settings"
		android:exported="true"
		android:taskAffinity="com.android.settings"
		android:parentActivityName="Settings">
		<intent-filter android:priority="1">
		<action android:name="android.settings.NOTIFICATION_SETTINGS" />
		@@ -2949,6 +2964,7 @@
		<activity
		android:name="Settings$AppDrawOverlaySettingsActivity"
		android:label="@string/draw_overlay"
		android:taskAffinity="com.android.settings"
		android:parentActivityName="Settings">
		<intent-filter android:priority="1">
		<action android:name="android.settings.action.MANAGE_OVERLAY_PERMISSION" />

color-check-baseline.xml

+12 −60

Original line number	Diff line number	Diff line
		@@ -2141,55 +2141,7 @@
		errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
		<location
		file="res/layout/radio_info.xml"
		line="110"
		column="13"/>
		</issue>

		<issue
		id="HardCodedColor"
		severity="Error"
		message="Avoid using hardcoded color"
		category="Correctness"
		priority="4"
		summary="Using hardcoded color"
		explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes. This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
		errorLine1=" android:background="#000000" />"
		errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
		<location
		file="res/layout/radio_info.xml"
		line="129"
		column="13"/>
		</issue>

		<issue
		id="HardCodedColor"
		severity="Error"
		message="Avoid using hardcoded color"
		category="Correctness"
		priority="4"
		summary="Using hardcoded color"
		explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes. This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
		errorLine1=" android:background="#000000" />"
		errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
		<location
		file="res/layout/radio_info.xml"
		line="175"
		column="13"/>
		</issue>

		<issue
		id="HardCodedColor"
		severity="Error"
		message="Avoid using hardcoded color"
		category="Correctness"
		priority="4"
		summary="Using hardcoded color"
		explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes. This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
		errorLine1=" android:background="#000000" />"
		errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
		<location
		file="res/layout/radio_info.xml"
		line="205"
		line="116"
		column="13"/>
		</issue>

		@@ -2205,7 +2157,7 @@
		errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
		<location
		file="res/layout/radio_info.xml"
		line="232"
		line="135"
		column="13"/>
		</issue>

		@@ -2221,7 +2173,7 @@
		errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
		<location
		file="res/layout/radio_info.xml"
		line="256"
		line="165"
		column="13"/>
		</issue>

		@@ -2237,7 +2189,7 @@
		errorLine2=" ~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
		<location
		file="res/layout/radio_info.xml"
		line="293"
		line="303"
		column="13"/>
		</issue>

		@@ -2477,7 +2429,7 @@
		errorLine2=" ~~~~~~~~~~~~~~~~~~~">
		<location
		file="res/values-en-rXC/strings.xml"
		line="2422"
		line="2531"
		column="168"/>
		</issue>

		@@ -2492,8 +2444,8 @@
		errorLine1=" <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Welcome to Google sync!"</font>" \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are."</string>"
		errorLine2=" ~~~~~~~~~~~~~~~~~~~">
		<location
		file="res/values-en-rCA/strings.xml"
		line="2423"
		file="res/values-en-rAU/strings.xml"
		line="2532"
		column="64"/>
		</issue>

		@@ -2508,8 +2460,8 @@
		errorLine1=" <string name="sync_plug" msgid="3905078969081888738"><font fgcolor="#ffffffff">"Welcome to Google sync!"</font>" \nA Google approach to syncing data to allow access to your contacts, appointments and more from wherever you are."</string>"
		errorLine2=" ~~~~~~~~~~~~~~~~~~~">
		<location
		file="res/values-en-rAU/strings.xml"
		line="2540"
		file="res/values-en-rCA/strings.xml"
		line="2532"
		column="64"/>
		</issue>

		@@ -2525,7 +2477,7 @@
		errorLine2=" ~~~~~~~~~~~~~~~~~~~">
		<location
		file="res/values-en-rGB/strings.xml"
		line="2540"
		line="2532"
		column="64"/>
		</issue>

		@@ -2541,7 +2493,7 @@
		errorLine2=" ~~~~~~~~~~~~~~~~~~~">
		<location
		file="res/values-en-rIN/strings.xml"
		line="2540"
		line="2532"
		column="64"/>
		</issue>

		@@ -2557,7 +2509,7 @@
		errorLine2=" ~~~~~~~~~~~~~~~~~~~">
		<location
		file="res/values/strings.xml"
		line="5927"
		line="5920"
		column="36"/>
		</issue>

res/values-af/arrays.xml

+0 −6

Original line number	Diff line number	Diff line
		@@ -121,12 +121,6 @@
		<item msgid="3079489731769553856">"TTLS"</item>
		<item msgid="35269224158638258">"PWD"</item>
		</string-array>
		<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
		<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
		<!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
		<!-- no translation found for wifi_ap_band_summary_full:1 (311895158827229479) -->
		<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
		<!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
		<string-array name="wifi_p2p_wps_setup">
		<item msgid="5085064298144493867">"Druk knoppie"</item>
		<item msgid="1624323946324499595">"PIN van eweknietoestel"</item>

res/values-af/strings.xml

+6 −5

Original line number	Diff line number	Diff line
		@@ -854,6 +854,7 @@
		<string name="wifi_ap_choose_auto" msgid="2677800651271769965">"Outo"</string>
		<string name="wifi_ap_choose_2G" msgid="8724267386885036210">"2,4 GHz-band"</string>
		<string name="wifi_ap_choose_5G" msgid="8813128641914385634">"5,0 GHz-band"</string>
		<string name="wifi_ap_prefer_5G" msgid="2501070491623803139">"5,0 GHz-band verkies"</string>
		<string name="wifi_ap_2G" msgid="8378132945192979364">"2,4 GHz"</string>
		<string name="wifi_ap_5G" msgid="4020713496716329468">"5,0 GHz"</string>
		<string name="wifi_ap_band_select_one" msgid="3476254666116431650">"Kies minstens een band vir Wi-Fi-warmkol:"</string>
		@@ -972,7 +973,7 @@
		<skip />
		<string name="wifi_calling_roaming_mode_dialog_title" msgid="7800926602662078576">"Swerfvoorkeur"</string>
		<string-array name="wifi_calling_mode_choices">
		<item msgid="2124257075906188844">"Verkieslik Wi-Fi"</item>
		<item msgid="2124257075906188844">"Wi-Fi verkies"</item>
		<item msgid="1335127656328817518">"Verkies mobiel"</item>
		<item msgid="3132912693346866895">"Net Wi-Fi"</item>
		</string-array>
		@@ -987,7 +988,7 @@
		<item msgid="3194458950573886239">"0"</item>
		</string-array>
		<string-array name="wifi_calling_mode_choices_without_wifi_only">
		<item msgid="5782108782860004851">"Verkieslik Wi-Fi"</item>
		<item msgid="5782108782860004851">"Verkies Wi-Fi"</item>
		<item msgid="5074515506087318555">"Verkies mobiel"</item>
		</string-array>
		<string-array name="wifi_calling_mode_choices_v2_without_wifi_only">
		@@ -1065,7 +1066,7 @@
		<string name="color_mode_option_natural" msgid="5013837483986772758">"Natuurlik"</string>
		<string name="color_mode_option_boosted" msgid="8588223970257287524">"Gemaksimeer"</string>
		<string name="color_mode_option_saturated" msgid="4569683960058798843">"Intens"</string>
		<string name="color_mode_option_automatic" msgid="8781254568140509331">"Outomaties"</string>
		<string name="color_mode_option_automatic" msgid="7996505473528529568">"Aanpasbaar"</string>
		<string name="color_mode_summary_natural" msgid="6624188642920403099">"Gebruik net akkurate kleure"</string>
		<string name="color_mode_summary_automatic" msgid="4669516973360709431">"Verstel tussen helder en akkurate kleure"</string>
		<string name="accelerometer_summary_on" product="tablet" msgid="429982132339828942">"Wissel oriëntasie outomaties wanneer tablet gedraai word"</string>
		@@ -3161,7 +3162,7 @@
		<string name="zen_sound_two_allowed" msgid="980491120444358550">"Gedemp, maar laat <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g> en <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> toe"</string>
		<string name="zen_sound_three_allowed" msgid="3455767205934547985">"Gedemp, maar laat <xliff:g id="SOUND_TYPE_0">%1$s</xliff:g>, <xliff:g id="SOUND_TYPE_1">%2$s</xliff:g> en <xliff:g id="SOUND_TYPE_2">%3$s</xliff:g> toe"</string>
		<string name="zen_msg_event_reminder_title" msgid="5137894077488924820">"Boodskappe, geleenthede en onthounotas"</string>
		<string name="zen_msg_event_reminder_footer" msgid="3242847055412790819">"Boodskappe, onthounotas en geleenthede sal gedemp word wanneer Moenie Steur Nie aan is, met die uitsondering van die items wat jy hierbo toelaat. Jy kan boodskapinstellings verstel om dit vir jou vriende, familielede of ander kontakte moontlik te maak om jou te bereik."</string>
		<string name="zen_msg_event_reminder_footer" msgid="4376930591019535192">"Boodskappe, onthounotas en geleenthede sal gedemp word wanneer Moenie Steur Nie aan is, met die uitsondering van die items wat jy hierbo toelaat. Jy kan boodskapinstellings verstel om dit vir jou vriende, familielede of ander kontakte moontlik te maak om jou te bereik."</string>
		<string name="zen_onboarding_ok" msgid="6131211000824433013">"Klaar"</string>
		<string name="zen_onboarding_settings" msgid="9046451821239946868">"Instellings"</string>
		<string name="zen_onboarding_new_setting_title" msgid="1893095176110470711">"Geen visuele elemente of klank van kennisgewings af nie"</string>
		@@ -3427,7 +3428,7 @@
		<string name="encrypt_talkback_dialog_message_pin" msgid="7582096542997635316">"Wanneer jy jou PIN invoer om hierdie toestel te begin, sal toeganklikheiddienste soos <xliff:g id="SERVICE">%1$s</xliff:g> nog nie beskikbaar wees nie."</string>
		<string name="encrypt_talkback_dialog_message_pattern" msgid="2020083142199612743">"Wanneer jy jou patroon invoer om hierdie toestel te begin, sal toeganklikheiddienste soos <xliff:g id="SERVICE">%1$s</xliff:g> nog nie beskikbaar wees nie."</string>
		<string name="encrypt_talkback_dialog_message_password" msgid="4155875981789127796">"Wanneer jy jou wagwoord invoer om hierdie toestel te begin, sal toeganklikheiddienste soos <xliff:g id="SERVICE">%1$s</xliff:g> nog nie beskikbaar wees nie."</string>
		<string name="direct_boot_unaware_dialog_message" msgid="7870273558547549125">"Let wel: Ná \'n herselflaai kan hierdie program nie begin voordat jy jou foon ontsluit het nie"</string>
		<string name="direct_boot_unaware_dialog_message" msgid="2433632805847985867">"Let wel: As jy jou foon herbegin en \'n skermslot gestel het, kan hierdie program eers begin nadat jy jou foon ontsluit het"</string>
		<string name="imei_information_title" msgid="8499085421609752290">"IMEI-inligting"</string>
		<string name="imei_information_summary" msgid="2074095606556565233">"IMEI se relatiewe inligting"</string>
		<string name="slot_number" msgid="3762676044904653577">"(Gleuf<xliff:g id="SLOT_NUM">%1$d</xliff:g>)"</string>

res/values-am/arrays.xml

+0 −6

Original line number	Diff line number	Diff line
		@@ -121,12 +121,6 @@
		<item msgid="3079489731769553856">"TTLS"</item>
		<item msgid="35269224158638258">"PWD"</item>
		</string-array>
		<!-- no translation found for wifi_ap_band_config_full:0 (1085243288162893079) -->
		<!-- no translation found for wifi_ap_band_config_full:1 (5531376834915607202) -->
		<!-- no translation found for wifi_ap_band_summary_full:0 (7176872102094020362) -->
		<!-- no translation found for wifi_ap_band_summary_full:1 (311895158827229479) -->
		<!-- no translation found for wifi_ap_band_config_2G_only:0 (7006771583217001015) -->
		<!-- no translation found for wifi_ap_band_config_2G_only:1 (8904289885593822837) -->
		<string-array name="wifi_p2p_wps_setup">
		<item msgid="5085064298144493867">"አዝራር ተጫን"</item>
		<item msgid="1624323946324499595">"ፒን ከአቻ መሣሪያ"</item>