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

api/6.xml

+7 −1446

File changed.

Preview size limit exceeded, changes collapsed.

api/current.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -99850,7 +99850,7 @@
		visibility="public"
		>
		</field>
		<field name="ECLAIR_MR1"
		<field name="ECLAIR_0_1"
		type="int"
		transient="false"
		volatile="false"

core/java/android/os/Build.java

+2 −2

Original line number	Diff line number	Diff line
		@@ -158,9 +158,9 @@ public class Build {
		public static final int ECLAIR = 5;

		/**
		* Current work on Eclair MR1.
		* December 2009: Android 2.0.1
		*/
		public static final int ECLAIR_MR1 = 6;
		public static final int ECLAIR_0_1 = 6;
		}

		/** The type of build, like "user" or "eng". */

core/java/android/provider/Settings.java

+13 −0

Original line number	Diff line number	Diff line
		@@ -3637,6 +3637,19 @@ public final class Settings {
		*/
		public static final String LAST_KMSG_KB = "last_kmsg_kb";

		/**
		* The length of time in milli-seconds that automatic small adjustments to
		* SystemClock are ignored if NITZ_UPDATE_DIFF is not exceeded.
		*/
		public static final String NITZ_UPDATE_SPACING = "nitz_update_spacing";

		/**
		* If the NITZ_UPDATE_DIFF time is exceeded then an automatic adjustment
		* to SystemClock will be allowed even if NITZ_UPDATE_SPACING has not been
		* exceeded.
		*/
		public static final String NITZ_UPDATE_DIFF = "nitz_update_diff";

		/**
		* @deprecated
		* @hide

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

0 → 100644

+186 −0

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2008 The Android Open Source Project
		*
		* Licensed under the Apache License, Version 2.0 (the "License");
		* you may not use this file except in compliance with the License.
		* You may obtain a copy of the License at
		*
		* http://www.apache.org/licenses/LICENSE-2.0
		*
		* Unless required by applicable law or agreed to in writing, software
		* distributed under the License is distributed on an "AS IS" BASIS,
		* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
		* See the License for the specific language governing permissions and
		* limitations under the License.
		*/

		package com.android.internal.widget;

		import com.android.internal.R;

		import android.content.BroadcastReceiver;
		import android.content.Context;
		import android.content.Intent;
		import android.content.IntentFilter;
		import android.content.res.Resources;
		import android.database.ContentObserver;
		import android.graphics.Typeface;
		import android.os.Handler;
		import android.provider.Settings;
		import android.text.format.DateFormat;
		import android.util.AttributeSet;
		import android.view.View;
		import android.widget.LinearLayout;
		import android.widget.TextView;

		import java.text.DateFormatSymbols;
		import java.util.Calendar;

		/**
		* Displays the time
		*/
		public class DigitalClock extends LinearLayout {

		private final static String M12 = "h:mm";
		private final static String M24 = "kk:mm";

		private Calendar mCalendar;
		private String mFormat;
		private TextView mTimeDisplay;
		private AmPm mAmPm;
		private ContentObserver mFormatChangeObserver;
		private boolean mLive = true;
		private boolean mAttached;

		/* called by system on minute ticks */
		private final Handler mHandler = new Handler();
		private final BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
		@Override
		public void onReceive(Context context, Intent intent) {
		if (mLive && intent.getAction().equals(
		Intent.ACTION_TIMEZONE_CHANGED)) {
		mCalendar = Calendar.getInstance();
		}
		updateTime();
		}
		};

		static class AmPm {
		private TextView mAmPm;
		private String mAmString, mPmString;

		AmPm(View parent, Typeface tf) {
		mAmPm = (TextView) parent.findViewById(R.id.am_pm);
		if (tf != null) {
		mAmPm.setTypeface(tf);
		}

		String[] ampm = new DateFormatSymbols().getAmPmStrings();
		mAmString = ampm[0];
		mPmString = ampm[1];
		}

		void setShowAmPm(boolean show) {
		mAmPm.setVisibility(show ? View.VISIBLE : View.GONE);
		}

		void setIsMorning(boolean isMorning) {
		mAmPm.setText(isMorning ? mAmString : mPmString);
		}
		}

		private class FormatChangeObserver extends ContentObserver {
		public FormatChangeObserver() {
		super(new Handler());
		}
		@Override
		public void onChange(boolean selfChange) {
		setDateFormat();
		updateTime();
		}
		}

		public DigitalClock(Context context) {
		this(context, null);
		}

		public DigitalClock(Context context, AttributeSet attrs) {
		super(context, attrs);
		}

		@Override
		protected void onFinishInflate() {
		super.onFinishInflate();

		mTimeDisplay = (TextView) findViewById(R.id.timeDisplay);
		mTimeDisplay.setTypeface(Typeface.createFromFile("/system/fonts/Clockopia.ttf"));
		mAmPm = new AmPm(this, Typeface.createFromFile("/system/fonts/DroidSans-Bold.ttf"));
		mCalendar = Calendar.getInstance();

		setDateFormat();
		}

		@Override
		protected void onAttachedToWindow() {
		super.onAttachedToWindow();

		if (mAttached) return;
		mAttached = true;

		if (mLive) {
		/* monitor time ticks, time changed, timezone */
		IntentFilter filter = new IntentFilter();
		filter.addAction(Intent.ACTION_TIME_TICK);
		filter.addAction(Intent.ACTION_TIME_CHANGED);
		filter.addAction(Intent.ACTION_TIMEZONE_CHANGED);
		mContext.registerReceiver(mIntentReceiver, filter, null, mHandler);
		}

		/* monitor 12/24-hour display preference */
		mFormatChangeObserver = new FormatChangeObserver();
		mContext.getContentResolver().registerContentObserver(
		Settings.System.CONTENT_URI, true, mFormatChangeObserver);

		updateTime();
		}

		@Override
		protected void onDetachedFromWindow() {
		super.onDetachedFromWindow();

		if (!mAttached) return;
		mAttached = false;

		if (mLive) {
		mContext.unregisterReceiver(mIntentReceiver);
		}
		mContext.getContentResolver().unregisterContentObserver(
		mFormatChangeObserver);
		}


		void updateTime(Calendar c) {
		mCalendar = c;
		updateTime();
		}

		private void updateTime() {
		if (mLive) {
		mCalendar.setTimeInMillis(System.currentTimeMillis());
		}

		CharSequence newTime = DateFormat.format(mFormat, mCalendar);
		mTimeDisplay.setText(newTime);
		mAmPm.setIsMorning(mCalendar.get(Calendar.AM_PM) == 0);
		}

		private void setDateFormat() {
		mFormat = android.text.format.DateFormat.is24HourFormat(getContext())
		? M24 : M12;
		mAmPm.setShowAmPm(mFormat.equals(M12));
		}

		void setLive(boolean live) {
		mLive = live;
		}
		}