diff options
| author | RoboErik <epastern@google.com> | 2011-07-15 14:42:53 -0700 |
|---|---|---|
| committer | RoboErik <epastern@google.com> | 2011-07-15 14:43:44 -0700 |
| commit | ea3c818ab4592c2e429944c13a06324bfda84ee8 (patch) | |
| tree | df9c636003b751b65c2cc7b3da1db42087537c04 | |
| parent | b5e3c17201b2c08ca9f3fd33f4585e1ec8fa71b1 (diff) | |
| download | android_packages_apps_Calendar-ea3c818ab4592c2e429944c13a06324bfda84ee8.tar.gz android_packages_apps_Calendar-ea3c818ab4592c2e429944c13a06324bfda84ee8.tar.bz2 android_packages_apps_Calendar-ea3c818ab4592c2e429944c13a06324bfda84ee8.zip | |
b/4985245 Fix widget layout on phones
The date was too big to fit in the standard 2x2 layout for phones.
Change-Id: Ibaf9aec267229ac6a5dd9b55009f72387ca4adaa
| -rw-r--r-- | res/layout/appwidget.xml | 15 | ||||
| -rw-r--r-- | res/values-xlarge/dimens.xml | 2 | ||||
| -rw-r--r-- | res/values/dimens.xml | 2 | ||||
| -rw-r--r-- | res/values/styles.xml | 6 |
4 files changed, 12 insertions, 13 deletions
diff --git a/res/layout/appwidget.xml b/res/layout/appwidget.xml index 7bcb6425..afb5d743 100644 --- a/res/layout/appwidget.xml +++ b/res/layout/appwidget.xml @@ -36,7 +36,7 @@ android:layout_height="42dip" android:layout_marginLeft="3dip" android:layout_marginRight="3dip" - android:paddingLeft="16dip" + android:paddingLeft="8dip" android:orientation="horizontal" android:background="@drawable/appwidget_header_selector"> <LinearLayout @@ -58,17 +58,14 @@ style="@style/WidgetMonthStyle" /> </LinearLayout> - <FrameLayout + <TextView android:layout_width="0dip" android:layout_height="wrap_content" android:layout_weight="1" - android:layout_gravity="center_vertical|left" - android:layout_toRightOf="@id/holder"> - <TextView - android:id="@+id/day_of_month" - android:textColor="@color/appwidget_date" - style="@style/WidgetDayStyle" /> - </FrameLayout> + android:gravity="center_vertical|left" + android:id="@+id/day_of_month" + android:textColor="@color/appwidget_date" + style="@style/WidgetDayStyle" /> <ImageButton android:id="@+id/new_event_button" diff --git a/res/values-xlarge/dimens.xml b/res/values-xlarge/dimens.xml index 9dc7c884..5c13c583 100644 --- a/res/values-xlarge/dimens.xml +++ b/res/values-xlarge/dimens.xml @@ -31,4 +31,6 @@ <dimen name="hours_right_margin">4dip</dimen> <!-- size of day header in day and week views --> <dimen name="day_header_height">45dip</dimen> + <dimen name="widget_day_num_size">42sp</dimen> + <dimen name="widget_day_num_top_padding">-8dip</dimen> </resources> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index cdab3ed6..b09168a4 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -31,4 +31,6 @@ <dimen name="hours_right_margin">4dip</dimen> <!-- size of day header in day and week views --> <dimen name="day_header_height">16dip</dimen> + <dimen name="widget_day_num_size">36sp</dimen> + <dimen name="widget_day_num_top_padding">-4dip</dimen> </resources> diff --git a/res/values/styles.xml b/res/values/styles.xml index e860eb5f..258a5a24 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -195,10 +195,8 @@ <style name="WidgetDayStyle"> <item name="android:layout_width">wrap_content</item> <item name="android:layout_height">wrap_content</item> - <item name="android:layout_gravity">center_vertical|left</item> - <item name="android:gravity">center_vertical|left</item> - <item name="android:layout_marginTop">-9dip</item> - <item name="android:textSize">46sp</item> + <item name="android:textSize">@dimen/widget_day_num_size</item> + <item name="android:layout_marginTop">@dimen/widget_day_num_top_padding</item> <item name="android:singleLine">true</item> </style> |