ADHOC
/
replicant-frameworks_native
3
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge commit '217a04ba' into manualmerge 

Change-Id: I526cf2be7949fa52ce0f70f9a1f671669140679a
This commit is contained in:
Adam Lesinski 2015-05-18 15:19:30 -07:00
parent f37f29b97f 217a04bab4
commit 5f1dfc11b4
1 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
include/android/configuration.h
View File

@ -261,6 +261,10 @@ enum {
*/ */
ACONFIGURATION_SCREENLONG_YES = 0x2, ACONFIGURATION_SCREENLONG_YES = 0x2,
ACONFIGURATION_SCREENROUND_ANY = 0x00,
ACONFIGURATION_SCREENROUND_NO = 0x1,
ACONFIGURATION_SCREENROUND_YES = 0x2,
/** UI mode: not specified. */ /** UI mode: not specified. */
ACONFIGURATION_UI_MODE_TYPE_ANY = 0x00, ACONFIGURATION_UI_MODE_TYPE_ANY = 0x00,
/** /**
@ -418,6 +422,7 @@ enum {
* configuration. * configuration.
*/ */
ACONFIGURATION_LAYOUTDIR = 0x4000, ACONFIGURATION_LAYOUTDIR = 0x4000,
ACONFIGURATION_SCREEN_ROUND = 0x8000,
/** /**
* Constant used to to represent MNC (Mobile Network Code) zero. * Constant used to to represent MNC (Mobile Network Code) zero.
* 0 cannot be used, since it is used to represent an undefined MNC. * 0 cannot be used, since it is used to represent an undefined MNC.
@ -593,6 +598,16 @@ int32_t AConfiguration_getScreenLong(AConfiguration* config);
*/ */
void AConfiguration_setScreenLong(AConfiguration* config, int32_t screenLong); void AConfiguration_setScreenLong(AConfiguration* config, int32_t screenLong);
/**
* Return the current ACONFIGURATION_SCREENROUND_* set in the configuration.
*/
int32_t AConfiguration_getScreenRound(AConfiguration* config);
/**
* Set the current screen round in the configuration.
*/
void AConfiguration_setScreenRound(AConfiguration* config, int32_t screenRound);
/** /**
* Return the current ACONFIGURATION_UI_MODE_TYPE_* set in the configuration. * Return the current ACONFIGURATION_UI_MODE_TYPE_* set in the configuration.
*/ */