Snap for 5849705 from 7fad65392a3c0f165f099183dd12b58628274f92 to qt-qpr1-release (26543fe0) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+1 −6

Original line number	Diff line number	Diff line
		@@ -14423,13 +14423,8 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
		}

		notifyAppearedOrDisappearedForContentCaptureIfNeeded(isVisible);

		// Update the gesture exclusion rects only if they are set
		final ListenerInfo info = getListenerInfo();
		if (info != null && info.mSystemGestureExclusionRects != null) {
		updateSystemGestureExclusionRects();
		}
		}

		/**
		* Returns the current visibility of the window this view is attached to

packages/Shell/res/values-zh-rTW/strings.xml

+6 −6

Original line number	Diff line number	Diff line
		@@ -25,9 +25,9 @@
		<string name="bugreport_finished_text" product="watch" msgid="1223616207145252689">"系統即將在手機上顯示錯誤報告"</string>
		<string name="bugreport_finished_text" product="tv" msgid="5758325479058638893">"選取即可分享錯誤報告"</string>
		<string name="bugreport_finished_text" product="default" msgid="8353769438382138847">"輕觸即可分享錯誤報告"</string>
		<string name="bugreport_finished_pending_screenshot_text" product="tv" msgid="2343263822812016950">"選取即可分享不包含螢幕擷取畫面的錯誤報告；你也可以等候螢幕畫面擷取完畢"</string>
		<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"輕觸即可分享無螢幕擷圖的錯誤報告；你也可以等候螢幕畫面擷取完畢"</string>
		<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"輕觸即可分享無螢幕擷圖的錯誤報告；你也可以等候螢幕畫面擷取完畢"</string>
		<string name="bugreport_finished_pending_screenshot_text" product="tv" msgid="2343263822812016950">"選取即可分享不包含螢幕截圖的錯誤報告；你也可以等候螢幕畫面擷取完畢"</string>
		<string name="bugreport_finished_pending_screenshot_text" product="watch" msgid="1474435374470177193">"輕觸即可分享無螢幕截圖的錯誤報告；你也可以等候螢幕畫面擷取完畢"</string>
		<string name="bugreport_finished_pending_screenshot_text" product="default" msgid="1474435374470177193">"輕觸即可分享無螢幕截圖的錯誤報告；你也可以等候螢幕畫面擷取完畢"</string>
		<string name="bugreport_confirm" msgid="5917407234515812495">"錯誤報告的資料來自系統的各種記錄檔，當中可能包含敏感資料 (例如應用程式使用情形和位置資料)。請務必只與你信任的使用者和應用程式分享錯誤報告。"</string>
		<string name="bugreport_confirm_dont_repeat" msgid="6179945398364357318">"不要再顯示"</string>
		<string name="bugreport_storage_title" msgid="5332488144740527109">"錯誤報告"</string>
		@@ -35,9 +35,9 @@
		<string name="bugreport_add_details_to_zip_failed" msgid="1302931926486712371">"無法在 ZIP 檔案中加入錯誤報告"</string>
		<string name="bugreport_unnamed" msgid="2800582406842092709">"未命名"</string>
		<string name="bugreport_info_action" msgid="2158204228510576227">"詳細資料"</string>
		<string name="bugreport_screenshot_action" msgid="8677781721940614995">"螢幕擷取畫面"</string>
		<string name="bugreport_screenshot_taken" msgid="5684211273096253120">"已成功拍攝螢幕擷取畫面。"</string>
		<string name="bugreport_screenshot_failed" msgid="5853049140806834601">"無法拍攝螢幕擷取畫面。"</string>
		<string name="bugreport_screenshot_action" msgid="8677781721940614995">"螢幕截圖"</string>
		<string name="bugreport_screenshot_taken" msgid="5684211273096253120">"已成功拍攝螢幕截圖。"</string>
		<string name="bugreport_screenshot_failed" msgid="5853049140806834601">"無法拍攝螢幕截圖。"</string>
		<string name="bugreport_info_dialog_title" msgid="1355948594292983332">"錯誤報告 <xliff:g id="ID">#%d</xliff:g> 的詳細資料"</string>
		<string name="bugreport_info_name" msgid="4414036021935139527">"檔案名稱"</string>
		<string name="bugreport_info_title" msgid="2306030793918239804">"錯誤標題"</string>

packages/SystemUI/res-keyguard/values-cs/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -41,7 +41,7 @@
		<string name="keyguard_low_battery" msgid="9218432555787624490">"Připojte dobíjecí zařízení."</string>
		<string name="keyguard_instructions_when_pattern_disabled" msgid="8566679946700751371">"Klávesy odemknete stisknutím tlačítka nabídky."</string>
		<string name="keyguard_network_locked_message" msgid="6743537524631420759">"Síť je blokována"</string>
		<string name="keyguard_missing_sim_message_short" msgid="6327533369959764518">"Není vložena SIM karta"</string>
		<string name="keyguard_missing_sim_message_short" msgid="6327533369959764518">"Chybí SIM karta"</string>
		<string name="keyguard_missing_sim_message" product="tablet" msgid="4550152848200783542">"V tabletu není SIM karta."</string>
		<string name="keyguard_missing_sim_message" product="default" msgid="6585414237800161146">"V telefonu není SIM karta."</string>
		<string name="keyguard_missing_sim_instructions" msgid="7350295932015220392">"Vložte SIM kartu."</string>

packages/SystemUI/res-keyguard/values-fa/strings.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -37,7 +37,7 @@
		<string name="keyguard_plugged_in_wireless" msgid="8404159927155454732">"<xliff:g id="PERCENTAGE">%s</xliff:g> • درحال شارژ بی‌سیم"</string>
		<string name="keyguard_plugged_in" msgid="3161102098900158923">"<xliff:g id="PERCENTAGE">%s</xliff:g> • درحال شارژ شدن"</string>
		<string name="keyguard_plugged_in_charging_fast" msgid="3684592786276709342">"<xliff:g id="PERCENTAGE">%s</xliff:g> • درحال شارژ سریع"</string>
		<string name="keyguard_plugged_in_charging_slowly" msgid="509533586841478405">"<xliff:g id="PERCENTAGE">%s</xliff:g> • درحال شارژ آهسته"</string>
		<string name="keyguard_plugged_in_charging_slowly" msgid="509533586841478405">"<xliff:g id="PERCENTAGE">%s</xliff:g> • آهسته‌آهسته شارژ می‌شود"</string>
		<string name="keyguard_low_battery" msgid="9218432555787624490">"شارژر را وصل کنید."</string>
		<string name="keyguard_instructions_when_pattern_disabled" msgid="8566679946700751371">"برای باز کردن قفل روی «منو» فشار دهید."</string>
		<string name="keyguard_network_locked_message" msgid="6743537524631420759">"شبکه قفل شد"</string>

packages/SystemUI/src/com/android/systemui/qs/tiles/UserDetailView.java

+4 −1

Original line number	Diff line number	Diff line
		@@ -76,8 +76,11 @@ public class UserDetailView extends PseudoGridView {
		UserSwitcherController.UserRecord item) {
		UserDetailItemView v = UserDetailItemView.convertOrInflate(
		mContext, convertView, parent);
		if (v != convertView) {
		if ((v != convertView && !item.isCurrent) \|\| item.isGuest) {
		v.setOnClickListener(this);
		} else {
		v.setOnClickListener(null);
		v.setClickable(false);
		}
		String name = getName(mContext, item);
		if (item.picture == null) {