From 2b9785aa65abdb1b38270c51ac34240462aecf65 Mon Sep 17 00:00:00 2001 From: Tobias Haamel Date: Thu, 30 Sep 2010 10:57:24 +0200 Subject: Fix night/notnight resource folder handling. The values for NIGHT_NO / NIGHT_YES are shifted later on in the ResourceTypes header file to match with the ones specified in the Configuration class file. This is basically the same as it's done for the SCREEN_LONG_NO / SCREEN_LONG_YES constants. Since the values are also masked later on by 0x30 (MASK_UI_MODE_NIGHT) the system currently recognizes resources specified in night/notnight folders as if they were resources which can be used for any of both modes. This results in an error saying that the resources are already specified somewhere else. Should fix: http://b/issue?id=3022577 Change-Id: I554b37231ea4c69a8625e519150473fddce7d8ed --- native/include/android/configuration.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'native/include') diff --git a/native/include/android/configuration.h b/native/include/android/configuration.h index 79b9b1e..99e8f97 100644 --- a/native/include/android/configuration.h +++ b/native/include/android/configuration.h @@ -79,8 +79,8 @@ enum { ACONFIGURATION_UI_MODE_TYPE_CAR = 0x03, ACONFIGURATION_UI_MODE_NIGHT_ANY = 0x00, - ACONFIGURATION_UI_MODE_NIGHT_NO = 0x10, - ACONFIGURATION_UI_MODE_NIGHT_YES = 0x20, + ACONFIGURATION_UI_MODE_NIGHT_NO = 0x1, + ACONFIGURATION_UI_MODE_NIGHT_YES = 0x2, ACONFIGURATION_MCC = 0x0001, ACONFIGURATION_MNC = 0x0002, -- cgit v1.1