summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRajesh Yengisetty <rajesh@cyngn.com>2015-02-19 02:10:33 (GMT)
committerRaj Yengisetty <rajesh@cyngn.com>2015-02-20 00:50:48 (GMT)
commitf4943c9cfb628d00fb3e4e67a183f50bc31e7165 (patch)
tree42c6d38cfe6326eb1e4c3d66e9ad2672011578f6
parent816e426c8215ef04d591db4c309df4c6b054c4f8 (diff)
downloadandroid_packages_apps_Trebuchet-f4943c9cfb628d00fb3e4e67a183f50bc31e7165.zip
android_packages_apps_Trebuchet-f4943c9cfb628d00fb3e4e67a183f50bc31e7165.tar.gz
android_packages_apps_Trebuchet-f4943c9cfb628d00fb3e4e67a183f50bc31e7165.tar.bz2
Revert "Adding manage apps shortcut to Settings panel"stable/cm-12.0-YNG1I
This reverts commit cc342519488d50d2f59f514940de6cf02bd53ab2. Change-Id: I8f5c593f93c4706127d2c0473f59abcd74776e47
-rw-r--r--res/drawable-hdpi/ic_apps.pngbin509 -> 0 bytes
-rw-r--r--res/drawable-hdpi/ic_apps_pressed.pngbin503 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_apps.pngbin334 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_apps_pressed.pngbin357 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_apps.pngbin512 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_apps_pressed.pngbin508 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_apps.pngbin803 -> 0 bytes
-rw-r--r--res/drawable-xxhdpi/ic_apps_pressed.pngbin776 -> 0 bytes
-rw-r--r--res/drawable/manage_apps_button.xml21
-rwxr-xr-xres/layout/settings_pane.xml9
-rw-r--r--res/values/strings.xml2
-rw-r--r--src/com/android/launcher3/Launcher.java11
-rw-r--r--src/com/android/launcher3/OverviewSettingsPanel.java14
13 files changed, 1 insertions, 56 deletions
diff --git a/res/drawable-hdpi/ic_apps.png b/res/drawable-hdpi/ic_apps.png
deleted file mode 100644
index 6da41f6..0000000
--- a/res/drawable-hdpi/ic_apps.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-hdpi/ic_apps_pressed.png b/res/drawable-hdpi/ic_apps_pressed.png
deleted file mode 100644
index d4717ff..0000000
--- a/res/drawable-hdpi/ic_apps_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_apps.png b/res/drawable-mdpi/ic_apps.png
deleted file mode 100644
index 608acd5..0000000
--- a/res/drawable-mdpi/ic_apps.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_apps_pressed.png b/res/drawable-mdpi/ic_apps_pressed.png
deleted file mode 100644
index 25de0ac..0000000
--- a/res/drawable-mdpi/ic_apps_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_apps.png b/res/drawable-xhdpi/ic_apps.png
deleted file mode 100644
index cec513b..0000000
--- a/res/drawable-xhdpi/ic_apps.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_apps_pressed.png b/res/drawable-xhdpi/ic_apps_pressed.png
deleted file mode 100644
index 34265a6..0000000
--- a/res/drawable-xhdpi/ic_apps_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_apps.png b/res/drawable-xxhdpi/ic_apps.png
deleted file mode 100644
index ad52a65..0000000
--- a/res/drawable-xxhdpi/ic_apps.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xxhdpi/ic_apps_pressed.png b/res/drawable-xxhdpi/ic_apps_pressed.png
deleted file mode 100644
index 0b285a6..0000000
--- a/res/drawable-xxhdpi/ic_apps_pressed.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable/manage_apps_button.xml b/res/drawable/manage_apps_button.xml
deleted file mode 100644
index 24d841e..0000000
--- 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 909dc03..7d3ae31 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 c3ba512..69b296c 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 80781c6..5dfb68d 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 e07c16e..2403d23 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