diff options
| author | Dianne Hackborn <hackbod@google.com> | 2014-10-08 22:48:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-10-08 22:48:44 +0000 |
| commit | 529b78941c20c2b45312eeedbd509d0ded4f7323 (patch) | |
| tree | 1aff9a9aac271e48dec04cb986c5cadc5f4105e9 /policy/src | |
| parent | 511925c9e143ebc6eeb0efdf433cc0519b5e5eb1 (diff) | |
| parent | 89b196958fee07475765bd3c458098464ba16f2e (diff) | |
| download | frameworks_base-529b78941c20c2b45312eeedbd509d0ded4f7323.zip frameworks_base-529b78941c20c2b45312eeedbd509d0ded4f7323.tar.gz frameworks_base-529b78941c20c2b45312eeedbd509d0ded4f7323.tar.bz2 | |
am 89b19695: Merge "Put in real "code" (aka marketing) name." into lmp-dev
* commit '89b196958fee07475765bd3c458098464ba16f2e':
Put in real "code" (aka marketing) name.
Diffstat (limited to 'policy/src')
| -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); |