diff options
| author | Xavier Ducrohet <xav@google.com> | 2015-08-14 17:53:40 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-08-14 17:53:40 +0000 |
| commit | f0f6010b332377ff6695b60ec8c90a9898676b45 (patch) | |
| tree | cb343bd705f9b5e49aa2ac396227a5caee1d2cef | |
| parent | a2a257f527df3b3abd782bfaaadbcf8426a9d98b (diff) | |
| parent | 286a28930225bb321bafbd5d46cec0616aaa4561 (diff) | |
| download | qemu-studio-1.3-dev.tar.gz | |
Merge "Add emulator support for 420 dpi" into studio-1.3-devstudio-1.3-dev
| -rw-r--r-- | android/hw-lcd.c | 4 | ||||
| -rw-r--r-- | android/hw-lcd.h | 1 |
2 files changed, 4 insertions, 1 deletions
diff --git a/android/hw-lcd.c b/android/hw-lcd.c index 26c16eeaea..644da02483 100644 --- a/android/hw-lcd.c +++ b/android/hw-lcd.c @@ -35,8 +35,10 @@ hwLcd_setBootProperty(int density) density = LCD_DENSITY_XHDPI; else if (density < (LCD_DENSITY_360DPI + LCD_DENSITY_400DPI)/2) density = LCD_DENSITY_360DPI; - else if (density < (LCD_DENSITY_400DPI + LCD_DENSITY_XXHDPI)/2) + else if (density < (LCD_DENSITY_400DPI + LCD_DENSITY_420DPI)/2) density = LCD_DENSITY_400DPI; + else if (density < (LCD_DENSITY_420DPI + LCD_DENSITY_XXHDPI)/2) + density = LCD_DENSITY_420DPI; else if (density < (LCD_DENSITY_XXHDPI + LCD_DENSITY_XXXHDPI)/2) density = LCD_DENSITY_XXHDPI; else diff --git a/android/hw-lcd.h b/android/hw-lcd.h index 24d1fe9408..e39c1e216a 100644 --- a/android/hw-lcd.h +++ b/android/hw-lcd.h @@ -20,6 +20,7 @@ #define LCD_DENSITY_XHDPI 320 #define LCD_DENSITY_360DPI 360 #define LCD_DENSITY_400DPI 400 +#define LCD_DENSITY_420DPI 420 #define LCD_DENSITY_XXHDPI 480 #define LCD_DENSITY_XXXHDPI 640 |