Merge 3e3c71a28905ac434b4418ec1206e895063369b3 on remote branch (93ee5ab0) · Commits · e / os / android_frameworks_base

core/java/android/widget/ListPopupWindow.java

+12 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 The Android Open Source Project
		* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
		*
		* Not a Contribution. Apache license notifications and license are retained
		* for attribution purposes only.
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -747,6 +751,14 @@ public class ListPopupWindow {
		if (isShowing()) {
		if (mItemClickListener != null) {
		final DropDownListView list = mDropDownList;

		// Sometimes the perform item is not visible in ListView then
		// 'list.getChildAt' method will return null. So we should call
		// 'list.setSelectionInt' method to make sure the item is
		// visible.
		if (list.getLastVisiblePosition() < position) {
		list.setSelectionInt(position);
		}
		final View child = list.getChildAt(position - list.getFirstVisiblePosition());
		final ListAdapter adapter = list.getAdapter();
		mItemClickListener.onItemClick(list, child, position, adapter.getItemId(position));

+9 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2008 The Android Open Source Project
		* Copyright (c) 2012-2013, The Linux Foundation. All rights reserved.
		*
		* Not a Contribution. Apache license notifications and license are retained
		* for attribution purposes only.
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		@@ -680,6 +684,11 @@ public class NumberPicker extends LinearLayout {
		} else {
		mInputText.setSelection(0, 0);
		validateInputTextView(v);
		// When mInputText isn't on focus ,hide the soft input.
		InputMethodManager inputMethodManager = InputMethodManager.peekInstance();
		if (inputMethodManager != null && inputMethodManager.isActive(mInputText)) {
		inputMethodManager.hideSoftInputFromWindow(getWindowToken(), 0);
		}
		}
		}
		});

+2 −0

Original line number	Diff line number	Diff line
		@@ -817,6 +817,8 @@
		<string name="keyguard_password_enter_password_code" msgid="1054721668279049780">"输入密码以解锁"</string>
		<string name="keyguard_password_enter_pin_password_code" msgid="6391755146112503443">"输入 PIN 进行解锁"</string>
		<string name="keyguard_password_wrong_pin_code" msgid="2422225591006134936">"PIN 码有误。"</string>
		<string name="keyguard_password_pin_failed">PIN ▒\| ~A▒~S~M▒~\失败!</string>
		<string name="keyguard_password_puk_failed">PUK ▒\| ~A▒~S~M▒~\失败!</string>
		<string name="keyguard_label_text" msgid="861796461028298424">"要解锁，请先按 MENU 再按 0。"</string>
		<string name="emergency_call_dialog_number_for_display" msgid="696192103195090970">"急救或报警电话"</string>
		<string name="lockscreen_carrier_default" msgid="8963839242565653192">"无服务。"</string>

+4 −0

Original line number	Diff line number	Diff line
		@@ -1363,4 +1363,8 @@
		<item>Trying to read MMS</item>
		<item>Trying to write MMS</item>
		</string-array>

		<!-- Configuration to restart radio upon PDP_DEACTIVATE with
		error cause as Regular deactivation(36). -->
		<bool name="config_radio_reset_on_regular_deactivation">true</bool>
		</resources>

+1 −0

Original line number	Diff line number	Diff line
		@@ -296,6 +296,7 @@
		<java-symbol type="bool" name="config_wifi_batched_scan_supported" />
		<java-symbol type="bool" name="flip_controller_fallback_keys" />
		<java-symbol type="bool" name="skip_radio_power_off_on_sim_refresh_reset" />
		<java-symbol type="bool" name="config_radio_reset_on_regular_deactivation" />

		<java-symbol type="integer" name="config_cursorWindowSize" />
		<java-symbol type="integer" name="config_extraFreeKbytesAdjust" />