diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-10-09 13:16:40 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-09 13:16:40 +0000 |
| commit | 36ae48a850bade17d485cb49dd40a3f11f667ad4 (patch) | |
| tree | 4ae798660a3856c96d0db25e08f415af09d671ab /policy | |
| parent | d8497e45c72fbb27961d096499984906af19d35f (diff) | |
| parent | d83e9e42805e340384f30199777fbc472c5c6f20 (diff) | |
| download | frameworks_base-36ae48a850bade17d485cb49dd40a3f11f667ad4.zip frameworks_base-36ae48a850bade17d485cb49dd40a3f11f667ad4.tar.gz frameworks_base-36ae48a850bade17d485cb49dd40a3f11f667ad4.tar.bz2 | |
am d83e9e42: am 0761b1b5: am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev
* commit 'd83e9e42805e340384f30199777fbc472c5c6f20':
Put in real "code" (aka marketing) name.
Diffstat (limited to 'policy')
| -rw-r--r-- | policy/src/com/android/internal/policy/impl/PhoneWindow.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/policy/src/com/android/internal/policy/impl/PhoneWindow.java b/policy/src/com/android/internal/policy/impl/PhoneWindow.java index 5f3b877..e9a114a 100644 --- a/policy/src/com/android/internal/policy/impl/PhoneWindow.java +++ b/policy/src/com/android/internal/policy/impl/PhoneWindow.java @@ -3334,7 +3334,7 @@ public class PhoneWindow extends Window implements MenuBuilder.Callback { final int targetSdk = context.getApplicationInfo().targetSdkVersion; final boolean targetPreHoneycomb = targetSdk < android.os.Build.VERSION_CODES.HONEYCOMB; final boolean targetPreIcs = targetSdk < android.os.Build.VERSION_CODES.ICE_CREAM_SANDWICH; - final boolean targetPreL = targetSdk < android.os.Build.VERSION_CODES.L; + final boolean targetPreL = targetSdk < android.os.Build.VERSION_CODES.LOLLIPOP; final boolean targetHcNeedsOptions = context.getResources().getBoolean( R.bool.target_honeycomb_needs_options_menu); final boolean noActionBar = !hasFeature(FEATURE_ACTION_BAR) || hasFeature(FEATURE_NO_TITLE); |