Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 993c3d79: Merge "Fixing typos" into jb-mr1-dev

Browse Source 
* commit '993c3d79a3f70684db5c75fb760bae9b0324f715':
  Fixing typos
This commit is contained in:
Adam Cohen
2012-09-24 09:27:13 -07:00
committed by Android Git Automerger
parent 56be4dd85f 993c3d79a3
commit a035cdac93
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
services/java/com/android/server/AppWidgetServiceImpl.java
View File

@@ -1627,22 +1627,22 @@ class AppWidgetServiceImpl {
Integer.parseInt(minWidthString, 16)); Integer.parseInt(minWidthString, 16));
} }
String minHeightString = parser.getAttributeValue(null, "min_height"); String minHeightString = parser.getAttributeValue(null, "min_height");
if (minWidthString != null) { if (minHeightString != null) {
options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT, options.putInt(AppWidgetManager.OPTION_APPWIDGET_MIN_HEIGHT,
Integer.parseInt(minHeightString, 16)); Integer.parseInt(minHeightString, 16));
} }
String maxWidthString = parser.getAttributeValue(null, "max_height"); String maxWidthString = parser.getAttributeValue(null, "max_width");
if (minWidthString != null) { if (maxWidthString != null) {
options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH, options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_WIDTH,
Integer.parseInt(maxWidthString, 16)); Integer.parseInt(maxWidthString, 16));
} }
String maxHeightString = parser.getAttributeValue(null, "max_height"); String maxHeightString = parser.getAttributeValue(null, "max_height");
if (minWidthString != null) { if (maxHeightString != null) {
options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT, options.putInt(AppWidgetManager.OPTION_APPWIDGET_MAX_HEIGHT,
Integer.parseInt(maxHeightString, 16)); Integer.parseInt(maxHeightString, 16));
} }
String categoryString = parser.getAttributeValue(null, "host_category"); String categoryString = parser.getAttributeValue(null, "host_category");
if (minWidthString != null) { if (categoryString != null) {
options.putInt(AppWidgetManager.OPTION_APPWIDGET_HOST_CATEGORY, options.putInt(AppWidgetManager.OPTION_APPWIDGET_HOST_CATEGORY,
Integer.parseInt(categoryString, 16)); Integer.parseInt(categoryString, 16));
} }