summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2014-10-09 19:29:33 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-10-09 19:29:33 +0000
commit8541206e6bbc08f5e5bc7d545fcdce38ff853f8e (patch)
tree33d4a1e35fad4ae705882b9a63297b82fbacf38e /src/com
parent95dda800a988c1ca778dae08563b6875c30d089a (diff)
parenta4204bde454bbac665c7c1302056c9a64f76ffb1 (diff)
downloadpackages_apps_Settings-8541206e6bbc08f5e5bc7d545fcdce38ff853f8e.zip
packages_apps_Settings-8541206e6bbc08f5e5bc7d545fcdce38ff853f8e.tar.gz
packages_apps_Settings-8541206e6bbc08f5e5bc7d545fcdce38ff853f8e.tar.bz2
am a4204bde: Merge "Update to use "real" L codename." into lmp-dev
* commit 'a4204bde454bbac665c7c1302056c9a64f76ffb1': Update to use "real" L codename.
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/settings/HomeSettings.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/com/android/settings/HomeSettings.java b/src/com/android/settings/HomeSettings.java
index cd60091..6da1848 100644
--- a/src/com/android/settings/HomeSettings.java
+++ b/src/com/android/settings/HomeSettings.java
@@ -48,7 +48,6 @@ import android.preference.PreferenceGroup;
import android.text.TextUtils;
import android.util.Log;
import android.view.View;
-import android.view.ViewGroup;
import android.view.View.OnClickListener;
import android.widget.ImageView;
import android.widget.RadioButton;
@@ -250,7 +249,7 @@ public class HomeSettings extends SettingsPreferenceFragment implements Indexabl
}
private boolean versionNumberAtLeastL(int versionNumber) {
- return versionNumber >= Build.VERSION_CODES.L;
+ return versionNumber >= Build.VERSION_CODES.LOLLIPOP;
}
@Override