Merge branch 'eclair' of github.com:cyanogen/android_frameworks_base into eclair (3e461163) · Commits · e / os / android_frameworks_base

camera/libcameraservice/CameraService.cpp

+4 −1

Original line number	Diff line number	Diff line
		@@ -216,6 +216,7 @@ CameraService::Client::Client(const sp<CameraService>& cameraService,
		const sp<ICameraClient>& cameraClient, pid_t clientPid)
		{
		int callingPid = getCallingPid();
		char propVal[PROPERTY_VALUE_MAX];
		LOGD("Client::Client E (pid %d)", callingPid);
		mCameraService = cameraService;
		mCameraClient = cameraClient;
		@@ -233,6 +234,8 @@ CameraService::Client::Client(const sp<CameraService>& cameraService,
		CAMERA_MSG_ZOOM \|
		CAMERA_MSG_FOCUS);

		property_get("persist.camera.shutter.disable", propVal, "0");
		if(atoi(propVal) != 1)
		mMediaPlayerClick = newMediaPlayer("/system/media/audio/ui/camera_click.ogg");
		mMediaPlayerBeep = newMediaPlayer("/system/media/audio/ui/VideoRecord.ogg");
		mOverlayW = 0;

core/java/android/provider/Settings.java

+31 −0

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

		/**
		* bcrook - Double Carrier
		* Toggles whether to display the PLMN field on the Lockscreen
		*/
		public static final String SHOW_PLMN_LS = "show_plmn_ls";

		/**
		* bcrook - Double Carrier
		* Toggles whether to display the SPN field on the Lockscreen
		*/
		public static final String SHOW_SPN_LS = "show_spn_ls";

		/**
		* bcrook - Double Carrier
		* Toggles whether to display the PLMN field on the Notification bar
		*/
		public static final String SHOW_PLMN_SB = "show_plmn_sb";

		/**
		* bcrook - Double Carrier
		* Toggles whether to display the SPN field on the Notification bar
		*/
		public static final String SHOW_SPN_SB = "show_spn_sb";

		/**
		* Wysie_Soh
		* Specifies whether to show or hide clock
		@@ -1369,6 +1393,13 @@ public final class Settings {
		*/
		public static final String CLOCK_COLOR = "clock_color";

		/**
		* Wysie_Soh
		* Specifies notification count color
		* @hide
		*/
		public static final String NOTIF_COUNT_COLOR = "notif_count_color";

		/**
		* Wysie_Soh
		* Specifies the date color

services/java/com/android/server/status/StatusBarIcon.java

+4 −0

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@ class StatusBarIcon {
		private TextView mNumberView;
		private int clockColor = 0xff000000;
		private int batteryPercentColor = 0xffffffff;
		private int notifCountColor = 0xffffffff;
		private Context mContext;

		public StatusBarIcon(Context context, IconData data, ViewGroup parent) {
		@@ -88,6 +89,9 @@ class StatusBarIcon {
		mNumberView = nv;
		if (data.number > 0) {
		nv.setText("" + data.number);
		notifCountColor = Settings.System.getInt(mContext.getContentResolver(),
		Settings.System.NOTIF_COUNT_COLOR, notifCountColor);
		nv.setTextColor(notifCountColor);
		nv.setVisibility(View.VISIBLE);
		} else {
		nv.setVisibility(View.GONE);

services/java/com/android/server/status/StatusBarService.java

+16 −3

Original line number	Diff line number	Diff line
		@@ -90,6 +90,10 @@ public class StatusBarService extends IStatusBar.Stub
		static final String TAG = "StatusBar";
		static final boolean SPEW = false;

		//Double carrier
		private boolean mShowPlmnSb;
		private boolean mShowSpnSb;

		static final int EXPANDED_LEAVE_ALONE = -10000;
		static final int EXPANDED_FULL_OPEN = -10001;

		@@ -1785,12 +1789,16 @@ public class StatusBarService extends IStatusBar.Stub
		};

		void updateNetworkName(boolean showSpn, String spn, boolean showPlmn, String plmn) {
		// Double carrier
		mShowPlmnSb = (Settings.System.getInt(mContext.getContentResolver(), Settings.System.SHOW_PLMN_SB, 1) == 1);
		mShowSpnSb = (Settings.System.getInt(mContext.getContentResolver(), Settings.System.SHOW_SPN_SB, 1) == 1);
		if (false) {
		Log.d(TAG, "updateNetworkName showSpn=" + showSpn + " spn=" + spn
		+ " showPlmn=" + showPlmn + " plmn=" + plmn);
		+ " ShowPlmn=" + showPlmn + " plmn=" + plmn);
		}
		boolean something = false;
		if (showPlmn) {
		// Double carrier - bcrook
		if (showPlmn && mShowPlmnSb) {
		mPlmnLabel.setVisibility(View.VISIBLE);
		if (plmn != null) {
		mPlmnLabel.setText(plmn);
		@@ -1801,7 +1809,11 @@ public class StatusBarService extends IStatusBar.Stub
		mPlmnLabel.setText("");
		mPlmnLabel.setVisibility(View.GONE);
		}
		if (showSpn && spn != null) {

		// Double carrier - bcrook, refinements from Wysie


		if (showSpn && spn != null && mShowSpnSb) {
		mSpnLabel.setText(spn);
		mSpnLabel.setVisibility(View.VISIBLE);
		something = true;
		@@ -1809,6 +1821,7 @@ public class StatusBarService extends IStatusBar.Stub
		mSpnLabel.setText("");
		mSpnLabel.setVisibility(View.GONE);
		}

		}

		/**