From f4943c9cfb628d00fb3e4e67a183f50bc31e7165 Mon Sep 17 00:00:00 2001 From: Rajesh Yengisetty Date: Thu, 19 Feb 2015 02:10:33 +0000 Subject: Revert "Adding manage apps shortcut to Settings panel" This reverts commit cc342519488d50d2f59f514940de6cf02bd53ab2. Change-Id: I8f5c593f93c4706127d2c0473f59abcd74776e47 --- res/drawable-hdpi/ic_apps.png | Bin 509 -> 0 bytes res/drawable-hdpi/ic_apps_pressed.png | Bin 503 -> 0 bytes res/drawable-mdpi/ic_apps.png | Bin 334 -> 0 bytes res/drawable-mdpi/ic_apps_pressed.png | Bin 357 -> 0 bytes res/drawable-xhdpi/ic_apps.png | Bin 512 -> 0 bytes res/drawable-xhdpi/ic_apps_pressed.png | Bin 508 -> 0 bytes res/drawable-xxhdpi/ic_apps.png | Bin 803 -> 0 bytes res/drawable-xxhdpi/ic_apps_pressed.png | Bin 776 -> 0 bytes res/drawable/manage_apps_button.xml | 21 --------------------- res/layout/settings_pane.xml | 9 --------- res/values/strings.xml | 2 -- src/com/android/launcher3/Launcher.java | 11 ----------- .../android/launcher3/OverviewSettingsPanel.java | 14 +------------- 13 files changed, 1 insertion(+), 56 deletions(-) delete mode 100644 res/drawable-hdpi/ic_apps.png delete mode 100644 res/drawable-hdpi/ic_apps_pressed.png delete mode 100644 res/drawable-mdpi/ic_apps.png delete mode 100644 res/drawable-mdpi/ic_apps_pressed.png delete mode 100644 res/drawable-xhdpi/ic_apps.png delete mode 100644 res/drawable-xhdpi/ic_apps_pressed.png delete mode 100644 res/drawable-xxhdpi/ic_apps.png delete mode 100644 res/drawable-xxhdpi/ic_apps_pressed.png delete mode 100644 res/drawable/manage_apps_button.xml diff --git a/res/drawable-hdpi/ic_apps.png b/res/drawable-hdpi/ic_apps.png deleted file mode 100644 index 6da41f6b3..000000000 Binary files a/res/drawable-hdpi/ic_apps.png and /dev/null differ diff --git a/res/drawable-hdpi/ic_apps_pressed.png b/res/drawable-hdpi/ic_apps_pressed.png deleted file mode 100644 index d4717ff85..000000000 Binary files a/res/drawable-hdpi/ic_apps_pressed.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_apps.png b/res/drawable-mdpi/ic_apps.png deleted file mode 100644 index 608acd562..000000000 Binary files a/res/drawable-mdpi/ic_apps.png and /dev/null differ diff --git a/res/drawable-mdpi/ic_apps_pressed.png b/res/drawable-mdpi/ic_apps_pressed.png deleted file mode 100644 index 25de0ac3b..000000000 Binary files a/res/drawable-mdpi/ic_apps_pressed.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_apps.png b/res/drawable-xhdpi/ic_apps.png deleted file mode 100644 index cec513bc9..000000000 Binary files a/res/drawable-xhdpi/ic_apps.png and /dev/null differ diff --git a/res/drawable-xhdpi/ic_apps_pressed.png b/res/drawable-xhdpi/ic_apps_pressed.png deleted file mode 100644 index 34265a6ee..000000000 Binary files a/res/drawable-xhdpi/ic_apps_pressed.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_apps.png b/res/drawable-xxhdpi/ic_apps.png deleted file mode 100644 index ad52a652a..000000000 Binary files a/res/drawable-xxhdpi/ic_apps.png and /dev/null differ diff --git a/res/drawable-xxhdpi/ic_apps_pressed.png b/res/drawable-xxhdpi/ic_apps_pressed.png deleted file mode 100644 index 0b285a6f9..000000000 Binary files a/res/drawable-xxhdpi/ic_apps_pressed.png and /dev/null differ diff --git a/res/drawable/manage_apps_button.xml b/res/drawable/manage_apps_button.xml deleted file mode 100644 index 24d841e60..000000000 --- a/res/drawable/manage_apps_button.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - diff --git a/res/layout/settings_pane.xml b/res/layout/settings_pane.xml index 909dc03c2..7d3ae31c7 100755 --- a/res/layout/settings_pane.xml +++ b/res/layout/settings_pane.xml @@ -60,15 +60,6 @@ android:drawableTop="@drawable/setting_button" android:text="@string/settings_button_text" /> - - diff --git a/res/values/strings.xml b/res/values/strings.xml index c3ba512b3..69b296c26 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -283,8 +283,6 @@ s --> Wallpapers Settings - - Apps Waiting 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 -- cgit v1.2.3