summaryrefslogtreecommitdiffstats
path: root/src/com/android
diff options
context:
space:
mode:
authorcretin45 <cretin45@gmail.com>2016-02-11 10:11:22 -0800
committerTom Powell <zifnab@zifnab06.net>2017-03-26 16:16:27 -0700
commit9e789625ecda346b2aa2ba23ace05e645b836e71 (patch)
tree661e66fba1d4a217a48726ab3f351cdd3af3dd96 /src/com/android
parent7cb7e89c3fb7e5f59cd28a3a396d0412d4fce8a4 (diff)
downloadandroid_packages_apps_Trebuchet-9e789625ecda346b2aa2ba23ace05e645b836e71.tar.gz
android_packages_apps_Trebuchet-9e789625ecda346b2aa2ba23ace05e645b836e71.tar.bz2
android_packages_apps_Trebuchet-9e789625ecda346b2aa2ba23ace05e645b836e71.zip
Trebuchet: Open settings panel when clicking settings
Issue-id: CYNGNOS-2002 Change-Id: I4fc2ffd17febc8f1e5fa804e6a26feaa51a29c4b
Diffstat (limited to 'src/com/android')
-rw-r--r--src/com/android/launcher3/Launcher.java26
1 files changed, 16 insertions, 10 deletions
diff --git a/src/com/android/launcher3/Launcher.java b/src/com/android/launcher3/Launcher.java
index 980badf20..33d2bd7e1 100644
--- a/src/com/android/launcher3/Launcher.java
+++ b/src/com/android/launcher3/Launcher.java
@@ -274,7 +274,7 @@ public class Launcher extends Activity
private boolean mHiddenFolderAuth = false;
@Thunk Hotseat mHotseat;
- private ViewGroup mOverviewPanel;
+ private VerticalSlidingPanel mOverviewPanel;
private View mDarkPanel;
OverviewSettingsPanel mOverviewSettingsPanel;
@@ -1493,7 +1493,7 @@ public class Launcher extends Activity
}
// Setup the overview panel
- mOverviewPanel = (ViewGroup) findViewById(R.id.overview_panel);
+ mOverviewPanel = (VerticalSlidingPanel) findViewById(R.id.overview_panel);
mOverviewSettingsPanel = new OverviewSettingsPanel(this);
mOverviewSettingsPanel.initializeAdapter();
@@ -1547,20 +1547,19 @@ public class Launcher extends Activity
});
defaultScreenButton.setOnTouchListener(getHapticFeedbackTouchListener());
- final VerticalSlidingPanel verticalSlidingPanel = ((VerticalSlidingPanel) mOverviewPanel);
- verticalSlidingPanel.setPanelSlideListener(new SettingsPanelSlideListener());
- verticalSlidingPanel.setEnableDragViewTouchEvents(true);
+ mOverviewPanel.setPanelSlideListener(new SettingsPanelSlideListener());
+ mOverviewPanel.setEnableDragViewTouchEvents(true);
View settingsPaneHeader = mOverviewPanel.findViewById(R.id.settings_pane_header);
if (settingsPaneHeader != null) {
- verticalSlidingPanel.setDragView(settingsPaneHeader);
+ mOverviewPanel.setDragView(settingsPaneHeader);
settingsPaneHeader.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
- if (verticalSlidingPanel.isExpanded()) {
- verticalSlidingPanel.collapsePane();
+ if (mOverviewPanel.isExpanded()) {
+ mOverviewPanel.collapsePane();
} else {
- verticalSlidingPanel.expandPane();
+ mOverviewPanel.expandPane();
}
}
});
@@ -3128,7 +3127,11 @@ public class Launcher extends Activity
if (mLauncherCallbacks != null) {
mLauncherCallbacks.onClickSettingsButton(v);
} else {
- startSettings();
+ if (mOverviewPanel.isExpanded()) {
+ mOverviewPanel.collapsePane();
+ } else {
+ mOverviewPanel.expandPane();
+ }
}
}
@@ -5202,6 +5205,9 @@ public class Launcher extends Activity
AnimationDrawable frameAnimation = (AnimationDrawable) mAnimatedArrow.getBackground();
frameAnimation.start();
+
+ LauncherApplication.getLauncherStats().sendSettingsOpenedEvent(
+ LauncherStats.ORIGIN_TREB_LONGPRESS);
}
@Override