diff options
author | Anjali Koppal <akoppal@google.com> | 2014-03-10 20:34:39 -0700 |
---|---|---|
committer | Anjali Koppal <akoppal@google.com> | 2014-03-12 18:22:55 -0700 |
commit | 5ad4484df3e477f9d8819605629b6e75a42e31ed (patch) | |
tree | 57c45e0bd1e86409708e013eaca53be3e6952209 /src/com/android/launcher3 | |
parent | fc4787f7be3f05a3e8ccb393be1aaa5c9610c154 (diff) | |
download | android_packages_apps_Trebuchet-5ad4484df3e477f9d8819605629b6e75a42e31ed.tar.gz android_packages_apps_Trebuchet-5ad4484df3e477f9d8819605629b6e75a42e31ed.tar.bz2 android_packages_apps_Trebuchet-5ad4484df3e477f9d8819605629b6e75a42e31ed.zip |
Add a setter/getter for Launcher.mAllAppsButton.
Also, handle clicks on the all apps button by using onClick() method in
Launcher instead of directly calling onClickAllAppsButton in Hotseat.java
Bug 12553852
Change-Id: I261c27d3e964bbb1f52c2ab610997defd99a59bd
Diffstat (limited to 'src/com/android/launcher3')
-rw-r--r-- | src/com/android/launcher3/Hotseat.java | 10 | ||||
-rw-r--r-- | src/com/android/launcher3/Launcher.java | 11 |
2 files changed, 13 insertions, 8 deletions
diff --git a/src/com/android/launcher3/Hotseat.java b/src/com/android/launcher3/Hotseat.java index 59d60e381..2ac2f00a8 100644 --- a/src/com/android/launcher3/Hotseat.java +++ b/src/com/android/launcher3/Hotseat.java @@ -156,15 +156,9 @@ public class Hotseat extends FrameLayout { allAppsButton.setContentDescription(context.getString(R.string.all_apps_button_label)); if (mLauncher != null) { allAppsButton.setOnTouchListener(mLauncher.getHapticFeedbackTouchListener()); + mLauncher.setAllAppsButton(allAppsButton); + allAppsButton.setOnClickListener(mLauncher); } - allAppsButton.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(android.view.View v) { - if (mLauncher != null) { - mLauncher.onClickAllAppsButton(v); - } - } - }); // Note: We do this to ensure that the hotseat is always laid out in the orientation of // the hotseat in order regardless of which orientation they were added diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java index bd1ef321a..f1ce23524 100644 --- a/src/com/android/launcher3/Launcher.java +++ b/src/com/android/launcher3/Launcher.java @@ -1334,6 +1334,17 @@ public class Launcher extends Activity } /** + * Sets the all apps button. This method is called from {@link Hotseat}. + */ + public void setAllAppsButton(View allAppsButton) { + mAllAppsButton = allAppsButton; + } + + public View getAllAppsButton() { + return mAllAppsButton; + } + + /** * Creates a view representing a shortcut. * * @param info The data structure describing the shortcut. |