summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorAdam Cohen <adamcohen@google.com>2013-08-29 21:45:13 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2013-08-29 21:45:13 +0000
commitd1bfb51ef33e337d4ec9efa58d7b222224ce5c1c (patch)
tree137e6aaf1aebf48937827c046a05ab923939e105 /src
parentfe09cb7fe3ec1ab3e7aabd2d0415de61df31c4db (diff)
parent30bacb215893882688bf50479bcd4843f83a661b (diff)
downloadandroid_packages_apps_Trebuchet-d1bfb51ef33e337d4ec9efa58d7b222224ce5c1c.tar.gz
android_packages_apps_Trebuchet-d1bfb51ef33e337d4ec9efa58d7b222224ce5c1c.tar.bz2
android_packages_apps_Trebuchet-d1bfb51ef33e337d4ec9efa58d7b222224ce5c1c.zip
Merge "Added settings button to overview mode" into jb-ub-gel-agar
Diffstat (limited to 'src')
-rw-r--r--src/com/android/launcher3/Launcher.java9
1 files changed, 9 insertions, 0 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 35e166fc2..7970b71be 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -921,6 +921,9 @@ public class Launcher extends Activity
public void onHide();
}
+ protected void startSettings() {
+ }
+
public interface QSBScroller {
public void setScrollY(int scrollY);
}
@@ -1123,6 +1126,12 @@ public class Launcher extends Activity
startWallpaper();
}
});
+ findViewById(R.id.settings_button).setOnClickListener(new OnClickListener() {
+ @Override
+ public void onClick(View arg0) {
+ startSettings();
+ }
+ });
// Setup the workspace
mWorkspace.setHapticFeedbackEnabled(false);