Snap for 5607031 from 3a0a965cded239793fb20250d80b11f1d92a399c to qt-release (2496e18c) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+14 −0

Original line number	Original line	Diff line number	Diff line
	@@ -8829,6 +8829,18 @@ public final class Settings {
	private static final Validator THEME_CUSTOMIZATION_OVERLAY_PACKAGES_VALIDATOR =		private static final Validator THEME_CUSTOMIZATION_OVERLAY_PACKAGES_VALIDATOR =
	SettingsValidators.JSON_OBJECT_VALIDATOR;		SettingsValidators.JSON_OBJECT_VALIDATOR;

			/**
			* Navigation bar mode.
			* 0 = 3 button
			* 1 = 2 button
			* 2 = fully gestural
			* @hide
			*/
			public static final String NAVIGATION_MODE =
			"navigation_mode";
			private static final Validator NAVIGATION_MODE_VALIDATOR =
			new SettingsValidators.DiscreteValueValidator(new String[] {"0", "1", "2"});

	/**		/**
	* Controls whether aware is enabled.		* Controls whether aware is enabled.
	* @hide		* @hide
	@@ -8972,6 +8984,7 @@ public final class Settings {
	SKIP_GESTURE,		SKIP_GESTURE,
	SILENCE_GESTURE,		SILENCE_GESTURE,
	THEME_CUSTOMIZATION_OVERLAY_PACKAGES,		THEME_CUSTOMIZATION_OVERLAY_PACKAGES,
			NAVIGATION_MODE,
	AWARE_ENABLED,		AWARE_ENABLED,
	SKIP_GESTURE_COUNT,		SKIP_GESTURE_COUNT,
	SILENCE_ALARMS_GESTURE_COUNT,		SILENCE_ALARMS_GESTURE_COUNT,
	@@ -9157,6 +9170,7 @@ public final class Settings {
	VALIDATORS.put(SILENCE_GESTURE, SILENCE_GESTURE_VALIDATOR);		VALIDATORS.put(SILENCE_GESTURE, SILENCE_GESTURE_VALIDATOR);
	VALIDATORS.put(THEME_CUSTOMIZATION_OVERLAY_PACKAGES,		VALIDATORS.put(THEME_CUSTOMIZATION_OVERLAY_PACKAGES,
	THEME_CUSTOMIZATION_OVERLAY_PACKAGES_VALIDATOR);		THEME_CUSTOMIZATION_OVERLAY_PACKAGES_VALIDATOR);
			VALIDATORS.put(NAVIGATION_MODE, NAVIGATION_MODE_VALIDATOR);
	VALIDATORS.put(AWARE_ENABLED, AWARE_ENABLED_VALIDATOR);		VALIDATORS.put(AWARE_ENABLED, AWARE_ENABLED_VALIDATOR);
	VALIDATORS.put(SKIP_GESTURE_COUNT, SKIP_GESTURE_COUNT_VALIDATOR);		VALIDATORS.put(SKIP_GESTURE_COUNT, SKIP_GESTURE_COUNT_VALIDATOR);
	VALIDATORS.put(SILENCE_ALARMS_GESTURE_COUNT, SILENCE_GESTURE_COUNT_VALIDATOR);		VALIDATORS.put(SILENCE_ALARMS_GESTURE_COUNT, SILENCE_GESTURE_COUNT_VALIDATOR);

core/proto/android/providers/settings/secure.proto

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -304,6 +304,7 @@ message SecureSettingsProto {

	optional SettingProto multi_press_timeout = 38 [ (android.privacy).dest = DEST_AUTOMATIC ];		optional SettingProto multi_press_timeout = 38 [ (android.privacy).dest = DEST_AUTOMATIC ];

			optional SettingProto navigation_mode = 76 [ (android.privacy).dest = DEST_AUTOMATIC ];
	message NfcPayment {		message NfcPayment {
	option (android.msg_privacy).dest = DEST_EXPLICIT;		option (android.msg_privacy).dest = DEST_EXPLICIT;

	@@ -552,5 +553,5 @@ message SecureSettingsProto {

	// Please insert fields in alphabetical order and group them into messages		// Please insert fields in alphabetical order and group them into messages
	// if possible (to avoid reaching the method limit).		// if possible (to avoid reaching the method limit).
	// Next tag = 76;		// Next tag = 77;
	}		}

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

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1357,7 +1357,7 @@
	<string name="test_harness_mode_notification_message" msgid="1343197173054407119">"Voer \'n fabriekterugstelling uit om Toetsraamwerkmodus te deaktiveer."</string>		<string name="test_harness_mode_notification_message" msgid="1343197173054407119">"Voer \'n fabriekterugstelling uit om Toetsraamwerkmodus te deaktiveer."</string>
	<string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Vloeistof of vuilgoed in USB-poort"</string>		<string name="usb_contaminant_detected_title" msgid="7136400633704058349">"Vloeistof of vuilgoed in USB-poort"</string>
	<string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB-poort is outomaties gedeaktiveer. Tik om meer te wete te kom."</string>		<string name="usb_contaminant_detected_message" msgid="832337061059487250">"USB-poort is outomaties gedeaktiveer. Tik om meer te wete te kom."</string>
	<string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"Veilig om USB-poort te gebruik"</string>		<string name="usb_contaminant_not_detected_title" msgid="7708281124088684821">"OK om USB-poort te gebruik"</string>
	<string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Foon bespeur nie meer vloeistowwe of vuilgoed nie."</string>		<string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"Foon bespeur nie meer vloeistowwe of vuilgoed nie."</string>
	<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Neem tans foutverslag …"</string>		<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"Neem tans foutverslag …"</string>
	<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Deel foutverslag?"</string>		<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"Deel foutverslag?"</string>

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

+2 −1

Original line number	Original line	Diff line number	Diff line
	@@ -1357,7 +1357,8 @@
	<string name="test_harness_mode_notification_message" msgid="1343197173054407119">"የመሞከሪያ ጥቅል ሁነታን ለማሰናከል የፋብሪካ ዳግም ቅንብርን ይሞክሩ።"</string>		<string name="test_harness_mode_notification_message" msgid="1343197173054407119">"የመሞከሪያ ጥቅል ሁነታን ለማሰናከል የፋብሪካ ዳግም ቅንብርን ይሞክሩ።"</string>
	<string name="usb_contaminant_detected_title" msgid="7136400633704058349">"በዩኤስቢ ወደብ ውስጥ ፈሳሽ ወይም ፍርስራሽ"</string>		<string name="usb_contaminant_detected_title" msgid="7136400633704058349">"በዩኤስቢ ወደብ ውስጥ ፈሳሽ ወይም ፍርስራሽ"</string>
	<string name="usb_contaminant_detected_message" msgid="832337061059487250">"የዩኤስቢ ወደብ በራስ-ሰር ተሰናክሏል። የበለጠ ለመረዳት መታ ያድርጉ።"</string>		<string name="usb_contaminant_detected_message" msgid="832337061059487250">"የዩኤስቢ ወደብ በራስ-ሰር ተሰናክሏል። የበለጠ ለመረዳት መታ ያድርጉ።"</string>
	<string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"የዩኤስቢ ወደቡን መጠቀም አደጋ የለውም"</string>		<!-- no translation found for usb_contaminant_not_detected_title (7708281124088684821) -->
			<skip />
	<string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"ስልክ ከእንግዲህ ፈሳሽ ወይም ፍርስራሽ አላገኘም።"</string>		<string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"ስልክ ከእንግዲህ ፈሳሽ ወይም ፍርስራሽ አላገኘም።"</string>
	<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"የሳንካ ሪፖርትን በመውሰድ ላይ…"</string>		<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"የሳንካ ሪፖርትን በመውሰድ ላይ…"</string>
	<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"የሳንካ ሪፖርት ይጋራ?"</string>		<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"የሳንካ ሪፖርት ይጋራ?"</string>

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

+3 −2

Original line number	Original line	Diff line number	Diff line
	@@ -1445,7 +1445,8 @@
	<string name="test_harness_mode_notification_message" msgid="1343197173054407119">"يمكنك إجراء إعادة ضبط على إعدادات المصنع لإيقاف وضع \"مفعِّل اختبار\"."</string>		<string name="test_harness_mode_notification_message" msgid="1343197173054407119">"يمكنك إجراء إعادة ضبط على إعدادات المصنع لإيقاف وضع \"مفعِّل اختبار\"."</string>
	<string name="usb_contaminant_detected_title" msgid="7136400633704058349">"‏السوائل والشوائب في منفذ USB"</string>		<string name="usb_contaminant_detected_title" msgid="7136400633704058349">"‏السوائل والشوائب في منفذ USB"</string>
	<string name="usb_contaminant_detected_message" msgid="832337061059487250">"‏تمّ إيقاف منفذ USB تلقائيًا. انقُر لمعرفة المزيد من المعلومات."</string>		<string name="usb_contaminant_detected_message" msgid="832337061059487250">"‏تمّ إيقاف منفذ USB تلقائيًا. انقُر لمعرفة المزيد من المعلومات."</string>
	<string name="usb_contaminant_not_detected_title" msgid="4202417484434906086">"‏الأمان في استخدام منفذ USB"</string>		<!-- no translation found for usb_contaminant_not_detected_title (7708281124088684821) -->
			<skip />
	<string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"لم يَعُد الهاتف يكتشف سوائل أو شوائب."</string>		<string name="usb_contaminant_not_detected_message" msgid="2415791798244545292">"لم يَعُد الهاتف يكتشف سوائل أو شوائب."</string>
	<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"جارٍ الحصول على تقرير الخطأ…"</string>		<string name="taking_remote_bugreport_notification_title" msgid="6742483073875060934">"جارٍ الحصول على تقرير الخطأ…"</string>
	<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"هل تريد مشاركة تقرير الخطأ؟"</string>		<string name="share_remote_bugreport_notification_title" msgid="4987095013583691873">"هل تريد مشاركة تقرير الخطأ؟"</string>
	@@ -2012,7 +2013,7 @@
	<item quantity="few">تم تحديد <xliff:g id="COUNT_1">%1$d</xliff:g> عناصر</item>		<item quantity="few">تم تحديد <xliff:g id="COUNT_1">%1$d</xliff:g> عناصر</item>
	<item quantity="many">تم تحديد <xliff:g id="COUNT_1">%1$d</xliff:g> عنصرًا</item>		<item quantity="many">تم تحديد <xliff:g id="COUNT_1">%1$d</xliff:g> عنصرًا</item>
	<item quantity="other">تم تحديد <xliff:g id="COUNT_1">%1$d</xliff:g> من العناصر</item>		<item quantity="other">تم تحديد <xliff:g id="COUNT_1">%1$d</xliff:g> من العناصر</item>
	<item quantity="one">تم تحديد <xliff:g id="COUNT_0">%1$d</xliff:g> عنصر</item>		<item quantity="one">تم تحديد عنصر واحد (<xliff:g id="COUNT_0">%1$d</xliff:g>)</item>
	</plurals>		</plurals>
	<string name="default_notification_channel_label" msgid="5929663562028088222">"غير مصنفة"</string>		<string name="default_notification_channel_label" msgid="5929663562028088222">"غير مصنفة"</string>
	<string name="importance_from_user" msgid="7318955817386549931">"لقد عيَّنت أهمية هذه الإشعارات."</string>		<string name="importance_from_user" msgid="7318955817386549931">"لقد عيَّنت أهمية هذه الإشعارات."</string>