Merge "Add xxhdpi; fix ActivityManager.getLauncherLargeIconSize() etc."

This commit is contained in:
Dianne Hackborn 2012-01-25 16:15:43 -08:00 committed by Android (Google) Code Review
commit df0a4caa24

View File

@ -843,6 +843,8 @@ struct ResTable_config
DENSITY_MEDIUM = ACONFIGURATION_DENSITY_MEDIUM, DENSITY_MEDIUM = ACONFIGURATION_DENSITY_MEDIUM,
DENSITY_TV = ACONFIGURATION_DENSITY_TV, DENSITY_TV = ACONFIGURATION_DENSITY_TV,
DENSITY_HIGH = ACONFIGURATION_DENSITY_HIGH, DENSITY_HIGH = ACONFIGURATION_DENSITY_HIGH,
DENSITY_XHIGH = ACONFIGURATION_DENSITY_XHIGH,
DENSITY_XXHIGH = ACONFIGURATION_DENSITY_XXHIGH,
DENSITY_NONE = ACONFIGURATION_DENSITY_NONE DENSITY_NONE = ACONFIGURATION_DENSITY_NONE
}; };