Snap for 5907400 from e4227efa1700f542e1197013626db5b5085f34ff to qt-qpr1-release (dd53d50a) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -10508,12 +10508,7 @@ public class Notification implements Parcelable
		final StandardTemplateParams fillTextsFrom(Builder b) {
		Bundle extras = b.mN.extras;
		this.title = b.processLegacyText(extras.getCharSequence(EXTRA_TITLE));

		CharSequence text = extras.getCharSequence(EXTRA_BIG_TEXT);
		if (TextUtils.isEmpty(text)) {
		text = extras.getCharSequence(EXTRA_TEXT);
		}
		this.text = b.processLegacyText(text);
		this.text = b.processLegacyText(extras.getCharSequence(EXTRA_TEXT));
		this.summaryText = extras.getCharSequence(EXTRA_SUB_TEXT);
		return this;
		}

core/java/android/provider/Settings.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -8361,6 +8361,19 @@ public final class Settings {
		private static final Validator FACE_UNLOCK_ALWAYS_REQUIRE_CONFIRMATION_VALIDATOR =
		BOOLEAN_VALIDATOR;

		/**
		* Whether or not a user should re enroll their face.
		*
		* Face unlock re enroll.
		* 0 = No re enrollment.
		* 1 = Re enrollment is suggested.
		* 2 = Re enrollment is required after a set time period.
		* 3 = Re enrollment is required immediately.
		*
		* @hide
		*/
		public static final String FACE_UNLOCK_RE_ENROLL = "face_unlock_re_enroll";

		/**
		* Whether or not debugging is enabled.
		* @hide

core/res/res/values-af/strings.xml

+2 −4

Original line number	Diff line number	Diff line
		@@ -1888,10 +1888,8 @@
		<string name="default_notification_channel_label" msgid="5929663562028088222">"Ongekategoriseer"</string>
		<string name="importance_from_user" msgid="7318955817386549931">"Jy stel die belangrikheid van hierdie kennisgewings."</string>
		<string name="importance_from_person" msgid="9160133597262938296">"Dit is belangrik as gevolg van die mense wat betrokke is."</string>
		<!-- no translation found for user_creation_account_exists (6559477114648176531) -->
		<skip />
		<!-- no translation found for user_creation_adding (9089159170398841763) -->
		<skip />
		<string name="user_creation_account_exists" msgid="6559477114648176531">"Laat <xliff:g id="APP">%1$s</xliff:g> toe om \'n nuwe gebruiker met <xliff:g id="ACCOUNT">%2$s</xliff:g> te skep (\'n gebruiker met hierdie rekening bestaan reeds)?"</string>
		<string name="user_creation_adding" msgid="9089159170398841763">"Laat <xliff:g id="APP">%1$s</xliff:g> toe om \'n nuwe gebruiker met <xliff:g id="ACCOUNT">%2$s</xliff:g> te skep?"</string>
		<string name="language_selection_title" msgid="2680677278159281088">"Voeg \'n taal by"</string>
		<string name="country_selection_title" msgid="2954859441620215513">"Streekvoorkeur"</string>
		<string name="search_language_hint" msgid="7042102592055108574">"Voer taalnaam in"</string>

core/res/res/values-am/strings.xml

+2 −4

Original line number	Diff line number	Diff line
		@@ -1888,10 +1888,8 @@
		<string name="default_notification_channel_label" msgid="5929663562028088222">"ያልተመደቡ"</string>
		<string name="importance_from_user" msgid="7318955817386549931">"የእነዚህን ማሳወቂያዎች አስፈላጊነት አዘጋጅተዋል።"</string>
		<string name="importance_from_person" msgid="9160133597262938296">"ይሄ በሚሳተፉ ሰዎች ምክንያት አስፈላጊ ነው።"</string>
		<!-- no translation found for user_creation_account_exists (6559477114648176531) -->
		<skip />
		<!-- no translation found for user_creation_adding (9089159170398841763) -->
		<skip />
		<string name="user_creation_account_exists" msgid="6559477114648176531">"<xliff:g id="APP">%1$s</xliff:g> በ<xliff:g id="ACCOUNT">%2$s</xliff:g> አዲስ ተጠቃሚ እንዲፈጥር ይፈቀድለት (ይህ መለያ ያለው ተጠቃሚ አስቀድሞ አለ)?"</string>
		<string name="user_creation_adding" msgid="9089159170398841763">"<xliff:g id="APP">%1$s</xliff:g> አዲስ ተጠቃሚ ከ <xliff:g id="ACCOUNT">%2$s</xliff:g> ጋር መፍጠር እንዲችል ይፍቀዱ?"</string>
		<string name="language_selection_title" msgid="2680677278159281088">"ቋንቋ ያክሉ"</string>
		<string name="country_selection_title" msgid="2954859441620215513">"የክልል ምርጫ"</string>
		<string name="search_language_hint" msgid="7042102592055108574">"የቋንቋ ስም ይተይቡ"</string>

core/res/res/values-ar/strings.xml

+3 −5

Original line number	Diff line number	Diff line
		@@ -533,7 +533,7 @@
		<string name="permdesc_imagesWrite" msgid="7073662756617474375">"للسماح للتطبيق بتعديل مجموعة صورك."</string>
		<string name="permlab_mediaLocation" msgid="8675148183726247864">"قراءة المواقع من مجموعة الوسائط التابعة لك"</string>
		<string name="permdesc_mediaLocation" msgid="2237023389178865130">"للسماح للتطبيق بقراءة المواقع من مجموعة الوسائط التابعة لك."</string>
		<string name="biometric_dialog_default_title" msgid="881952973720613213">"التحقق من هويتك"</string>
		<string name="biometric_dialog_default_title" msgid="881952973720613213">"إثبات هويتك"</string>
		<string name="biometric_error_hw_unavailable" msgid="645781226537551036">"معدّات المقاييس الحيوية غير متاحة."</string>
		<string name="biometric_error_user_canceled" msgid="2260175018114348727">"تم إلغاء المصادقة."</string>
		<string name="biometric_not_recognized" msgid="5770511773560736082">"لم يتم التعرف عليها."</string>
		@@ -2024,10 +2024,8 @@
		<string name="default_notification_channel_label" msgid="5929663562028088222">"غير مصنفة"</string>
		<string name="importance_from_user" msgid="7318955817386549931">"لقد عيَّنت أهمية هذه الإشعارات."</string>
		<string name="importance_from_person" msgid="9160133597262938296">"هذه الرسالة مهمة نظرًا لأهمية الأشخاص المعنيين."</string>
		<!-- no translation found for user_creation_account_exists (6559477114648176531) -->
		<skip />
		<!-- no translation found for user_creation_adding (9089159170398841763) -->
		<skip />
		<string name="user_creation_account_exists" msgid="6559477114648176531">"هل تسمح لتطبيق <xliff:g id="APP">%1$s</xliff:g> بإنشاء مستخدم جديد باستخدام <xliff:g id="ACCOUNT">%2$s</xliff:g> (يوجد مستخدم بهذا الحساب مسبقًا)؟"</string>
		<string name="user_creation_adding" msgid="9089159170398841763">"هل تسمح لتطبيق <xliff:g id="APP">%1$s</xliff:g> بإنشاء مستخدم جديد باستخدام <xliff:g id="ACCOUNT">%2$s</xliff:g> ؟"</string>
		<string name="language_selection_title" msgid="2680677278159281088">"إضافة لغة"</string>
		<string name="country_selection_title" msgid="2954859441620215513">"تفضيل المنطقة"</string>
		<string name="search_language_hint" msgid="7042102592055108574">"اكتب اسم اللغة"</string>