Merge "Add support for xhdpi when injecting a skin dpi into the emulator."
diff --git a/android/hw-lcd.c b/android/hw-lcd.c
index 2c06d69..f84f661 100644
--- a/android/hw-lcd.c
+++ b/android/hw-lcd.c
@@ -19,12 +19,14 @@
char temp[8];
/* map density to one of our three values for now */
- if (density < (LCD_DENSITY_MIN + LCD_DENSITY_DEFAULT)/2)
- density = LCD_DENSITY_MIN;
- else if (density < (LCD_DENSITY_DEFAULT + LCD_DENSITY_MAX)/2)
- density = LCD_DENSITY_DEFAULT;
+ if (density < (LCD_DENSITY_LDPI + LCD_DENSITY_MDPI)/2)
+ density = LCD_DENSITY_LDPI;
+ else if (density < (LCD_DENSITY_MDPI + LCD_DENSITY_HDPI)/2)
+ density = LCD_DENSITY_MDPI;
+ else if (density < (LCD_DENSITY_HDPI + LCD_DENSITY_XHDPI)/2)
+ density = LCD_DENSITY_HDPI;
else
- density = LCD_DENSITY_MAX;
+ density = LCD_DENSITY_XHDPI;
snprintf(temp, sizeof temp, "%d", density);
boot_property_add("qemu.sf.lcd_density", temp);
diff --git a/android/hw-lcd.h b/android/hw-lcd.h
index b9fdb72..c902b13 100644
--- a/android/hw-lcd.h
+++ b/android/hw-lcd.h
@@ -12,9 +12,10 @@
#ifndef _ANDROID_HW_LCD_H
#define _ANDROID_HW_LCD_H
-#define LCD_DENSITY_MIN 120
-#define LCD_DENSITY_DEFAULT 160
-#define LCD_DENSITY_MAX 240
+#define LCD_DENSITY_LDPI 120
+#define LCD_DENSITY_MDPI 160
+#define LCD_DENSITY_HDPI 240
+#define LCD_DENSITY_XHDPI 320
/* Sets the boot property corresponding to the emulated abstract LCD density */
extern void hwLcd_setBootProperty(int density);