Snap for 5699512 from 7488d6dfe57f9240bcc2951ceb0049aee45bf9fb to qt-qpr1-release (a4c78004) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+12 −0

Original line number	Diff line number	Diff line
		@@ -8275,6 +8275,16 @@ public final class Settings {
		private static final Validator FACE_UNLOCK_DISMISSES_KEYGUARD_VALIDATOR =
		BOOLEAN_VALIDATOR;

		/**
		* Whether or not media is shown automatically when bypassing as a heads up.
		* @hide
		*/
		public static final String SHOW_MEDIA_WHEN_BYPASSING =
		"show_media_when_bypassing";

		private static final Validator SHOW_MEDIA_WHEN_BYPASSING_VALIDATOR =
		BOOLEAN_VALIDATOR;

		/**
		* Whether or not face unlock requires attention. This is a cached value, the source of
		* truth is obtained through the HAL.
		@@ -8979,6 +8989,7 @@ public final class Settings {
		NFC_PAYMENT_DEFAULT_COMPONENT,
		AUTOMATIC_STORAGE_MANAGER_DAYS_TO_RETAIN,
		FACE_UNLOCK_KEYGUARD_ENABLED,
		SHOW_MEDIA_WHEN_BYPASSING,
		FACE_UNLOCK_DISMISSES_KEYGUARD,
		FACE_UNLOCK_APP_ENABLED,
		FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION,
		@@ -9155,6 +9166,7 @@ public final class Settings {
		VALIDATORS.put(FACE_UNLOCK_KEYGUARD_ENABLED, FACE_UNLOCK_KEYGUARD_ENABLED_VALIDATOR);
		VALIDATORS.put(FACE_UNLOCK_DISMISSES_KEYGUARD,
		FACE_UNLOCK_DISMISSES_KEYGUARD_VALIDATOR);
		VALIDATORS.put(SHOW_MEDIA_WHEN_BYPASSING, SHOW_MEDIA_WHEN_BYPASSING_VALIDATOR);
		VALIDATORS.put(FACE_UNLOCK_APP_ENABLED, FACE_UNLOCK_APP_ENABLED_VALIDATOR);
		VALIDATORS.put(FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION,
		FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION_VALIDATOR);

deleted100644 → 0

+0 −26

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?>
		<!--
		/*
		** Copyright 2009, 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.
		*/
		-->

		<!-- These resources are around just to allow their values to be customized
		for different hardware and product builds. -->

		<resources xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
		<string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
		</resources>

+2 −2

Original line number	Diff line number	Diff line
		@@ -376,8 +376,8 @@
		<string name="quick_settings_night_secondary_label_until_sunrise" msgid="4453017157391574402">"Tot sonsopkoms"</string>
		<string name="quick_settings_night_secondary_label_on_at" msgid="6256314040368487637">"Aan om <xliff:g id="TIME">%s</xliff:g>"</string>
		<string name="quick_settings_secondary_label_until" msgid="2749196569462600150">"Tot <xliff:g id="TIME">%s</xliff:g>"</string>
		<string name="quick_settings_ui_mode_night_label" msgid="512534812963862137">"Donker-tema"</string>
		<string name="quick_settings_ui_mode_night_label_battery_saver" msgid="3496696903886673256">"Donker-tema\nBatterybespaarder"</string>
		<string name="quick_settings_ui_mode_night_label" msgid="3419947801072692538">"Donker-tema"</string>
		<string name="quick_settings_ui_mode_night_label_battery_saver" msgid="7438725724589758362">"Donker-tema\nBatterybespaarder"</string>
		<string name="quick_settings_nfc_label" msgid="9012153754816969325">"NFC"</string>
		<string name="quick_settings_nfc_off" msgid="6883274004315134333">"NFC is gedeaktiveer"</string>
		<string name="quick_settings_nfc_on" msgid="6680317193676884311">"NFC is geaktiveer"</string>

deleted100644 → 0

+0 −26

Original line number	Diff line number	Diff line
		<?xml version="1.0" encoding="UTF-8"?>
		<!--
		/*
		** Copyright 2009, 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.
		*/
		-->

		<!-- These resources are around just to allow their values to be customized
		for different hardware and product builds. -->

		<resources xmlns:android="http://schemas.android.com/apk/res/android"
		xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
		<string name="doze_pickup_subtype_performs_proximity_check" msgid="533127617385956583"></string>
		</resources>

+2 −2

Original line number	Diff line number	Diff line
		@@ -376,8 +376,8 @@
		<string name="quick_settings_night_secondary_label_until_sunrise" msgid="4453017157391574402">"ጸሐይ እስክትወጣ ድረስ"</string>
		<string name="quick_settings_night_secondary_label_on_at" msgid="6256314040368487637">"<xliff:g id="TIME">%s</xliff:g> ላይ ይበራል"</string>
		<string name="quick_settings_secondary_label_until" msgid="2749196569462600150">"እስከ <xliff:g id="TIME">%s</xliff:g> ድረስ"</string>
		<string name="quick_settings_ui_mode_night_label" msgid="512534812963862137">"ጨለማ ገጽታ"</string>
		<string name="quick_settings_ui_mode_night_label_battery_saver" msgid="3496696903886673256">"ጨለም ያለ ገጽታ\nየባትሪ ቆጣቢ"</string>
		<string name="quick_settings_ui_mode_night_label" msgid="3419947801072692538">"ጨለማ ገጽታ"</string>
		<string name="quick_settings_ui_mode_night_label_battery_saver" msgid="7438725724589758362">"ጨለም ያለ ገጽታ\nየባትሪ ቆጣቢ"</string>
		<string name="quick_settings_nfc_label" msgid="9012153754816969325">"ኤንኤፍሲ"</string>
		<string name="quick_settings_nfc_off" msgid="6883274004315134333">"ኤንኤፍሲ ተሰናክሏል"</string>
		<string name="quick_settings_nfc_on" msgid="6680317193676884311">"ኤንኤፍሲ ነቅቷል"</string>