summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornebkat <nebkat@gmail.com>2013-03-06 14:32:18 -0800
committerGerrit Code Review <gerrit@cyanogenmod.org>2013-03-06 14:32:18 -0800
commit01a434b14bf61cccdc65394959048d818afc0352 (patch)
tree2b23daa1cf453adb67066a8819350378a40b3e1b
parent919296825af7c9028eac0f9c0be6d6c9fbda2184 (diff)
downloadandroid_packages_apps_Trebuchet-01a434b14bf61cccdc65394959048d818afc0352.tar.gz
android_packages_apps_Trebuchet-01a434b14bf61cccdc65394959048d818afc0352.tar.bz2
android_packages_apps_Trebuchet-01a434b14bf61cccdc65394959048d818afc0352.zip
Revert "Fix overflow visibility logic"
This reverts commit 919296825af7c9028eac0f9c0be6d6c9fbda2184 Change-Id: Iba8cdc0f6d1023b12b7873314df13154f2cf265d
-rw-r--r--src/com/cyanogenmod/trebuchet/Launcher.java4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/com/cyanogenmod/trebuchet/Launcher.java b/src/com/cyanogenmod/trebuchet/Launcher.java
index 8563cd1e3..b1c1425dc 100644
--- a/src/com/cyanogenmod/trebuchet/Launcher.java
+++ b/src/com/cyanogenmod/trebuchet/Launcher.java
@@ -3456,8 +3456,8 @@ public final class Launcher extends Activity
ActivityInfo defaultLauncher = getPackageManager().resolveActivity(launcherIntent, PackageManager.MATCH_DEFAULT_ONLY).activityInfo;
// Hide preferences if not on CyanogenMod or not default launcher
// (in which case preferences don't get shown in system settings)
- boolean preferencesVisible = getPackageManager().hasSystemFeature("com.cyanogenmod.android") ||
- defaultLauncher.packageName.equals(getClass().getPackage().getName());
+ boolean preferencesVisible = !getPackageManager().hasSystemFeature("com.cyanogenmod.android") ||
+ !defaultLauncher.packageName.equals(getClass().getPackage().getName());
boolean disabled = ViewConfiguration.get(this).hasPermanentMenuKey() || !preferencesVisible;
overflowMenuButton.setVisibility(disabled ? View.GONE : View.VISIBLE);