Snap for 5821701 from 9b94c35a54ef061284f9de04f03b75fd7388fe3c to qt-c2f2-release (88f11bd8) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -3476,6 +3476,14 @@ public final class Settings {
		}
		};

		/**
		* The user selected min refresh rate in frames per second.
		*
		* If this isn't set, 0 will be used.
		* @hide
		*/
		public static final String MIN_REFRESH_RATE = "min_refresh_rate";

		/**
		* The user selected peak refresh rate in frames per second.
		*

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

+1 −1

Original line number	Diff line number	Diff line
		@@ -1665,7 +1665,7 @@
		<string name="accessibility_shortcut_toogle_warning" msgid="7256507885737444807">"షార్ట్‌కట్ ఆన్‌లో ఉన్నప్పుడు, రెండు వాల్యూమ్ బటన్‌లను 3 సెకన్ల పాటు నొక్కితే యాక్సెస్ సామర్థ్య ఫీచర్ ప్రారంభం అవుతుంది.\n\n ప్రస్తుత యాక్సెస్ సామర్థ్య ఫీచర్:\n <xliff:g id="SERVICE_NAME">%1$s</xliff:g>\n\n సెట్టింగ్‌లు > యాక్సెస్ సామర్థ్యంలో మీరు ఫీచర్‌ను మార్చవచ్చు."</string>
		<string name="disable_accessibility_shortcut" msgid="627625354248453445">"సత్వరమార్గాన్ని ఆఫ్ చేయి"</string>
		<string name="leave_accessibility_shortcut_on" msgid="7653111894438512680">"సత్వరమార్గాన్ని ఉపయోగించు"</string>
		<string name="color_inversion_feature_name" msgid="4231186527799958644">"వర్ణ విలోమం"</string>
		<string name="color_inversion_feature_name" msgid="4231186527799958644">"రంగుల మార్పిడి"</string>
		<string name="color_correction_feature_name" msgid="6779391426096954933">"రంగు సవరణ"</string>
		<string name="accessibility_shortcut_enabling_service" msgid="7771852911861522636">"యాక్సెస్ సామర్థ్య షార్ట్‌కట్ ద్వారా <xliff:g id="SERVICE_NAME">%1$s</xliff:g> ఆన్ చేయబడింది"</string>
		<string name="accessibility_shortcut_disabling_service" msgid="2747243438223109821">"యాక్సెస్ సామర్థ్య షార్ట్‌కట్ ద్వారా <xliff:g id="SERVICE_NAME">%1$s</xliff:g> ఆఫ్ చేయబడింది"</string>

core/res/res/values-zh-rTW/strings.xml

+4 −4

Original line number	Diff line number	Diff line
		@@ -625,7 +625,7 @@
		<string name="permlab_modifyNetworkAccounting" msgid="5088217309088729650">"修改網路使用量計算方式"</string>
		<string name="permdesc_modifyNetworkAccounting" msgid="5443412866746198123">"允許應用程式修改應用程式網路使用量的計算方式 (不建議一般應用程式使用)。"</string>
		<string name="permlab_accessNotifications" msgid="7673416487873432268">"存取通知"</string>
		<string name="permdesc_accessNotifications" msgid="458457742683431387">"允許應用程式擷取、檢查及清除通知 (包括由其他應用程式發佈的通知)。"</string>
		<string name="permdesc_accessNotifications" msgid="458457742683431387">"允許應用程式擷取、檢查及清除通知 (包括由其他應用程式發布的通知)。"</string>
		<string name="permlab_bindNotificationListenerService" msgid="7057764742211656654">"繫結至通知接聽器服務"</string>
		<string name="permdesc_bindNotificationListenerService" msgid="985697918576902986">"允許應用程式繫結至通知接聽器服務的頂層介面 (一般應用程式不需使用)。"</string>
		<string name="permlab_bindConditionProviderService" msgid="1180107672332704641">"繫結至條件提供者服務"</string>
		@@ -1567,13 +1567,13 @@
		<string name="data_usage_rapid_app_body" msgid="5396680996784142544">"「<xliff:g id="APP">%s</xliff:g>」的數據用量比平常多"</string>
		<string name="ssl_certificate" msgid="6510040486049237639">"安全性憑證"</string>
		<string name="ssl_certificate_is_valid" msgid="6825263250774569373">"憑證有效。"</string>
		<string name="issued_to" msgid="454239480274921032">"發佈至："</string>
		<string name="issued_to" msgid="454239480274921032">"發布至："</string>
		<string name="common_name" msgid="2233209299434172646">"常用名稱："</string>
		<string name="org_name" msgid="6973561190762085236">"機構："</string>
		<string name="org_unit" msgid="7265981890422070383">"機構單位："</string>
		<string name="issued_by" msgid="2647584988057481566">"發佈者："</string>
		<string name="issued_by" msgid="2647584988057481566">"發布者："</string>
		<string name="validity_period" msgid="8818886137545983110">"有效期間："</string>
		<string name="issued_on" msgid="5895017404361397232">"發佈日期："</string>
		<string name="issued_on" msgid="5895017404361397232">"發布日期："</string>
		<string name="expires_on" msgid="3676242949915959821">"到期日："</string>
		<string name="serial_number" msgid="758814067660862493">"序號："</string>
		<string name="fingerprints" msgid="4516019619850763049">"指紋"</string>

core/tests/coretests/src/android/provider/SettingsBackupTest.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -93,6 +93,7 @@ public class SettingsBackupTest {
		Settings.System.VOLUME_VOICE, // deprecated since API 2?
		Settings.System.WHEN_TO_MAKE_WIFI_CALLS, // bug?
		Settings.System.WINDOW_ORIENTATION_LISTENER_LOG, // used for debugging only
		Settings.System.MIN_REFRESH_RATE, // depends on hardware capabilities
		Settings.System.PEAK_REFRESH_RATE // depends on hardware capabilities
		);

packages/SystemUI/src/com/android/systemui/SystemUIFactory.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -134,11 +134,13 @@ public class SystemUIFactory {
		public KeyguardBouncer createKeyguardBouncer(Context context, ViewMediatorCallback callback,
		LockPatternUtils lockPatternUtils, ViewGroup container,
		DismissCallbackRegistry dismissCallbackRegistry,
		KeyguardBouncer.BouncerExpansionCallback expansionCallback) {
		KeyguardBouncer.BouncerExpansionCallback expansionCallback,
		KeyguardBypassController bypassController) {
		return new KeyguardBouncer(context, callback, lockPatternUtils, container,
		dismissCallbackRegistry, FalsingManagerFactory.getInstance(context),
		expansionCallback, UnlockMethodCache.getInstance(context),
		KeyguardUpdateMonitor.getInstance(context), new Handler(Looper.getMainLooper()));
		KeyguardUpdateMonitor.getInstance(context), bypassController,
		new Handler(Looper.getMainLooper()));
		}

		public ScrimController createScrimController(ScrimView scrimBehind, ScrimView scrimInFront,