Layout changes for analog clock and world clock (4c2de2b5) · Commits · e / os / android_packages_apps_DeskClock

res/layout/world_clock_item.xml

+13 −1

Original line number	Diff line number	Diff line
		@@ -21,7 +21,7 @@
		android:paddingBottom="@dimen/small_space"
		android:orientation="vertical">
		<TextView
		android:id="@+id/city_name"
		android:id="@+id/city_name_digital"
		android:layout_height="wrap_content"
		android:layout_width="match_parent"
		android:layout_marginBottom="@dimen/label_margin_small"
		@@ -47,4 +47,16 @@
		android:hand_hour="@drawable/clock_analog_hour"
		android:hand_minute="@drawable/clock_analog_minute"/>
		</FrameLayout>
		<TextView
		android:id="@+id/city_name_analog"
		android:layout_height="wrap_content"
		android:layout_width="match_parent"
		android:layout_marginTop="@dimen/label_margin_small"
		android:layout_marginLeft="@dimen/label_margin_small"
		style="@style/label"
		android:singleLine="true"
		android:ellipsize="none"
		android:gravity="center"
		android:textColor="@color/clock_white"
		/>
		</LinearLayout>

res/values-land/dimens.xml

+1 −1

Original line number	Diff line number	Diff line
		@@ -38,7 +38,7 @@
		<dimen name="actionbar_tab_padding">50dip</dimen>

		<!-- Size of margin for circles. -->
		<dimen name="circle_margin">8dp</dimen>
		<dimen name="circle_margin">200dp</dimen>
		<dimen name="laps_margin">16dp</dimen>

		<!-- Extra offset for timer button paddings. Only nonzero for non-tablets. -->

res/values/dimens.xml

+2 −1

Original line number	Diff line number	Diff line
		@@ -35,6 +35,7 @@
		<dimen name="alarm_label_padding">8dip</dimen>
		<dimen name="alert_dialog_title_height">64dip</dimen>
		<dimen name="popup_window_width">196dip</dimen>
		<!-- Analog clock size in the the screen saver -->
		<dimen name="analog_clock_diameter">236dip</dimen>
		<dimen name="timer_circle_diameter">300dip</dimen>
		<dimen name="timer_circle_width">350dip</dimen>
		@@ -73,7 +74,7 @@

		<!-- Size of margin for circles. -->
		<dimen name="circle_margin_top">16dp</dimen>
		<dimen name="circle_margin">32dp</dimen>
		<dimen name="circle_margin">60dp</dimen>
		<dimen name="laps_margin">52dp</dimen>

		<!-- The width of the big icons in notifications. -->

src/com/android/deskclock/ClockFragment.java

+16 −8

Original line number	Diff line number	Diff line
		@@ -272,8 +272,8 @@ public class ClockFragment extends DeskClockFragment implements OnSharedPreferen
		View leftClock = view.findViewById(R.id.city_left);
		View rightClock = view.findViewById(R.id.city_right);
		CityObj c = (CityObj)mCitiesList[index];
		TextView name = ((TextView)leftClock.findViewById(R.id.city_name));
		name.setText(c.mCityName);
		TextView nameDigital= ((TextView)leftClock.findViewById(R.id.city_name_digital));
		TextView nameAnalog = ((TextView)leftClock.findViewById(R.id.city_name_analog));
		DigitalClock dclock = (DigitalClock)(leftClock.findViewById(R.id.digital_clock));
		AnalogClock aclock = (AnalogClock)(leftClock.findViewById(R.id.analog_clock));
		if (mClockStyle.equals("analog")) {
		@@ -281,9 +281,13 @@ public class ClockFragment extends DeskClockFragment implements OnSharedPreferen
		aclock.setVisibility(View.VISIBLE);
		aclock.setTimeZone(c.mTimeZone);
		aclock.enableSeconds(false);
		name.setGravity(Gravity.CENTER_HORIZONTAL);
		nameAnalog.setText(c.mCityName);
		nameAnalog.setVisibility(View.VISIBLE);
		nameDigital.setVisibility(View.GONE);
		} else {
		name.setGravity(Gravity.LEFT);
		nameDigital.setText(c.mCityName);
		nameDigital.setVisibility(View.VISIBLE);
		nameAnalog.setVisibility(View.GONE);
		aclock.setVisibility(View.GONE);
		dclock.setVisibility(View.VISIBLE);
		dclock.setTimeZone(c.mTimeZone);
		@@ -291,18 +295,22 @@ public class ClockFragment extends DeskClockFragment implements OnSharedPreferen
		if (index + 1 < mCitiesList.length) {
		rightClock.setVisibility(View.VISIBLE);
		c = (CityObj)mCitiesList[index + 1];
		name = ((TextView)rightClock.findViewById(R.id.city_name));
		name.setText(c.mCityName);
		dclock = (DigitalClock)(rightClock.findViewById(R.id.digital_clock));
		aclock = (AnalogClock)(rightClock.findViewById(R.id.analog_clock));
		nameDigital= ((TextView)rightClock.findViewById(R.id.city_name_digital));
		nameAnalog = ((TextView)rightClock.findViewById(R.id.city_name_analog));
		if (mClockStyle.equals("analog")) {
		name.setGravity(Gravity.CENTER_HORIZONTAL);
		nameAnalog.setText(c.mCityName);
		nameAnalog.setVisibility(View.VISIBLE);
		nameDigital.setVisibility(View.GONE);
		dclock.setVisibility(View.GONE);
		aclock.setVisibility(View.VISIBLE);
		aclock.setTimeZone(c.mTimeZone);
		aclock.enableSeconds(false);
		} else {
		name.setGravity(Gravity.LEFT);
		nameDigital.setText(c.mCityName);
		nameDigital.setVisibility(View.VISIBLE);
		nameAnalog.setVisibility(View.GONE);
		aclock.setVisibility(View.GONE);
		dclock.setVisibility(View.VISIBLE);
		dclock.setTimeZone(c.mTimeZone);