From d44aa3775ad4ebca28070e9eb4d013c380dce6c4 Mon Sep 17 00:00:00 2001 From: Raj Yengisetty Date: Wed, 14 Jan 2015 16:24:59 +0800 Subject: Adding manage apps shortcut to Settings panel Change-Id: I02b454072258d57e82c825417941382ea7807e83 (cherry picked from commit cc342519488d50d2f59f514940de6cf02bd53ab2) --- res/drawable-hdpi/ic_apps.png | Bin 0 -> 587 bytes res/drawable-hdpi/ic_apps_pressed.png | Bin 0 -> 589 bytes res/drawable-mdpi/ic_apps.png | Bin 0 -> 380 bytes res/drawable-mdpi/ic_apps_pressed.png | Bin 0 -> 406 bytes res/drawable-xhdpi/ic_apps.png | Bin 0 -> 664 bytes res/drawable-xhdpi/ic_apps_pressed.png | Bin 0 -> 652 bytes res/drawable-xxhdpi/ic_apps.png | Bin 0 -> 1180 bytes res/drawable-xxhdpi/ic_apps_pressed.png | Bin 0 -> 1152 bytes res/drawable/manage_apps_button.xml | 21 +++++++++++++++++++++ res/layout/settings_pane.xml | 15 +++++++++++++++ res/values/strings.xml | 6 ++++-- src/com/android/launcher3/Launcher.java | 11 +++++++++++ .../android/launcher3/OverviewSettingsPanel.java | 14 +++++++++++++- 13 files changed, 64 insertions(+), 3 deletions(-) create mode 100644 res/drawable-hdpi/ic_apps.png create mode 100644 res/drawable-hdpi/ic_apps_pressed.png create mode 100644 res/drawable-mdpi/ic_apps.png create mode 100644 res/drawable-mdpi/ic_apps_pressed.png create mode 100644 res/drawable-xhdpi/ic_apps.png create mode 100644 res/drawable-xhdpi/ic_apps_pressed.png create mode 100644 res/drawable-xxhdpi/ic_apps.png create mode 100644 res/drawable-xxhdpi/ic_apps_pressed.png create mode 100644 res/drawable/manage_apps_button.xml diff --git a/res/drawable-hdpi/ic_apps.png b/res/drawable-hdpi/ic_apps.png new file mode 100644 index 000000000..1f5bc89f6 Binary files /dev/null and b/res/drawable-hdpi/ic_apps.png differ diff --git a/res/drawable-hdpi/ic_apps_pressed.png b/res/drawable-hdpi/ic_apps_pressed.png new file mode 100644 index 000000000..e1edaab74 Binary files /dev/null and b/res/drawable-hdpi/ic_apps_pressed.png differ diff --git a/res/drawable-mdpi/ic_apps.png b/res/drawable-mdpi/ic_apps.png new file mode 100644 index 000000000..5df898406 Binary files /dev/null and b/res/drawable-mdpi/ic_apps.png differ diff --git a/res/drawable-mdpi/ic_apps_pressed.png b/res/drawable-mdpi/ic_apps_pressed.png new file mode 100644 index 000000000..30b569b28 Binary files /dev/null and b/res/drawable-mdpi/ic_apps_pressed.png differ diff --git a/res/drawable-xhdpi/ic_apps.png b/res/drawable-xhdpi/ic_apps.png new file mode 100644 index 000000000..350148665 Binary files /dev/null and b/res/drawable-xhdpi/ic_apps.png differ diff --git a/res/drawable-xhdpi/ic_apps_pressed.png b/res/drawable-xhdpi/ic_apps_pressed.png new file mode 100644 index 000000000..ef48829fa Binary files /dev/null and b/res/drawable-xhdpi/ic_apps_pressed.png differ diff --git a/res/drawable-xxhdpi/ic_apps.png b/res/drawable-xxhdpi/ic_apps.png new file mode 100644 index 000000000..9860a441f Binary files /dev/null and b/res/drawable-xxhdpi/ic_apps.png differ diff --git a/res/drawable-xxhdpi/ic_apps_pressed.png b/res/drawable-xxhdpi/ic_apps_pressed.png new file mode 100644 index 000000000..a2354aa4d Binary files /dev/null and b/res/drawable-xxhdpi/ic_apps_pressed.png differ diff --git a/res/drawable/manage_apps_button.xml b/res/drawable/manage_apps_button.xml new file mode 100644 index 000000000..24d841e60 --- /dev/null +++ b/res/drawable/manage_apps_button.xml @@ -0,0 +1,21 @@ + + + + + + + + diff --git a/res/layout/settings_pane.xml b/res/layout/settings_pane.xml index ed1cc8f15..77c8d4d8a 100755 --- a/res/layout/settings_pane.xml +++ b/res/layout/settings_pane.xml @@ -94,6 +94,21 @@ android:textColor="@android:color/white" android:maxLines="2" /> + + Touch & hold to pick up a widget. - Shop @@ -188,7 +188,7 @@ s --> shortcuts in Home. - + Problem loading widget @@ -283,6 +283,8 @@ s --> Wallpapers Settings + + Apps Waiting diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index 2e564c4c8..937a167d1 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -225,6 +225,8 @@ 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 = @@ -1426,6 +1428,15 @@ 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 2403d2344..e07c16e1d 100644 --- a/src/com/android/launcher3/OverviewSettingsPanel.java +++ b/src/com/android/launcher3/OverviewSettingsPanel.java @@ -90,7 +90,6 @@ public class OverviewSettingsPanel { ((SlidingUpPanelLayout) mOverviewPanel) .setPanelSlideListener(new SettingsSimplePanelSlideListener()); - //Quick Settings Buttons View widgetButton = mLauncher.findViewById(R.id.widget_button); widgetButton.setOnClickListener(new OnClickListener() { @Override @@ -109,6 +108,7 @@ public class OverviewSettingsPanel { }); wallpaperButton.setOnTouchListener(mLauncher.getHapticFeedbackTouchListener()); + //Quick Settings Button View settingsButton = mLauncher.findViewById(R.id.settings_button); settingsButton.setOnClickListener(new OnClickListener() { @Override @@ -120,6 +120,18 @@ 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