Merge branch 'eclair' of git://github.com/cyanogen/android_frameworks_base into eclair (73af73ba) · Commits · e / os / android_frameworks_base

core/java/android/provider/Settings.java

+27 −0

Original line number	Diff line number	Diff line
		@@ -1355,6 +1355,31 @@ public final class Settings {
		*/
		public static final String RECENT_APPS_NUMBER = "recent_apps_number";

		/**
		* Wysie_Soh
		* Specifies the clock color
		* @hide
		*/
		public static final String CLOCK_COLOR = "clock_color";

		/**
		* Wysie_Soh
		* Specifies the date color
		* @hide
		*/
		public static final String DATE_COLOR = "date_color";
		public static final String NEW_NOTIF_TICKER_COLOR = "new_notifications_ticker_color";
		public static final String NO_NOTIF_COLOR = "no_notifications_color";
		public static final String LATEST_NOTIF_COLOR = "latest_notifications_color";
		public static final String ONGOING_NOTIF_COLOR = "ongoing_notifications_color";
		public static final String SPN_LABEL_COLOR = "spnlabel_color";
		public static final String PLMN_LABEL_COLOR = "plmnLabel_color";
		public static final String CLEAR_BUTTON_LABEL_COLOR = "clearbutton_color";

		public static final String NOTIF_ITEM_TITLE_COLOR = "notifications_title_color";
		public static final String NOTIF_ITEM_TEXT_COLOR = "notifications_text_color";
		public static final String NOTIF_ITEM_TIME_COLOR = "notifications_time_color";

		/**
		* Whether the audible DTMF tones are played by the dialer when dialing. The value is
		* boolean (1 or 0).
		@@ -1476,6 +1501,8 @@ public final class Settings {
		*/
		public static final String BATTERY_PERCENTAGE_STATUS_ICON = "battery_percentage_status_icon";

		public static final String BATTERY_PERCENTAGE_STATUS_COLOR = "battery_status_color_title";

		/**
		* Settings to backup. This is here so that it's in the same place as the settings
		* keys and easy to update.

core/java/android/widget/TabHost.java

+24 −2

Original line number	Diff line number	Diff line
		@@ -51,6 +51,14 @@ public class TabHost extends FrameLayout implements ViewTreeObserver.OnTouchMode
		* {@hide}
		*/
		protected int mCurrentTab = -1;
		/**
		* This field when set to true ensures that first tab is not set as the current tab
		* by preventing the addTab() from calling setCurrentTab() with index set to 0.
		* To ensure that the operations of an application are not changed, it should be set to
		* false whenever mCurrenttab is set to -1.
		* {@hide}
		*/
		private boolean mAvoidFirstTabLoad = false;
		private View mCurrentView = null;
		/**
		* This field should be made private, so it is hidden from the SDK.
		@@ -75,6 +83,7 @@ public class TabHost extends FrameLayout implements ViewTreeObserver.OnTouchMode
		setDescendantFocusability(FOCUS_AFTER_DESCENDANTS);

		mCurrentTab = -1;
		mAvoidFirstTabLoad = false;
		mCurrentView = null;
		}

		@@ -209,7 +218,9 @@ mTabHost.addTab(TAB_TAG_1, "Hello, world!", "Tab 1");
		mTabWidget.addView(tabIndicator);
		mTabSpecs.add(tabSpec);

		if (mCurrentTab == -1) {
		// The second test is always true except when an application explicitly sets
		// mAvoidFirstTabLoad to true.
		if (mCurrentTab == -1 && !mAvoidFirstTabLoad) {
		setCurrentTab(0);
		}
		}
		@@ -252,7 +263,18 @@ mTabHost.addTab(TAB_TAG_1, "Hello, world!", "Tab 1");
		public View getCurrentView() {
		return mCurrentView;
		}

		/**
		* {@hide}
		*/
		public void setAvoidFirstTabLoad(boolean flag) {
		mAvoidFirstTabLoad = flag;
		}
		/**
		* {@hide}
		*/
		public void setCurrentTabToZero() {
		mCurrentTab = 0;
		}
		public void setCurrentTabByTag(String tag) {
		int i;
		for (i = 0; i < mTabSpecs.size(); i++) {

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

+6 −1

Original line number	Diff line number	Diff line
		@@ -348,6 +348,7 @@ public class PinLock extends View implements LockPattern {
		}

		protected void onMeasure(int widthMeasureSpec, int heightMeasureSpec) {
		/*
		final WindowManager wm = (WindowManager) getContext()
		.getSystemService(Context.WINDOW_SERVICE);
		final int width = wm.getDefaultDisplay().getWidth();
		@@ -358,7 +359,11 @@ public class PinLock extends View implements LockPattern {
		if (width > height) {
		squareSide -= STATUS_BAR_HEIGHT;
		}
		*/

		final int width = MeasureSpec.getSize(widthMeasureSpec);
		final int height = MeasureSpec.getSize(heightMeasureSpec);
		final int squareSide = Math.min(width, height);
		setMeasuredDimension(squareSide, squareSide);
		}

core/res/res/layout/keyguard_screen_tab_unlock.xml

+13 −11

Original line number	Diff line number	Diff line
		@@ -149,7 +149,9 @@
		android:id="@+id/emergencyCallButton"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_alignParentBottom="true"
		android:layout_below="@id/tab_selector"
		android:layout_marginTop="120dip"
		android:layout_marginBottom="8dip"
		android:layout_centerHorizontal="true"
		android:drawableLeft="@drawable/ic_emergency"
		style="@style/Widget.Button.Transparent"

libs/surfaceflinger/LayerBuffer.cpp

+0 −1

Original line number	Diff line number	Diff line
		@@ -537,7 +537,6 @@ status_t LayerBuffer::BufferSource::initTempBuffer(int w, int h) const
		glDeleteTextures(1, &mTexture.name);
		eglDestroyImageKHR(dpy, mTexture.image);
		Texture defaultTexture;
		mTexture = defaultTexture;
		mTexture.name = mLayer.createTexture();
		mTempGraphicBuffer.clear();
		} else if (!mLayer.mInvalidEGLImage) {