Merge "Miscellaneous Cleanup" into ub-deskclock-dazzle (c42cfd50) · Commits · e / os / android_packages_apps_DeskClock

src/com/android/deskclock/AlarmListeners.java

deleted100644 → 0

+0 −38

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2012 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.deskclock;

		import android.view.View;

		/** Change me */
		public class AlarmListeners {

		public static class DigitalClockClickListener implements View.OnClickListener {

		private int alarmId;

		public DigitalClockClickListener(int alarmId) {
		this.alarmId = alarmId;
		}

		@Override
		public void onClick(View view) {

		}
		}

		}

src/com/android/deskclock/AlarmSelectionActivity.java

+0 −4

Original line number	Diff line number	Diff line
		@@ -22,7 +22,6 @@ import android.content.Intent;
		import android.os.AsyncTask;
		import android.os.Bundle;
		import android.os.Parcelable;
		import android.util.ArrayMap;
		import android.view.View;
		import android.widget.Button;
		import android.widget.ListView;
		@@ -33,14 +32,12 @@ import com.android.deskclock.widget.selector.AlarmSelectionAdapter;

		import java.util.ArrayList;
		import java.util.List;
		import java.util.Map;

		public class AlarmSelectionActivity extends ListActivity {

		public static final String EXTRA_ALARMS = "com.android.deskclock.EXTRA_ALARMS";

		private final List<AlarmSelection> mSelections = new ArrayList<>();
		private final Map<Long, Alarm> mAlarmsMap = new ArrayMap<>();

		@Override
		protected void onCreate(Bundle savedInstanceState) {
		@@ -71,7 +68,6 @@ public class AlarmSelectionActivity extends ListActivity {
		// so no need to check if alarmsFromIntent is empty
		for (Parcelable parcelable : alarmsFromIntent) {
		final Alarm alarm = (Alarm) parcelable;
		mAlarmsMap.put(alarm.id, alarm);

		// filling mSelections that go into the UI picker list
		final String label = String.format("%d %02d", alarm.hour, alarm.minutes);

src/com/android/deskclock/AndroidClockTextView.java

deleted100644 → 0

+0 −58

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2010 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.deskclock;

		import android.content.Context;
		import android.graphics.Paint;
		import android.graphics.Typeface;
		import android.util.AttributeSet;
		import android.widget.TextView;

		/**
		* Displays text using the special AndroidClock font.
		*/
		public class AndroidClockTextView extends TextView {

		private static final String SYSTEM = "/system/fonts/";
		private static final String SYSTEM_FONT_TIME_BACKGROUND = SYSTEM + "AndroidClock.ttf";

		private static final String ATTR_USE_CLOCK_TYPEFACE = "useClockTypeface";

		private static Typeface sClockTypeface;
		private static Typeface sStandardTypeface;

		private boolean mUseClockTypeface;

		public AndroidClockTextView(Context context) {
		super(context);
		}

		public AndroidClockTextView(Context context, AttributeSet attrs) {
		super(context, attrs);

		mUseClockTypeface = attrs.getAttributeBooleanValue(null, ATTR_USE_CLOCK_TYPEFACE, true)
		&& !isInEditMode();

		sStandardTypeface = Typeface.DEFAULT;
		if (sClockTypeface == null && mUseClockTypeface) {
		sClockTypeface = Typeface.createFromFile(SYSTEM_FONT_TIME_BACKGROUND);
		}

		Paint paint = getPaint();
		paint.setTypeface(mUseClockTypeface ? sClockTypeface : sStandardTypeface);
		}
		}

src/com/android/deskclock/DeskClock.java

+0 −19

Original line number	Diff line number	Diff line
		@@ -50,7 +50,6 @@ import com.android.deskclock.alarms.AlarmStateManager;
		import com.android.deskclock.data.DataModel;
		import com.android.deskclock.events.Events;
		import com.android.deskclock.provider.Alarm;
		import com.android.deskclock.settings.SettingsActivity;
		import com.android.deskclock.stopwatch.StopwatchFragment;
		import com.android.deskclock.timer.TimerFragment;
		import com.android.deskclock.timer.TimerObj;
		@@ -60,7 +59,6 @@ import com.android.deskclock.widget.RtlViewPager;
		import java.util.ArrayList;
		import java.util.List;
		import java.util.Set;
		import java.util.TimeZone;

		/**
		* DeskClock clock view for desk docks.
		@@ -206,7 +204,6 @@ public class DeskClock extends BaseActivity
		}
		}
		initViews();
		setHomeTimeZone();

		// We need to update the system next alarm time on app startup because the
		// user might have clear our data.
		@@ -274,22 +271,6 @@ public class DeskClock extends BaseActivity
		}
		}

		/**
		* Insert the local time zone as the Home Time Zone if one is not set
		*/
		private void setHomeTimeZone() {
		SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(this);
		String homeTimeZone = prefs.getString(SettingsActivity.KEY_HOME_TZ, "");
		if (!homeTimeZone.isEmpty()) {
		return;
		}
		homeTimeZone = TimeZone.getDefault().getID();
		SharedPreferences.Editor editor = prefs.edit();
		editor.putString(SettingsActivity.KEY_HOME_TZ, homeTimeZone);
		editor.apply();
		LogUtils.v(TAG, "Setting home time zone to " + homeTimeZone);
		}

		public void registerPageChangedListener(DeskClockFragment frag) {
		if (mTabsAdapter != null) {
		mTabsAdapter.registerPageChangedListener(frag);

src/com/android/deskclock/DontPressWithParentLayout.java

deleted100644 → 0

+0 −43

Original line number	Diff line number	Diff line
		/*
		* Copyright (C) 2009 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.deskclock;

		import android.content.Context;
		import android.util.AttributeSet;
		import android.view.View;
		import android.widget.LinearLayout;

		/**
		* Special class to to allow the parent to be pressed without being pressed
		* itself. This way the time in the alarm list can be pressed without changing
		* the background of the indicator.
		*/
		public class DontPressWithParentLayout extends LinearLayout {

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

		@Override
		public void setPressed(boolean pressed) {
		// If the parent is pressed, do not set to pressed.
		if (pressed && ((View) getParent()).isPressed()) {
		return;
		}
		super.setPressed(pressed);
		}
		}