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

Merge "Fix issue #3122240: Expose xlarge in GB." into gingerbread

Browse Source
This commit is contained in:
Dianne Hackborn
2010-10-22 14:01:25 -07:00
committed by Android (Google) Code Review
parent 40763914e3 5383f502e4
commit 38993d8d83
5 changed files with 18 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
api/current.xml
View File

@@ -18536,17 +18536,6 @@
visibility="public"
>
</field>
<field name="IMPORTANCE_HEAVY_WEIGHT"
type="int"
transient="false"
volatile="false"
value="170"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="IMPORTANCE_PERCEPTIBLE"
type="int"
transient="false"
@@ -49296,6 +49285,17 @@
visibility="public"
>
</field>
<field name="SCREENLAYOUT_SIZE_XLARGE"
type="int"
transient="false"
volatile="false"
value="4"
static="true"
final="true"
deprecated="not deprecated"
visibility="public"
>
</field>
<field name="TOUCHSCREEN_FINGER"
type="int"
transient="false"

8
core/java/android/app/ActivityManager.java
View File

@@ -797,10 +797,12 @@ public class ActivityManager {
public static final int IMPORTANCE_PERCEPTIBLE = 130;
/**
* Constant for {@link #importance}: this process is running a
* heavy-weight application and thus should not be killed.
* Constant for {@link #importance}: this process is running an
* application that can not save its state, and thus can't be killed
* while in the background.
* @hide
*/
public static final int IMPORTANCE_HEAVY_WEIGHT = 170;
public static final int IMPORTANCE_CANT_SAVE_STATE = 170;
/**
* Constant for {@link #importance}: this process is contains services

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

@@ -62,7 +62,6 @@ public final class Configuration implements Parcelable, Comparable<Configuration
public static final int SCREENLAYOUT_SIZE_SMALL = 0x01;
public static final int SCREENLAYOUT_SIZE_NORMAL = 0x02;
public static final int SCREENLAYOUT_SIZE_LARGE = 0x03;
/** @hide */
public static final int SCREENLAYOUT_SIZE_XLARGE = 0x04;
public static final int SCREENLAYOUT_LONG_MASK = 0x30;

10
core/java/android/os/Build.java
View File

@@ -188,15 +188,7 @@ public class Build {
public static final int FROYO = 8;
/**
* Next version of Android.
*
* <p>Applications targeting this or a later release will get these
* new changes in behavior:</p>
* <ul>
* <li> The status bar is now dark. Targeting this version allows
* the platform to perform performing compatibility on status bar
* graphics to ensure they look okay on a dark background.
* </ul>
* Newest version of Android, version 2.3.
*/
public static final int GINGERBREAD = 9;
}

2
services/java/com/android/server/am/ActivityManagerService.java
View File

@@ -7051,7 +7051,7 @@ public final class ActivityManagerService extends ActivityManagerNative
} else if (adj >= SECONDARY_SERVER_ADJ) {
currApp.importance = ActivityManager.RunningAppProcessInfo.IMPORTANCE_SERVICE;
} else if (adj >= HEAVY_WEIGHT_APP_ADJ) {
currApp.importance = ActivityManager.RunningAppProcessInfo.IMPORTANCE_HEAVY_WEIGHT;
currApp.importance = ActivityManager.RunningAppProcessInfo.IMPORTANCE_CANT_SAVE_STATE;
} else if (adj >= PERCEPTIBLE_APP_ADJ) {
currApp.importance = ActivityManager.RunningAppProcessInfo.IMPORTANCE_PERCEPTIBLE;
} else if (adj >= VISIBLE_APP_ADJ) {