summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorRajesh Yengisetty <rajesh@cyngn.com>2015-02-19 02:10:33 +0000
committerRaj Yengisetty <rajesh@cyngn.com>2015-02-19 16:50:48 -0800
commitf4943c9cfb628d00fb3e4e67a183f50bc31e7165 (patch)
tree42c6d38cfe6326eb1e4c3d66e9ad2672011578f6 /src
parent816e426c8215ef04d591db4c309df4c6b054c4f8 (diff)
downloadandroid_packages_apps_Trebuchet-f4943c9cfb628d00fb3e4e67a183f50bc31e7165.tar.gz
android_packages_apps_Trebuchet-f4943c9cfb628d00fb3e4e67a183f50bc31e7165.tar.bz2
android_packages_apps_Trebuchet-f4943c9cfb628d00fb3e4e67a183f50bc31e7165.zip
Revert "Adding manage apps shortcut to Settings panel"stable/cm-12.0-YNG1I
This reverts commit cc342519488d50d2f59f514940de6cf02bd53ab2. Change-Id: I8f5c593f93c4706127d2c0473f59abcd74776e47
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/Launcher.java11
-rw-r--r--src/com/android/launcher3/OverviewSettingsPanel.java14
2 files changed, 1 insertions, 24 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 80781c642..5dfb68d6c 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -225,8 +225,6 @@ public class Launcher extends Activity
static final String FIRST_LOAD_COMPLETE = "launcher.first_load_complete";
static final String ACTION_FIRST_LOAD_COMPLETE =
"com.android.launcher3.action.FIRST_LOAD_COMPLETE";
- static final String ACTION_MANAGE_APPS=
- "android.settings.MANAGE_APPLICATIONS_SETTINGS";
private static final String TOOLBAR_ICON_METADATA_NAME = "com.android.launcher.toolbar_icon";
private static final String TOOLBAR_SEARCH_ICON_METADATA_NAME =
@@ -1430,15 +1428,6 @@ public class Launcher extends Activity
}
}
- protected void startManageApps() {
- Intent manageApps;
- manageApps= new Intent(ACTION_MANAGE_APPS);
- startActivity(manageApps);
- if (mWorkspace.isInOverviewMode()) {
- mWorkspace.exitOverviewMode(false);
- }
- }
-
public interface QSBScroller {
public void setScrollY(int scrollY);
}
diff --git a/src/com/android/launcher3/OverviewSettingsPanel.java b/src/com/android/launcher3/OverviewSettingsPanel.java
index e07c16e1d..2403d2344 100644
--- a/src/com/android/launcher3/OverviewSettingsPanel.java
+++ b/src/com/android/launcher3/OverviewSettingsPanel.java
@@ -90,6 +90,7 @@ public class OverviewSettingsPanel {
((SlidingUpPanelLayout) mOverviewPanel)
.setPanelSlideListener(new SettingsSimplePanelSlideListener());
+ //Quick Settings Buttons
View widgetButton = mLauncher.findViewById(R.id.widget_button);
widgetButton.setOnClickListener(new OnClickListener() {
@Override
@@ -108,7 +109,6 @@ public class OverviewSettingsPanel {
});
wallpaperButton.setOnTouchListener(mLauncher.getHapticFeedbackTouchListener());
- //Quick Settings Button
View settingsButton = mLauncher.findViewById(R.id.settings_button);
settingsButton.setOnClickListener(new OnClickListener() {
@Override
@@ -120,18 +120,6 @@ public class OverviewSettingsPanel {
});
settingsButton.setOnTouchListener(mLauncher.getHapticFeedbackTouchListener());
- //Manage Apps Button
- View manageAppsButton = mLauncher.findViewById(R.id.manage_apps_button);
- manageAppsButton.setOnClickListener(new OnClickListener() {
- @Override
- public void onClick(View arg0) {
- if (!mLauncher.getWorkspace().isSwitchingState()) {
- mLauncher.startManageApps();
- }
- }
- });
- manageAppsButton.setOnTouchListener(mLauncher.getHapticFeedbackTouchListener());
-
View defaultScreenButton = mLauncher.findViewById(R.id.default_screen_button);
defaultScreenButton.setOnClickListener(new OnClickListener() {
@Override