diff options
author | Adam Cohen <adamcohen@google.com> | 2011-07-19 18:43:57 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-07-19 18:43:57 -0700 |
commit | cf4cfc6fc88f204e2e496e37337f7e70809bbf6f (patch) | |
tree | 4f77455bed26477fcb5ce415f7cca678936d32ec /services | |
parent | 59f13c7dfb3cb38f03b7cc207d8e381f6274bfef (diff) | |
parent | 1bfaf561b7c09388311f1834f17e057739cf587a (diff) | |
download | frameworks_base-cf4cfc6fc88f204e2e496e37337f7e70809bbf6f.zip frameworks_base-cf4cfc6fc88f204e2e496e37337f7e70809bbf6f.tar.gz frameworks_base-cf4cfc6fc88f204e2e496e37337f7e70809bbf6f.tar.bz2 |
Merge "Adding resizeMinWidth/Height to AppWidgetProviderInfo"
Diffstat (limited to 'services')
-rw-r--r-- | services/java/com/android/server/AppWidgetService.java | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/services/java/com/android/server/AppWidgetService.java b/services/java/com/android/server/AppWidgetService.java index 0b15221..438883e 100644 --- a/services/java/com/android/server/AppWidgetService.java +++ b/services/java/com/android/server/AppWidgetService.java @@ -1022,6 +1022,12 @@ class AppWidgetService extends IAppWidgetService.Stub info.minWidth = value != null ? value.data : 0; value = sa.peekValue(com.android.internal.R.styleable.AppWidgetProviderInfo_minHeight); info.minHeight = value != null ? value.data : 0; + value = sa.peekValue( + com.android.internal.R.styleable.AppWidgetProviderInfo_minResizeWidth); + info.minResizeWidth = value != null ? value.data : info.minWidth; + value = sa.peekValue( + com.android.internal.R.styleable.AppWidgetProviderInfo_minResizeHeight); + info.minResizeHeight = value != null ? value.data : info.minHeight; info.updatePeriodMillis = sa.getInt( com.android.internal.R.styleable.AppWidgetProviderInfo_updatePeriodMillis, 0); |