diff options
| author | Tobias Haamel <haamel@google.com> | 2010-09-30 10:57:24 +0200 |
|---|---|---|
| committer | Tobias Haamel <haamel@google.com> | 2010-09-30 11:26:02 +0200 |
| commit | 2b9785aa65abdb1b38270c51ac34240462aecf65 (patch) | |
| tree | bcb75c6fff5ad0742de84aabeb388d8fd0b33147 /native/include/android | |
| parent | 2cbb56f961e4893a3bf7ded560d4bdbf45eabd01 (diff) | |
| download | frameworks_base-2b9785aa65abdb1b38270c51ac34240462aecf65.zip frameworks_base-2b9785aa65abdb1b38270c51ac34240462aecf65.tar.gz frameworks_base-2b9785aa65abdb1b38270c51ac34240462aecf65.tar.bz2 | |
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
Diffstat (limited to 'native/include/android')
| -rw-r--r-- | native/include/android/configuration.h | 4 |
1 files changed, 2 insertions, 2 deletions
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, |