summaryrefslogtreecommitdiffstats
path: root/src/com
diff options
context:
space:
mode:
authorWinson Chung <winsonc@google.com>2011-05-31 17:28:12 -0700
committerWinson Chung <winsonc@google.com>2011-05-31 20:03:32 -0700
commit4179b4e048dd019daca053dc3a7eddf6c464b08b (patch)
tree452a82b595c6f7e83ac6145176a34d29ad0bddf9 /src/com
parent85b439c964a23f262f57c7333bfd2b3b838836f7 (diff)
downloadandroid_packages_apps_Trebuchet-4179b4e048dd019daca053dc3a7eddf6c464b08b.tar.gz
android_packages_apps_Trebuchet-4179b4e048dd019daca053dc3a7eddf6c464b08b.tar.bz2
android_packages_apps_Trebuchet-4179b4e048dd019daca053dc3a7eddf6c464b08b.zip
Fixing translateable attribute in strings, and click-through in AppsCustomize.
Change-Id: I8ceff05f5d38021c74731cddf71391b55049b2af
Diffstat (limited to 'src/com')
-rw-r--r--src/com/android/launcher2/AppsCustomizeTabHost.java25
-rw-r--r--src/com/android/launcher2/Workspace.java13
2 files changed, 27 insertions, 11 deletions
diff --git a/src/com/android/launcher2/AppsCustomizeTabHost.java b/src/com/android/launcher2/AppsCustomizeTabHost.java
index cd8e7efb0..28f2d2ebc 100644
--- a/src/com/android/launcher2/AppsCustomizeTabHost.java
+++ b/src/com/android/launcher2/AppsCustomizeTabHost.java
@@ -20,6 +20,7 @@ import android.content.Context;
import android.content.res.Resources;
import android.util.AttributeSet;
import android.view.LayoutInflater;
+import android.view.MotionEvent;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TabHost;
@@ -36,6 +37,7 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona
private static final String WALLPAPERS_TAB_TAG = "WALLPAPERS";
private final LayoutInflater mLayoutInflater;
+ private AppsCustomizePagedView mAppsCustomizePane;
public AppsCustomizeTabHost(Context context, AttributeSet attrs) {
super(context, attrs);
@@ -58,15 +60,16 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona
setup();
final ViewGroup tabs = (ViewGroup) findViewById(com.android.internal.R.id.tabs);
- final AppsCustomizePagedView content = (AppsCustomizePagedView)
+ final AppsCustomizePagedView appsCustomizePane = (AppsCustomizePagedView)
findViewById(R.id.apps_customize_pane_content);
- if (tabs == null || content == null) throw new Resources.NotFoundException();
+ mAppsCustomizePane = appsCustomizePane;
+ if (tabs == null || mAppsCustomizePane == null) throw new Resources.NotFoundException();
// Configure the tabs content factory to return the same paged view (that we change the
// content filter on)
TabContentFactory contentFactory = new TabContentFactory() {
public View createTabContent(String tag) {
- return content;
+ return appsCustomizePane;
}
};
@@ -84,14 +87,22 @@ public class AppsCustomizeTabHost extends TabHost implements LauncherTransitiona
setOnTabChangedListener(this);
// Set the width of the tab bar to match the content (for now)
- tabs.getLayoutParams().width = content.getPageContentWidth();
+ tabs.getLayoutParams().width = mAppsCustomizePane.getPageContentWidth();
+ }
+
+ @Override
+ public boolean onTouchEvent(MotionEvent event) {
+ // Intercept all touch events up to the bottom of the AppsCustomizePane so they do not fall
+ // through to the workspace and trigger showWorkspace()
+ if (event.getY() < mAppsCustomizePane.getBottom()) {
+ return true;
+ }
+ return super.onTouchEvent(event);
}
@Override
public void onTabChanged(String tabId) {
- final AppsCustomizePagedView content = (AppsCustomizePagedView)
- findViewById(R.id.apps_customize_pane_content);
- content.setContentType(getContentTypeForTabTag(tabId));
+ mAppsCustomizePane.setContentType(getContentTypeForTabTag(tabId));
}
/**
diff --git a/src/com/android/launcher2/Workspace.java b/src/com/android/launcher2/Workspace.java
index 7d2626d1f..5f04af0f9 100644
--- a/src/com/android/launcher2/Workspace.java
+++ b/src/com/android/launcher2/Workspace.java
@@ -613,10 +613,15 @@ public class Workspace extends SmoothPagedView
if (mLauncher.isAllAppsVisible() && mShrinkState == ShrinkState.BOTTOM_HIDDEN) {
// Intercept this event so we can show the workspace in full view
// when it is clicked on and it is small
- AllAppsPagedView allApps = (AllAppsPagedView)
- mLauncher.findViewById(R.id.all_apps_paged_view);
- if (allApps != null) {
- allApps.onInterceptTouchEvent(ev);
+ PagedView appsPane = null;
+ if (LauncherApplication.isScreenLarge()) {
+ appsPane = (PagedView) mLauncher.findViewById(R.id.all_apps_paged_view);
+ } else {
+ appsPane = (PagedView) mLauncher.findViewById(R.id.apps_customize_pane_content);
+ }
+
+ if (appsPane != null) {
+ appsPane.onInterceptTouchEvent(ev);
}
return true;
}