am c0d954df: Change clock layouts (a80b7efa) · Commits · e / os / android_packages_apps_DeskClock

res/layout/desk_clock_saver.xml

+45 −95

Original line number	Diff line number	Diff line
		@@ -20,67 +20,25 @@
		xmlns:dc="http://schemas.android.com/apk/res-auto"
		android:layout_width="match_parent"
		android:layout_height="match_parent"
		android:orientation="vertical"
		android:background="#FF000000">

		<!-- Extra layout to let the clock float in the window -->
		<LinearLayout
		android:id="@+id/main_digital_clock"
		android:id="@+id/main_clock"
		android:orientation="vertical"
		android:layout_gravity="center"
		android:gravity="center"
		android:layout_marginTop="@dimen/time_margin_top"
		android:layout_marginBottom="@dimen/time_margin_bottom"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		>
		<LinearLayout
		android:id="@+id/digital_clock_extras"
		android:layout_marginLeft="@dimen/label_margin_big"
		android:layout_marginBottom="@dimen/label_margin_big"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:visibility="gone">
		<TextView android:id="@+id/date_digital"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textColor="@color/clock_white"
		style="@style/label"
		android:gravity="center"
		/>
		<TextView android:id="@+id/slash_digital"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginLeft="@dimen/style_label_space"
		android:layout_marginRight="@dimen/style_label_space"
		android:textColor="@color/clock_gray"
		android:text="@string/slash"
		style="@style/label"
		android:gravity="center"
		/>
		<TextView android:id="@+id/nextAlarm_digital"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:drawablePadding="2dip"
		android:drawableLeft="@drawable/ic_alarm_small"
		android:textColor="@color/clock_gray"
		style="@style/label"
		android:gravity="center"
		/>
		</LinearLayout>
		android:layout_marginTop="@dimen/time_margin_top"
		android:layout_marginBottom="@dimen/time_margin_bottom">

		<include layout="@layout/desk_clock_time_date"
		android:id="@+id/digital_clock"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:gravity="center"
		android:layout_gravity="center"
		/>
		</LinearLayout>

		<LinearLayout
		android:id="@+id/main_analog_clock"
		android:orientation="vertical"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginTop="@dimen/time_margin_top"
		android:layout_marginBottom="@dimen/time_margin_bottom"
		>
		<com.android.deskclock.AnalogClock
		android:id="@+id/analog_clock"
		android:layout_width="@dimen/analog_clock_diameter"
		@@ -93,29 +51,19 @@
		android:hand_hour="@drawable/clock_analog_hour"
		android:hand_minute="@drawable/clock_analog_minute"
		android:layout_marginBottom="@dimen/time_margin_bottom"/>

		<LinearLayout
		android:id="@+id/analog_clock_extras"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:gravity="center"
		android:visibility="gone">
		android:gravity="center" >
		<TextView android:id="@+id/date"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textColor="@color/clock_white"
		style="@style/label"
		android:gravity="center"
		/>
		<TextView android:id="@+id/slash"
		android:text="@string/slash"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textColor="@color/clock_gray"
		android:layout_marginLeft="4dip"
		android:layout_marginRight="4dip"
		style="@style/label"
		android:gravity="center"
		android:visibility="gone"
		/>
		<TextView android:id="@+id/nextAlarm"
		android:layout_width="wrap_content"
		@@ -124,7 +72,9 @@
		android:drawableLeft="@drawable/ic_alarm_small"
		android:textColor="@color/clock_gray"
		style="@style/label"
		android:layout_marginLeft="8dip"
		android:gravity="center"
		android:visibility="gone"
		/>
		</LinearLayout>
		</LinearLayout>

res/layout/desk_clock_time_date.xml

+0 −11

Original line number	Diff line number	Diff line
		@@ -59,16 +59,5 @@

		</com.android.deskclock.DigitalClock>

		<TextView android:id="@+id/date"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginRight="@dimen/time_margin_right"
		android:layout_marginLeft="@dimen/time_margin_left"
		android:paddingRight="@dimen/font_margin_adjust"
		android:textAppearance="?android:attr/textAppearanceMedium"
		android:textSize="@dimen/date_text_size"
		android:textColor="@color/time_text_color"
		android:visibility="gone"
		/>

		</LinearLayout>

res/layout/main_clock_frame.xml

+33 −82

Original line number	Diff line number	Diff line
		@@ -13,16 +13,16 @@
		See the License for the specific language governing permissions and
		limitations under the License.
		-->
		<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">

		<LinearLayout
		android:id="@+id/main_analog_clock"
		<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
		android:id="@+id/main_clock_frame"
		android:orientation="vertical"
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		>
		<FrameLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		<com.android.deskclock.AnalogClock
		android:id="@+id/analog_clock"
		android:layout_width="match_parent"
		@@ -35,85 +35,36 @@
		android:hand_hour="@drawable/clock_analog_hour"
		android:hand_minute="@drawable/clock_analog_minute"
		android:layout_marginBottom="@dimen/time_margin_bottom"/>
		<LinearLayout
		android:layout_width="match_parent"
		android:layout_height="wrap_content"
		android:gravity="center">
		<TextView android:id="@+id/date"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textColor="@color/clock_white"
		style="@style/label"
		android:gravity="center"
		/>
		<TextView android:id="@+id/slash"
		android:text="@string/slash"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textColor="@color/clock_gray"
		android:layout_marginLeft="4dip"
		android:layout_marginRight="4dip"
		style="@style/label"
		android:gravity="center"
		/>
		<TextView android:id="@+id/nextAlarm"
		<include layout="@layout/desk_clock_time_date"
		android:id="@+id/digital_clock"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:drawablePadding="2dip"
		android:drawableLeft="@drawable/ic_alarm_small"
		android:textColor="@color/clock_gray"
		style="@style/label"
		android:gravity="center"
		/>
		</LinearLayout>
		</LinearLayout>
		<LinearLayout
		android:id="@+id/main_digital_clock"
		android:orientation="vertical"
		android:layout_gravity="center"
		android:gravity="center"
		android:layout_marginTop="@dimen/time_margin_top"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		>
		android:layout_marginBottom="@dimen/medium_space_bottom"
		/>
		</FrameLayout>
		<LinearLayout
		android:layout_marginLeft="@dimen/label_margin_big"
		android:layout_marginBottom="@dimen/label_margin_big"
		android:layout_width="match_parent"
		android:layout_height="wrap_content">
		<TextView android:id="@+id/date_digital"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:textColor="@color/clock_white"
		style="@style/label"
		android:gravity="center"
		/>
		<TextView android:id="@+id/slash_digital"
		android:gravity="center">
		<TextView android:id="@+id/date"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_marginLeft="@dimen/style_label_space"
		android:layout_marginRight="@dimen/style_label_space"
		android:textColor="@color/clock_gray"
		android:text="@string/slash"
		android:textColor="@color/clock_white"
		style="@style/label"
		android:gravity="center"
		/>
		<TextView android:id="@+id/nextAlarm_digital"
		<TextView android:id="@+id/nextAlarm"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:drawablePadding="2dip"
		android:drawableLeft="@drawable/ic_alarm_small"
		android:textColor="@color/clock_gray"
		style="@style/label"
		android:layout_marginLeft="8dip"
		android:gravity="center"
		/>
		</LinearLayout>
		<include layout="@layout/desk_clock_time_date"
		android:id="@+id/digital_clock"
		android:layout_width="wrap_content"
		android:layout_height="wrap_content"
		android:layout_gravity="center"
		android:layout_marginBottom="@dimen/medium_space_bottom"
		/>
		</LinearLayout>
		</FrameLayout>
		No newline at end of file

res/layout/world_clock_item.xml

+1 −10

Original line number	Diff line number	Diff line
		@@ -21,15 +21,6 @@
		android:paddingTop="@dimen/medium_space_top"
		android:paddingBottom="@dimen/medium_space_bottom"
		android:orientation="vertical">
		<com.android.deskclock.widget.EllipsizeLayout
		android:id="@+id/city_name_digital"
		android:layout_height="wrap_content"
		android:layout_width="match_parent"
		android:layout_marginBottom="@dimen/label_margin_small"
		android:layout_marginLeft="@dimen/label_margin_small"
		>
		<include layout="@layout/world_clock_label"/>
		</com.android.deskclock.widget.EllipsizeLayout>
		<FrameLayout
		android:layout_width="wrap_content"
		android:layout_height="wrap_content">
		@@ -47,7 +38,7 @@
		android:hand_minute="@drawable/clock_analog_minute"/>
		</FrameLayout>
		<com.android.deskclock.widget.EllipsizeLayout
		android:id="@+id/city_name_analog"
		android:id="@+id/city_name_layout"
		android:layout_height="wrap_content"
		android:layout_width="match_parent"
		android:layout_marginTop="@dimen/label_margin_small"

src/com/android/deskclock/ClockFragment.java

+14 −24

Original line number	Diff line number	Diff line
		@@ -82,8 +82,7 @@ public class ClockFragment extends DeskClockFragment implements OnSharedPreferen
		boolean changed = intent.getAction().equals(Intent.ACTION_TIME_CHANGED)
		\|\| intent.getAction().equals(Intent.ACTION_TIMEZONE_CHANGED);
		if (changed \|\| intent.getAction().equals(Utils.ACTION_ON_QUARTER_HOUR)) {
		Utils.updateDate(mDateFormat, mDateFormatForAccessibility,
		mClockStyle, mAnalogClock, mDigitalClock);
		Utils.updateDate(mDateFormat, mDateFormatForAccessibility,mClockFrame);
		if (mAdapter != null) {
		// *CHANGED may modify the need for showing the Home City
		if (changed && (mAdapter.hasHomeCity() != mAdapter.needHomeCity())) {
		@@ -95,7 +94,7 @@ public class ClockFragment extends DeskClockFragment implements OnSharedPreferen
		}
		if (changed \|\| intent.getAction().equals(Alarms.ALARM_DONE_ACTION)
		\|\| intent.getAction().equals(Alarms.ALARM_SNOOZE_CANCELLED)) {
		Utils.refreshAlarm(getActivity(), mClockStyle, mAnalogClock, mDigitalClock);
		Utils.refreshAlarm(getActivity(), mClockFrame);
		}
		}
		};
		@@ -119,8 +118,8 @@ public class ClockFragment extends DeskClockFragment implements OnSharedPreferen
		View headerView = inflater.inflate(R.layout.blank_header_view, mList, false);
		mList.addHeaderView(headerView);
		mClockFrame = inflater.inflate(R.layout.main_clock_frame, mList, false);
		mDigitalClock = mClockFrame.findViewById(R.id.main_digital_clock);
		mAnalogClock = mClockFrame.findViewById(R.id.main_analog_clock);
		mDigitalClock = mClockFrame.findViewById(R.id.digital_clock);
		mAnalogClock = mClockFrame.findViewById(R.id.analog_clock);
		mList.addHeaderView(mClockFrame, null, false);
		View footerView = inflater.inflate(R.layout.blank_footer_view, mList, false);
		footerView.setBackgroundResource(R.color.blackish);
		@@ -174,8 +173,10 @@ public class ClockFragment extends DeskClockFragment implements OnSharedPreferen
		mQuarterlyIntent = PendingIntent.getBroadcast(
		getActivity(), 0, new Intent(Utils.ACTION_ON_QUARTER_HOUR), 0);
		((AlarmManager) getActivity().getSystemService(Context.ALARM_SERVICE)).setRepeating(
		AlarmManager.RTC, alarmOnQuarterHour, AlarmManager.INTERVAL_FIFTEEN_MINUTES, mQuarterlyIntent);
		// Besides monitoring when quarter-hour changes, monitor other actions that effect clock time
		AlarmManager.RTC, alarmOnQuarterHour, AlarmManager.INTERVAL_FIFTEEN_MINUTES,
		mQuarterlyIntent);
		// Besides monitoring when quarter-hour changes, monitor other actions that
		// effect clock time
		IntentFilter filter = new IntentFilter(Utils.ACTION_ON_QUARTER_HOUR);
		filter.addAction(Alarms.ALARM_DONE_ACTION);
		filter.addAction(Alarms.ALARM_SNOOZE_CANCELLED);
		@@ -196,9 +197,8 @@ public class ClockFragment extends DeskClockFragment implements OnSharedPreferen
		Utils.CLOCK_TYPE_DIGITAL : Utils.CLOCK_TYPE_ANALOG);
		mAdapter.notifyDataSetChanged();

		Utils.updateDate(mDateFormat, mDateFormatForAccessibility,
		mClockStyle, mAnalogClock, mDigitalClock);
		Utils.refreshAlarm(getActivity(), mClockStyle, mAnalogClock, mDigitalClock);
		Utils.updateDate(mDateFormat, mDateFormatForAccessibility,mClockFrame);
		Utils.refreshAlarm(getActivity(), mClockFrame);
		}

		@Override
		@@ -399,30 +399,21 @@ public class ClockFragment extends DeskClockFragment implements OnSharedPreferen
		}

		private void updateView(View clock, CityObj cityObj) {
		View nameDigital= clock.findViewById(R.id.city_name_digital);
		View nameAnalog = clock.findViewById(R.id.city_name_analog);
		TextView name;
		TextView dayOfWeek;
		View nameLayout= clock.findViewById(R.id.city_name_layout);
		TextView name = (TextView)(nameLayout.findViewById(R.id.city_name));
		TextView dayOfWeek = (TextView)(nameLayout.findViewById(R.id.city_day));
		DigitalClock dclock = (DigitalClock)(clock.findViewById(R.id.digital_clock));
		AnalogClock aclock = (AnalogClock)(clock.findViewById(R.id.analog_clock));

		if (mClockStyle.equals("analog")) {
		dclock.setVisibility(View.GONE);
		nameDigital.setVisibility(View.GONE);
		aclock.setVisibility(View.VISIBLE);
		nameAnalog.setVisibility(View.VISIBLE);
		aclock.setTimeZone(cityObj.mTimeZone);
		aclock.enableSeconds(false);
		name = (TextView)(nameAnalog.findViewById(R.id.city_name));
		dayOfWeek = (TextView)(nameAnalog.findViewById(R.id.city_day));
		} else {
		dclock.setVisibility(View.VISIBLE);
		nameDigital.setVisibility(View.VISIBLE);
		dclock.setTimeZone(cityObj.mTimeZone);
		aclock.setVisibility(View.GONE);
		nameAnalog.setVisibility(View.GONE);
		name = (TextView)(nameDigital.findViewById(R.id.city_name));
		dayOfWeek = (TextView)(nameDigital.findViewById(R.id.city_day));
		dclock.setTimeZone(cityObj.mTimeZone);
		}
		name.setText(cityObj.mCityName);
		final Calendar now = Calendar.getInstance();
		@@ -439,5 +430,4 @@ public class ClockFragment extends DeskClockFragment implements OnSharedPreferen
		}
		}
		}

		}