diff options
| author | George Mount <mount@google.com> | 2014-09-11 21:54:12 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-11 21:54:13 +0000 |
| commit | db352c783575afee2d6bc29baf45c83d5fc421cf (patch) | |
| tree | f4147eac22d928f0be27590ed583840290eec47a /api | |
| parent | 784ab49b6e36aa15ce6a00dfbba6215a7991fce3 (diff) | |
| parent | 9826f636ad4fe3714d60972acd918e09eb44d971 (diff) | |
| download | frameworks_base-db352c783575afee2d6bc29baf45c83d5fc421cf.zip frameworks_base-db352c783575afee2d6bc29baf45c83d5fc421cf.tar.gz frameworks_base-db352c783575afee2d6bc29baf45c83d5fc421cf.tar.bz2 | |
Merge "Have Activity Transitions activited by a new window attribute." into lmp-dev
Diffstat (limited to 'api')
| -rw-r--r-- | api/current.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/api/current.txt b/api/current.txt index b06951f..82aad79 100644 --- a/api/current.txt +++ b/api/current.txt @@ -1429,6 +1429,7 @@ package android { field public static final int windowActionBar = 16843469; // 0x10102cd field public static final int windowActionBarOverlay = 16843492; // 0x10102e4 field public static final int windowActionModeOverlay = 16843485; // 0x10102dd + field public static final int windowActivityTransitions = 16843982; // 0x10104ce field public static final int windowAllowEnterTransitionOverlap = 16843836; // 0x101043c field public static final int windowAllowReturnTransitionOverlap = 16843835; // 0x101043b field public static final int windowAnimationStyle = 16842926; // 0x10100ae @@ -34878,6 +34879,7 @@ package android.view { field public static final int FEATURE_ACTION_BAR = 8; // 0x8 field public static final int FEATURE_ACTION_BAR_OVERLAY = 9; // 0x9 field public static final int FEATURE_ACTION_MODE_OVERLAY = 10; // 0xa + field public static final int FEATURE_ACTIVITY_TRANSITIONS = 13; // 0xd field public static final int FEATURE_CONTENT_TRANSITIONS = 12; // 0xc field public static final int FEATURE_CONTEXT_MENU = 6; // 0x6 field public static final int FEATURE_CUSTOM_TITLE = 7; // 0x7 |