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

core/java/android/hardware/GeomagneticField.java

+60 −61

Original line number	Diff line number	Diff line
		@@ -26,8 +26,9 @@ import java.util.GregorianCalendar;
		* <p>This uses the World Magnetic Model produced by the United States National
		* Geospatial-Intelligence Agency. More details about the model can be found at
		* <a href="http://www.ngdc.noaa.gov/geomag/WMM/DoDWMM.shtml">http://www.ngdc.noaa.gov/geomag/WMM/DoDWMM.shtml</a>.
		* This class currently uses WMM-2005 which is valid until 2010, but should
		* produce acceptable results for several years after that.
		* This class currently uses WMM-2010 which is valid until 2015, but should
		* produce acceptable results for several years after that. Future versions of
		* Android may use a newer version of the model.
		*/
		public class GeomagneticField {
		// The magnetic field at a given point, in nonoteslas in geodetic
		@@ -43,75 +44,73 @@ public class GeomagneticField {

		// Constants from WGS84 (the coordinate system used by GPS)
		static private final float EARTH_SEMI_MAJOR_AXIS_KM = 6378.137f;
		static private final float EARTH_SEMI_MINOR_AXIS_KM = 6356.7523f;
		static private final float EARTH_SEMI_MINOR_AXIS_KM = 6356.7523142f;
		static private final float EARTH_REFERENCE_RADIUS_KM = 6371.2f;

		// These coefficients and the formulae used below are from:
		// NOAA Technical Report: The US/UK World Magnetic Model for 2005-2010
		// NOAA Technical Report: The US/UK World Magnetic Model for 2010-2015
		static private final float[][] G_COEFF = new float[][] {
		{ 0f },
		{ -29556.8f, -1671.7f },
		{ -2340.6f, 3046.9f, 1657.0f },
		{ 1335.4f, -2305.1f, 1246.7f, 674.0f },
		{ 919.8f, 798.1f, 211.3f, -379.4f, 100.0f },
		{ -227.4f, 354.6f, 208.7f, -136.5f, -168.3f, -14.1f },
		{ 73.2f, 69.7f, 76.7f, -151.2f, -14.9f, 14.6f, -86.3f },
		{ 80.1f, -74.5f, -1.4f, 38.5f, 12.4f, 9.5f, 5.7f, 1.8f },
		{ 24.9f, 7.7f, -11.6f, -6.9f, -18.2f, 10.0f, 9.2f, -11.6f, -5.2f },
		{ 5.6f, 9.9f, 3.5f, -7.0f, 5.1f, -10.8f, -1.3f, 8.8f, -6.7f, -9.1f },
		{ -2.3f, -6.3f, 1.6f, -2.6f, 0.0f, 3.1f, 0.4f, 2.1f, 3.9f, -0.1f, -2.3f },
		{ 2.8f, -1.6f, -1.7f, 1.7f, -0.1f, 0.1f, -0.7f, 0.7f, 1.8f, 0.0f, 1.1f, 4.1f },
		{ -2.4f, -0.4f, 0.2f, 0.8f, -0.3f, 1.1f, -0.5f, 0.4f, -0.3f, -0.3f, -0.1f,
		-0.3f, -0.1f } };
		{ 0.0f },
		{ -29496.6f, -1586.3f },
		{ -2396.6f, 3026.1f, 1668.6f },
		{ 1340.1f, -2326.2f, 1231.9f, 634.0f },
		{ 912.6f, 808.9f, 166.7f, -357.1f, 89.4f },
		{ -230.9f, 357.2f, 200.3f, -141.1f, -163.0f, -7.8f },
		{ 72.8f, 68.6f, 76.0f, -141.4f, -22.8f, 13.2f, -77.9f },
		{ 80.5f, -75.1f, -4.7f, 45.3f, 13.9f, 10.4f, 1.7f, 4.9f },
		{ 24.4f, 8.1f, -14.5f, -5.6f, -19.3f, 11.5f, 10.9f, -14.1f, -3.7f },
		{ 5.4f, 9.4f, 3.4f, -5.2f, 3.1f, -12.4f, -0.7f, 8.4f, -8.5f, -10.1f },
		{ -2.0f, -6.3f, 0.9f, -1.1f, -0.2f, 2.5f, -0.3f, 2.2f, 3.1f, -1.0f, -2.8f },
		{ 3.0f, -1.5f, -2.1f, 1.7f, -0.5f, 0.5f, -0.8f, 0.4f, 1.8f, 0.1f, 0.7f, 3.8f },
		{ -2.2f, -0.2f, 0.3f, 1.0f, -0.6f, 0.9f, -0.1f, 0.5f, -0.4f, -0.4f, 0.2f, -0.8f, 0.0f } };

		static private final float[][] H_COEFF = new float[][] {
		{ 0f },
		{ 0.0f, 5079.8f },
		{ 0.0f, -2594.7f, -516.7f },
		{ 0.0f, -199.9f, 269.3f, -524.2f },
		{ 0.0f, 281.5f, -226.0f, 145.8f, -304.7f },
		{ 0.0f, 42.4f, 179.8f, -123.0f, -19.5f, 103.6f },
		{ 0.0f, -20.3f, 54.7f, 63.6f, -63.4f, -0.1f, 50.4f },
		{ 0.0f, -61.5f, -22.4f, 7.2f, 25.4f, 11.0f, -26.4f, -5.1f },
		{ 0.0f, 11.2f, -21.0f, 9.6f, -19.8f, 16.1f, 7.7f, -12.9f, -0.2f },
		{ 0.0f, -20.1f, 12.9f, 12.6f, -6.7f, -8.1f, 8.0f, 2.9f, -7.9f, 6.0f },
		{ 0.0f, 2.4f, 0.2f, 4.4f, 4.8f, -6.5f, -1.1f, -3.4f, -0.8f, -2.3f, -7.9f },
		{ 0.0f, 0.3f, 1.2f, -0.8f, -2.5f, 0.9f, -0.6f, -2.7f, -0.9f, -1.3f, -2.0f, -1.2f },
		{ 0.0f, -0.4f, 0.3f, 2.4f, -2.6f, 0.6f, 0.3f, 0.0f, 0.0f, 0.3f, -0.9f, -0.4f,
		0.8f } };
		{ 0.0f },
		{ 0.0f, 4944.4f },
		{ 0.0f, -2707.7f, -576.1f },
		{ 0.0f, -160.2f, 251.9f, -536.6f },
		{ 0.0f, 286.4f, -211.2f, 164.3f, -309.1f },
		{ 0.0f, 44.6f, 188.9f, -118.2f, 0.0f, 100.9f },
		{ 0.0f, -20.8f, 44.1f, 61.5f, -66.3f, 3.1f, 55.0f },
		{ 0.0f, -57.9f, -21.1f, 6.5f, 24.9f, 7.0f, -27.7f, -3.3f },
		{ 0.0f, 11.0f, -20.0f, 11.9f, -17.4f, 16.7f, 7.0f, -10.8f, 1.7f },
		{ 0.0f, -20.5f, 11.5f, 12.8f, -7.2f, -7.4f, 8.0f, 2.1f, -6.1f, 7.0f },
		{ 0.0f, 2.8f, -0.1f, 4.7f, 4.4f, -7.2f, -1.0f, -3.9f, -2.0f, -2.0f, -8.3f },
		{ 0.0f, 0.2f, 1.7f, -0.6f, -1.8f, 0.9f, -0.4f, -2.5f, -1.3f, -2.1f, -1.9f, -1.8f },
		{ 0.0f, -0.9f, 0.3f, 2.1f, -2.5f, 0.5f, 0.6f, 0.0f, 0.1f, 0.3f, -0.9f, -0.2f, 0.9f } };

		static private final float[][] DELTA_G = new float[][] {
		{ 0f },
		{ 8.0f, 10.6f },
		{ -15.1f, -7.8f, -0.8f },
		{ 0.4f, -2.6f, -1.2f, -6.5f },
		{ -2.5f, 2.8f, -7.0f, 6.2f, -3.8f },
		{ -2.8f, 0.7f, -3.2f, -1.1f, 0.1f, -0.8f },
		{ -0.7f, 0.4f, -0.3f, 2.3f, -2.1f, -0.6f, 1.4f },
		{ 0.2f, -0.1f, -0.3f, 1.1f, 0.6f, 0.5f, -0.4f, 0.6f },
		{ 0.1f, 0.3f, -0.4f, 0.3f, -0.3f, 0.2f, 0.4f, -0.7f, 0.4f },
		{ 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f },
		{ 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f },
		{ 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f },
		{ 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f } };
		{ 0.0f },
		{ 11.6f, 16.5f },
		{ -12.1f, -4.4f, 1.9f },
		{ 0.4f, -4.1f, -2.9f, -7.7f },
		{ -1.8f, 2.3f, -8.7f, 4.6f, -2.1f },
		{ -1.0f, 0.6f, -1.8f, -1.0f, 0.9f, 1.0f },
		{ -0.2f, -0.2f, -0.1f, 2.0f, -1.7f, -0.3f, 1.7f },
		{ 0.1f, -0.1f, -0.6f, 1.3f, 0.4f, 0.3f, -0.7f, 0.6f },
		{ -0.1f, 0.1f, -0.6f, 0.2f, -0.2f, 0.3f, 0.3f, -0.6f, 0.2f },
		{ 0.0f, -0.1f, 0.0f, 0.3f, -0.4f, -0.3f, 0.1f, -0.1f, -0.4f, -0.2f },
		{ 0.0f, 0.0f, -0.1f, 0.2f, 0.0f, -0.1f, -0.2f, 0.0f, -0.1f, -0.2f, -0.2f },
		{ 0.0f, 0.0f, 0.0f, 0.1f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -0.1f, 0.0f },
		{ 0.0f, 0.0f, 0.1f, 0.1f, -0.1f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, -0.1f, 0.1f } };

		static private final float[][] DELTA_H = new float[][] {
		{ 0f },
		{ 0.0f, -20.9f },
		{ 0.0f, -23.2f, -14.6f },
		{ 0.0f, 5.0f, -7.0f, -0.6f },
		{ 0.0f, 2.2f, 1.6f, 5.8f, 0.1f },
		{ 0.0f, 0.0f, 1.7f, 2.1f, 4.8f, -1.1f },
		{ 0.0f, -0.6f, -1.9f, -0.4f, -0.5f, -0.3f, 0.7f },
		{ 0.0f, 0.6f, 0.4f, 0.2f, 0.3f, -0.8f, -0.2f, 0.1f },
		{ 0.0f, -0.2f, 0.1f, 0.3f, 0.4f, 0.1f, -0.2f, 0.4f, 0.4f },
		{ 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f },
		{ 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f },
		{ 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f },
		{ 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f } };
		{ 0.0f },
		{ 0.0f, -25.9f },
		{ 0.0f, -22.5f, -11.8f },
		{ 0.0f, 7.3f, -3.9f, -2.6f },
		{ 0.0f, 1.1f, 2.7f, 3.9f, -0.8f },
		{ 0.0f, 0.4f, 1.8f, 1.2f, 4.0f, -0.6f },
		{ 0.0f, -0.2f, -2.1f, -0.4f, -0.6f, 0.5f, 0.9f },
		{ 0.0f, 0.7f, 0.3f, -0.1f, -0.1f, -0.8f, -0.3f, 0.3f },
		{ 0.0f, -0.1f, 0.2f, 0.4f, 0.4f, 0.1f, -0.1f, 0.4f, 0.3f },
		{ 0.0f, 0.0f, -0.2f, 0.0f, -0.1f, 0.1f, 0.0f, -0.2f, 0.3f, 0.2f },
		{ 0.0f, 0.1f, -0.1f, 0.0f, -0.1f, -0.1f, 0.0f, -0.1f, -0.2f, 0.0f, -0.1f },
		{ 0.0f, 0.0f, 0.1f, 0.0f, 0.1f, 0.0f, 0.1f, 0.0f, -0.1f, -0.1f, 0.0f, -0.1f },
		{ 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.1f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f, 0.0f } };

		static private final long BASE_TIME =
		new GregorianCalendar(2005, 1, 1).getTimeInMillis();
		new GregorianCalendar(2010, 1, 1).getTimeInMillis();

		// The ratio between the Gauss-normalized associated Legendre functions and
		// the Schmid quasi-normalized ones. Compute these once staticly since they
		@@ -191,7 +190,7 @@ public class GeomagneticField {
		// We now compute the magnetic field strength given the geocentric
		// location. The magnetic field is the derivative of the potential
		// function defined by the model. See NOAA Technical Report: The US/UK
		// World Magnetic Model for 2005-2010 for the derivation.
		// World Magnetic Model for 2010-2015 for the derivation.
		float gcX = 0.0f; // Geocentric northwards component.
		float gcY = 0.0f; // Geocentric eastwards component.
		float gcZ = 0.0f; // Geocentric downwards component.

core/java/android/provider/Settings.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -1432,6 +1432,12 @@ public final class Settings {
		*/
		public static final String NOTIFICATION_SCREEN_ON = "notification_screen_on";

		/**
		* Color to pulse the breathing light
		* @hide
		*/
		public static final String BREATHING_LIGHT_COLOR = "breathing_light_color";

		/**
		* Whether to wake the screen with the trackball. The value is boolean (1 or 0).
		* @hide

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

+3 −1

Original line number	Diff line number	Diff line
		@@ -124,7 +124,9 @@
		<string name="screen_lock" msgid="799094655496098153">"屏幕锁定"</string>
		<string name="power_off" msgid="4266614107412865048">"关机"</string>
		<string name="shutdown_progress" msgid="2281079257329981203">"正在关机..."</string>
		<string name="shutdown_confirm" msgid="649792175242821353">"您的手机会关机。"</string>
		<string name="shutdown_confirm" msgid="649792175242821353">"您的手机将会关机。"</string>
		<string name="reboot_system">"重启"</string>
		<string name="reboot_confirm">"您的手机将被重启。"</string>
		<string name="no_recent_tasks" msgid="279702952298056674">"没有最近的应用程序。"</string>
		<string name="global_actions" msgid="2406416831541615258">"手机选项"</string>
		<string name="global_action_lock" msgid="2844945191792119712">"屏幕锁定"</string>

services/java/com/android/server/HardwareService.java

+9 −2

Original line number	Diff line number	Diff line
		@@ -303,7 +303,12 @@ public class HardwareService extends IHardwareService.Stub {
		}
		}

		// Overload this function to prevent possibly breaking anything.
		public void pulseBreathingLight() {
		pulseBreathingLightColor(0x00ffffff);
		}

		public void pulseBreathingLightColor(int color) {
		synchronized (this) {
		// HACK: Added at the last minute of cupcake -- design this better;
		// Don't reuse the attention light -- make another one.
		@@ -313,7 +318,8 @@ public class HardwareService extends IHardwareService.Stub {
		}
		if (!mAttentionLightOn && !mPulsing) {
		mPulsing = true;
		setLight_native(mNativePointer, LIGHT_ID_ATTENTION, 0x00ffffff,
		// Use LIGHT_ID_NOTIFICATIONS to allow full color. LIGHT_ID_ATTENTION only allows white and blue
		setLight_native(mNativePointer, LIGHT_ID_NOTIFICATIONS, color,
		LIGHT_FLASH_HARDWARE, 7, 0, 0);
		mH.sendMessageDelayed(Message.obtain(mH, 1), 2000);
		}
		@@ -329,7 +335,8 @@ public class HardwareService extends IHardwareService.Stub {
		}
		if (mPulsing) {
		mPulsing = false;
		setLight_native(mNativePointer, LIGHT_ID_ATTENTION,
		// Use LIGHT_ID_NOTIFICATIONS to allow full color. LIGHT_ID_ATTENTION only allows white and blue
		setLight_native(mNativePointer, LIGHT_ID_NOTIFICATIONS,
		mAttentionLightOn ? 0xffffffff : 0,
		LIGHT_FLASH_NONE, 0, 0, 0);
		}

services/java/com/android/server/NotificationManagerService.java

+6 −1

Original line number	Diff line number	Diff line
		@@ -101,6 +101,7 @@ class NotificationManagerService extends INotificationManager.Stub
		private boolean mNotificationScreenOn;
		private boolean mNotificationPulseEnabled;
		private boolean mPulseBreathingLight;
		private int mBreathingLightColor;

		// for adb connected notifications
		private boolean mUsbConnected;
		@@ -362,6 +363,8 @@ class NotificationManagerService extends INotificationManager.Stub
		Settings.System.NOTIFICATION_LIGHT_PULSE), false, this);
		resolver.registerContentObserver(Settings.System.getUriFor(
		Settings.System.NOTIFICATION_SCREEN_ON), false, this);
		resolver.registerContentObserver(Settings.System.getUriFor(
		Settings.System.BREATHING_LIGHT_COLOR), false, this);
		update();
		}

		@@ -389,6 +392,8 @@ class NotificationManagerService extends INotificationManager.Stub
		mNotificationScreenOn = screenOn;
		updateNotificationPulse();
		}
		mBreathingLightColor = Settings.System.getInt(resolver,
		Settings.System.BREATHING_LIGHT_COLOR, 0x00ffffff);
		}
		}

		@@ -1039,7 +1044,7 @@ class NotificationManagerService extends INotificationManager.Stub
		// we only flash if screen is off and persistent pulsing is enabled
		if (mLedNotification == null \|\| (mScreenOn && !mNotificationScreenOn) \|\| !mNotificationPulseEnabled) {
		if (mPulseBreathingLight) {
		mHardware.pulseBreathingLight();
		mHardware.pulseBreathingLightColor(mBreathingLightColor);
		} else {
		mHardware.setLightOff_UNCHECKED(HardwareService.LIGHT_ID_NOTIFICATIONS);
		}