Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Add XML configuration for density"

Browse Source
This commit is contained in:
Marin Shalamanov
2021-11-24 12:40:19 +00:00
committed by Android (Google) Code Review
parent 5eedc93388 a822ccd755
commit 8a40b4bfe3
9 changed files with 517 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
core/java/android/content/res/Configuration.java
View File

@@ -2432,27 +2432,10 @@ public final class Configuration implements Parcelable, Comparable<Configuration
break;
}
switch (config.uiMode & Configuration.UI_MODE_TYPE_MASK) {
case Configuration.UI_MODE_TYPE_APPLIANCE:
parts.add("appliance");
break;
case Configuration.UI_MODE_TYPE_DESK:
parts.add("desk");
break;
case Configuration.UI_MODE_TYPE_TELEVISION:
parts.add("television");
break;
case Configuration.UI_MODE_TYPE_CAR:
parts.add("car");
break;
case Configuration.UI_MODE_TYPE_WATCH:
parts.add("watch");
break;
case Configuration.UI_MODE_TYPE_VR_HEADSET:
parts.add("vrheadset");
break;
default:
break;
final String uiModeTypeString =
getUiModeTypeString(config.uiMode & Configuration.UI_MODE_TYPE_MASK);
if (uiModeTypeString != null) {
parts.add(uiModeTypeString);
}
switch (config.uiMode & Configuration.UI_MODE_NIGHT_MASK) {
@@ -2586,6 +2569,28 @@ public final class Configuration implements Parcelable, Comparable<Configuration
return TextUtils.join("-", parts);
}
/**
* @hide
*/
public static String getUiModeTypeString(int uiModeType) {
switch (uiModeType) {
case Configuration.UI_MODE_TYPE_APPLIANCE:
return "appliance";
case Configuration.UI_MODE_TYPE_DESK:
return "desk";
case Configuration.UI_MODE_TYPE_TELEVISION:
return "television";
case Configuration.UI_MODE_TYPE_CAR:
return "car";
case Configuration.UI_MODE_TYPE_WATCH:
return "watch";
case Configuration.UI_MODE_TYPE_VR_HEADSET:
return "vrheadset";
default:
return null;
}
}
/**
* Generate a delta Configuration between <code>base</code> and <code>change</code>. The
* resulting delta can be used with {@link #updateFrom(Configuration)}.