summaryrefslogtreecommitdiffstats
path: root/res
diff options
context:
space:
mode:
authorDylan Phan <lerp@google.com>2015-12-01 21:27:00 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2015-12-01 21:27:00 +0000
commit018633c6ded36403c9d3eb112e98b1a729d1cf41 (patch)
tree1b5a0397b714aa46df482145a29fa40e2b35f533 /res
parentd520063155f78c7eac5142e5e9fec49c46e102dd (diff)
parent67e0226f0e4e9e8a8d532428c5852e1d0c93f7b7 (diff)
downloadandroid_packages_apps_DeskClock-018633c6ded36403c9d3eb112e98b1a729d1cf41.tar.gz
android_packages_apps_DeskClock-018633c6ded36403c9d3eb112e98b1a729d1cf41.tar.bz2
android_packages_apps_DeskClock-018633c6ded36403c9d3eb112e98b1a729d1cf41.zip
Merge "Make analog widget 2x2" into ub-deskclock-dazzle
Diffstat (limited to 'res')
-rw-r--r--res/values-sw600dp/dimens.xml2
-rw-r--r--res/values/dimens.xml2
-rw-r--r--res/xml/analog_appwidget.xml4
3 files changed, 6 insertions, 2 deletions
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index d3c9f9061..efb20fb19 100644
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -87,6 +87,8 @@
<dimen name="world_clock_analog_size">200dip</dimen>
<dimen name="world_clock_margin">96dp</dimen>
+ <dimen name="min_analog_widget_size">170dp</dimen>
+
<!-- Digital Widget settings (keyguard|home_screen) -->
<!-- Use larger fonts -->
<!-- Use dp on purpose to ensure consistency across multiple screen sizes -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index a1ecaef47..4184cbc17 100644
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -164,6 +164,8 @@
<dimen name="widget_big_time_margin_right">10dip</dimen>
<dimen name="widget_medium_time_margin_right">5dip</dimen>
+ <dimen name="min_analog_widget_size">110dp</dimen>
+
<!-- width/height of layout/digital_widget_time -->
<dimen name="min_digital_widget_width">206dip</dimen>
<dimen name="min_digital_widget_resize_width">136dip</dimen>
diff --git a/res/xml/analog_appwidget.xml b/res/xml/analog_appwidget.xml
index f7bba5b73..e6f614455 100644
--- a/res/xml/analog_appwidget.xml
+++ b/res/xml/analog_appwidget.xml
@@ -16,10 +16,10 @@
<appwidget-provider xmlns:android="http://schemas.android.com/apk/res/android"
android:initialLayout="@layout/analog_appwidget"
- android:minHeight="110dp"
+ android:minHeight="@dimen/min_analog_widget_size"
android:minResizeHeight="55dp"
android:minResizeWidth="55dp"
- android:minWidth="110dp"
+ android:minWidth="@dimen/min_analog_widget_size"
android:previewImage="@drawable/appwidget_analog_clock_preview"
android:resizeMode="horizontal|vertical"
android:updatePeriodMillis="0" />