diff options
-rw-r--r-- | res/drawable-hdpi/ic_apps.png | bin | 509 -> 0 bytes | |||
-rw-r--r-- | res/drawable-hdpi/ic_apps_pressed.png | bin | 503 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_apps.png | bin | 334 -> 0 bytes | |||
-rw-r--r-- | res/drawable-mdpi/ic_apps_pressed.png | bin | 357 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_apps.png | bin | 512 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xhdpi/ic_apps_pressed.png | bin | 508 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_apps.png | bin | 803 -> 0 bytes | |||
-rw-r--r-- | res/drawable-xxhdpi/ic_apps_pressed.png | bin | 776 -> 0 bytes | |||
-rw-r--r-- | res/drawable/manage_apps_button.xml | 21 | ||||
-rwxr-xr-x | res/layout/settings_pane.xml | 9 | ||||
-rw-r--r-- | res/values/strings.xml | 2 | ||||
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 11 | ||||
-rw-r--r-- | src/com/android/launcher3/OverviewSettingsPanel.java | 14 |
13 files changed, 1 insertions, 56 deletions
diff --git a/res/drawable-hdpi/ic_apps.png b/res/drawable-hdpi/ic_apps.png Binary files differdeleted file mode 100644 index 6da41f6b3..000000000 --- a/res/drawable-hdpi/ic_apps.png +++ /dev/null diff --git a/res/drawable-hdpi/ic_apps_pressed.png b/res/drawable-hdpi/ic_apps_pressed.png Binary files differdeleted file mode 100644 index d4717ff85..000000000 --- a/res/drawable-hdpi/ic_apps_pressed.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_apps.png b/res/drawable-mdpi/ic_apps.png Binary files differdeleted file mode 100644 index 608acd562..000000000 --- a/res/drawable-mdpi/ic_apps.png +++ /dev/null diff --git a/res/drawable-mdpi/ic_apps_pressed.png b/res/drawable-mdpi/ic_apps_pressed.png Binary files differdeleted file mode 100644 index 25de0ac3b..000000000 --- a/res/drawable-mdpi/ic_apps_pressed.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_apps.png b/res/drawable-xhdpi/ic_apps.png Binary files differdeleted file mode 100644 index cec513bc9..000000000 --- a/res/drawable-xhdpi/ic_apps.png +++ /dev/null diff --git a/res/drawable-xhdpi/ic_apps_pressed.png b/res/drawable-xhdpi/ic_apps_pressed.png Binary files differdeleted file mode 100644 index 34265a6ee..000000000 --- a/res/drawable-xhdpi/ic_apps_pressed.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_apps.png b/res/drawable-xxhdpi/ic_apps.png Binary files differdeleted file mode 100644 index ad52a652a..000000000 --- a/res/drawable-xxhdpi/ic_apps.png +++ /dev/null diff --git a/res/drawable-xxhdpi/ic_apps_pressed.png b/res/drawable-xxhdpi/ic_apps_pressed.png Binary files differdeleted file mode 100644 index 0b285a6f9..000000000 --- a/res/drawable-xxhdpi/ic_apps_pressed.png +++ /dev/null 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2013 The Android Open Source Project - - Licensed under the Apache License, Version 2.0 (the "License"); - you may not use this file except in compliance with the License. - You may obtain a copy of the License at - - http://www.apache.org/licenses/LICENSE-2.0 - - Unless required by applicable law or agreed to in writing, software - distributed under the License is distributed on an "AS IS" BASIS, - WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - See the License for the specific language governing permissions and - limitations under the License. ---> - -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_focused="true" android:drawable="@drawable/ic_apps_pressed" /> - <item android:state_pressed="true" android:drawable="@drawable/ic_apps_pressed" /> - <item android:drawable="@drawable/ic_apps" /> -</selector> 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" /> - <TextView - android:id="@+id/manage_apps_button" - android:layout_width="0dip" - android:layout_height="wrap_content" - android:layout_weight="1" - style="@style/SettingsPaneButton" - android:drawableTop="@drawable/manage_apps_button" - android:text="@string/manage_apps_button_text" /> - </LinearLayout> </LinearLayout> 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 --> <string name="wallpaper_button_text">Wallpapers</string> <!-- Text for settings button --> <string name="settings_button_text">Settings</string> - <!-- Text for manage apps button --> - <string name="manage_apps_button_text">Apps</string> <!-- Label on an icon that references an uninstalled package, that is going to be installed at some point. [CHAR_LIMIT=15] --> <string name="package_state_enqueued">Waiting</string> 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 |