Merge branch 'eclair' into eclair-release (77ad8d8b) · Commits · e / os / android_frameworks_base

core/java/android/app/SearchManager.java

+11 −16

Original line number	Diff line number	Diff line
		@@ -769,17 +769,15 @@ import java.util.List;
		* </tr>
		*
		* <tr><th>android:icon</th>
		* <td>If provided, this icon will be shown in place of the label above the search box.
		* This is a reference to a drawable (icon) resource. Note that the application icon
		* is also used as an icon to the left of the search box and you cannot modify this
		* behavior, so including the icon attribute is unecessary and this may be
		* deprecated in the future.</td>
		* <td><strong>This is deprecated.</strong><br/>The default
		* application icon is now always used, so this attribute is
		* obsolete.</td>
		* <td align="center">No</td>
		* </tr>
		*
		* <tr><th>android:hint</th>
		* <td>This is the text to display in the search text field when no user text has been
		* entered.</td>
		* <td>This is the text to display in the search text field when no text
		* has been entered by the user.</td>
		* <td align="center">No</td>
		* </tr>
		*
		@@ -790,17 +788,14 @@ import java.util.List;
		* <tbody>
		* <tr><th>showSearchLabelAsBadge</th>
		* <td>If set, this flag enables the display of the search target (label)
		* above the search box. If this flag and showSearchIconAsBadge
		* (see below) are both not set, no badge will be shown.</td>
		* above the search box. As an alternative, you may
		* want to instead use "hint" text in the search box.
		* See the "android:hint" attribute above.</td>
		* </tr>
		* <tr><th>showSearchIconAsBadge</th>
		* <td>If set, this flag enables the display of the search target (icon)
		* above the search box. If this flag and showSearchLabelAsBadge
		* (see above) are both not set, no badge will be shown. If both flags
		* are set, showSearchIconAsBadge has precedence and the icon will be
		* shown. Because the application icon is now used to the left of the
		* search box by default, using this search mode is no longer necessary
		* and may be deprecated in the future.</td>
		* <td><strong>This is deprecated.</strong><br/>The default
		* application icon is now always used, so this
		* option is obsolete.</td>
		* </tr>
		* <tr><th>queryRewriteFromData</th>
		* <td>If set, this flag causes the suggestion column SUGGEST_COLUMN_INTENT_DATA

core/java/android/content/Intent.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -1678,6 +1678,7 @@ public class Intent implements Parcelable {
		* <ul>
		* <li><em>state</em> - 0 for unplugged, 1 for plugged. </li>
		* <li><em>name</em> - Headset type, human readable string </li>
		* <li><em>microphone</em> - 1 if headset has a microphone, 0 otherwise </li>
		* </ul>
		* </ul>
		*/

core/java/android/pim/vcard/VCardComposer.java

+4 −2

Original line number	Diff line number	Diff line
		@@ -414,8 +414,10 @@ public class VCardComposer {
		appendVCardLine(builder, VCARD_PROPERTY_FULL_NAME, phoneName, needCharset, false);
		appendVCardLine(builder, VCARD_PROPERTY_NAME, phoneName, needCharset, false);

		if (!TextUtils.isEmpty(phoneNumber)) {
		String label = Integer.toString(phonetype);
		appendVCardTelephoneLine(builder, phonetype, label, phoneNumber);
		}

		appendVCardLine(builder, VCARD_PROPERTY_END, VCARD_DATA_VCARD);

core/java/com/android/internal/widget/SlidingTab.java

+26 −7

Original line number	Diff line number	Diff line
		@@ -309,12 +309,30 @@ public class SlidingTab extends ViewGroup {
		setState(currentState);
		}

		/**
		* Ensure all the dependent widgets are measured.
		*/
		public void measure() {
		tab.measure(View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED),
		View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));
		text.measure(View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED),
		View.MeasureSpec.makeMeasureSpec(0, View.MeasureSpec.UNSPECIFIED));
		}

		/**
		* Get the measured tab width. Must be called after {@link Slider#measure()}.
		* @return
		*/
		public int getTabWidth() {
		return tab.getDrawable().getIntrinsicWidth();
		return tab.getMeasuredWidth();
		}

		/**
		* Get the measured tab width. Must be called after {@link Slider#measure()}.
		* @return
		*/
		public int getTabHeight() {
		return tab.getDrawable().getIntrinsicHeight();
		return tab.getMeasuredHeight();
		}
		}

		@@ -360,11 +378,12 @@ public class SlidingTab extends ViewGroup {
		throw new RuntimeException(LOG_TAG + " cannot have UNSPECIFIED dimensions");
		}

		final float density = mDensity;
		final int leftTabWidth = (int) (density * mLeftSlider.getTabWidth() + 0.5f);
		final int rightTabWidth = (int) (density * mRightSlider.getTabWidth() + 0.5f);
		final int leftTabHeight = (int) (density * mLeftSlider.getTabHeight() + 0.5f);
		final int rightTabHeight = (int) (density * mRightSlider.getTabHeight() + 0.5f);
		mLeftSlider.measure();
		mRightSlider.measure();
		final int leftTabWidth = mLeftSlider.getTabWidth();
		final int rightTabWidth = mRightSlider.getTabWidth();
		final int leftTabHeight = mLeftSlider.getTabHeight();
		final int rightTabHeight = mRightSlider.getTabHeight();
		final int width;
		final int height;
		if (isHorizontal()) {

core/res/res/drawable-hdpi/ic_jog_dial_answer.png

0 → 100644

+6.06 KiB

Loading image diff...