wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1063750 - Part 2: Implement link from Remote Tabs tray to Remote Tabs home panel. r=mcomella

Browse Source 
Deriving the correct panel UUID from the active Home Panel configuration
is challenging.  This is easy and will only exist for one release.  (The
Remote Tabs tray icon will disappear after this release; see Bug
1063753.)  This solves the problem in essentially all the situations we
expect to see.
This commit is contained in:
Nick Alexander 2014-10-07 16:53:28 -07:00
parent 919610b2f4
commit 6da4ca9d60
3 changed files with 90 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mobile/android/base/AboutPages.java
View File

@ -5,6 +5,9 @@
package org.mozilla.gecko;
import org.mozilla.gecko.home.HomeConfig;
import org.mozilla.gecko.home.HomeConfig.PanelType;
import org.mozilla.gecko.mozglue.RobocopTarget;
import org.mozilla.gecko.util.StringUtils;
public class AboutPages {
@ -89,5 +92,16 @@ public class AboutPages {
}
return false;
}
}
/**
* Get a URL that navigates to the specified built-in Home Panel.
*
* @param panelType to navigate to.
* @return URL.
* @throws IllegalArgumentException if the built-in panel type is not a built-in panel.
*/
@RobocopTarget
public static String getURLForBuiltinPanelType(PanelType panelType) throws IllegalArgumentException {
return HOME + "?panel=" + HomeConfig.getIdForBuiltinPanelType(panelType);
}
}

111
mobile/android/base/home/HomeConfig.java
View File

@ -5,20 +5,6 @@
package org.mozilla.gecko.home;
import org.mozilla.gecko.GeckoAppShell;
import org.mozilla.gecko.GeckoEvent;
import org.mozilla.gecko.R;
import org.mozilla.gecko.home.RemoteTabsPanel;
import org.mozilla.gecko.util.ThreadUtils;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import android.content.Context;
import android.os.Parcel;
import android.os.Parcelable;
import android.text.TextUtils;
import java.util.ArrayList;
import java.util.Collections;
import java.util.EnumSet;
@ -28,6 +14,19 @@ import java.util.LinkedList;
import java.util.List;
import java.util.Map;
import org.json.JSONArray;
import org.json.JSONException;
import org.json.JSONObject;
import org.mozilla.gecko.GeckoAppShell;
import org.mozilla.gecko.GeckoEvent;
import org.mozilla.gecko.R;
import org.mozilla.gecko.util.ThreadUtils;
import android.content.Context;
import android.os.Parcel;
import android.os.Parcelable;
import android.text.TextUtils;
public final class HomeConfig {
/**
* Used to determine what type of HomeFragment subclass to use when creating
@ -832,7 +831,6 @@ public final class HomeConfig {
mImageUrl = json.optString(JSON_KEY_IMAGE_URL, null);
}
@SuppressWarnings("unchecked")
public EmptyViewConfig(Parcel in) {
mText = in.readString();
mImageUrl = in.readString();
@ -904,7 +902,6 @@ public final class HomeConfig {
mImageUrl = json.optString(JSON_KEY_IMAGE_URL, null);
}
@SuppressWarnings("unchecked")
public AuthConfig(Parcel in) {
mMessageText = in.readString();
mButtonText = in.readString();
@ -1495,7 +1492,12 @@ public final class HomeConfig {
public void setOnReloadListener(OnReloadListener listener);
}
// UUIDs used to create PanelConfigs for default built-in panels
// UUIDs used to create PanelConfigs for default built-in panels. These are
// public because they can be used in "about:home?panel=UUID" query strings
// to open specific panels without querying the active Home Panel
// configuration. Because they don't consider the active configuration, it
// is only sensible to do this for built-in panels (and not for dynamic
// panels).
private static final String TOP_SITES_PANEL_ID = "4becc86b-41eb-429a-a042-88fe8b5a094e";
private static final String BOOKMARKS_PANEL_ID = "7f6d419a-cd6c-4e34-b26f-f68b1b551907";
private static final String READING_LIST_PANEL_ID = "20f4549a-64ad-4c32-93e4-1dcef792733b";
@ -1532,44 +1534,59 @@ public final class HomeConfig {
return createBuiltinPanelConfig(context, panelType, EnumSet.noneOf(PanelConfig.Flags.class));
}
public static PanelConfig createBuiltinPanelConfig(Context context, PanelType panelType, EnumSet<PanelConfig.Flags> flags) {
int titleId = 0;
String id = null;
public static int getTitleResourceIdForBuiltinPanelType(PanelType panelType) {
switch(panelType) {
case TOP_SITES:
titleId = R.string.home_top_sites_title;
id = TOP_SITES_PANEL_ID;
break;
case TOP_SITES:
return R.string.home_top_sites_title;
case BOOKMARKS:
titleId = R.string.bookmarks_title;
id = BOOKMARKS_PANEL_ID;
break;
case BOOKMARKS:
return R.string.bookmarks_title;
case HISTORY:
titleId = R.string.home_history_title;
id = HISTORY_PANEL_ID;
break;
case HISTORY:
return R.string.home_history_title;
case REMOTE_TABS:
titleId = R.string.home_remote_tabs_title;
id = REMOTE_TABS_PANEL_ID;
break;
case REMOTE_TABS:
return R.string.home_remote_tabs_title;
case READING_LIST:
titleId = R.string.reading_list_title;
id = READING_LIST_PANEL_ID;
break;
case READING_LIST:
return R.string.reading_list_title;
case RECENT_TABS:
titleId = R.string.recent_tabs_title;
id = RECENT_TABS_PANEL_ID;
break;
case RECENT_TABS:
return R.string.recent_tabs_title;
case DYNAMIC:
throw new IllegalArgumentException("createBuiltinPanelConfig() is only for built-in panels");
default:
throw new IllegalArgumentException("Only for built-in panel types: " + panelType);
}
}
public static String getIdForBuiltinPanelType(PanelType panelType) {
switch(panelType) {
case TOP_SITES:
return TOP_SITES_PANEL_ID;
case BOOKMARKS:
return BOOKMARKS_PANEL_ID;
case HISTORY:
return HISTORY_PANEL_ID;
case REMOTE_TABS:
return REMOTE_TABS_PANEL_ID;
case READING_LIST:
return READING_LIST_PANEL_ID;
case RECENT_TABS:
return RECENT_TABS_PANEL_ID;
default:
throw new IllegalArgumentException("Only for built-in panel types: " + panelType);
}
}
public static PanelConfig createBuiltinPanelConfig(Context context, PanelType panelType, EnumSet<PanelConfig.Flags> flags) {
final int titleId = getTitleResourceIdForBuiltinPanelType(panelType);
final String id = getIdForBuiltinPanelType(panelType);
return new PanelConfig(panelType, context.getString(titleId), id, flags);
}

13
mobile/android/base/tabs/RemoteTabsPanel.java
View File

@ -4,9 +4,10 @@
package org.mozilla.gecko.tabs;
import org.mozilla.gecko.AboutPages;
import org.mozilla.gecko.R;
import org.mozilla.gecko.Tabs;
import org.mozilla.gecko.home.HomeConfig;
import org.mozilla.gecko.home.HomeConfig.PanelType;
import org.mozilla.gecko.tabs.TabsPanel.PanelView;
import android.content.Context;
@ -33,7 +34,15 @@ class RemoteTabsPanel extends FrameLayout implements PanelView {
link.setOnClickListener(new OnClickListener() {
@Override
public void onClick(View v) {
// For now, we don't do anything.
// It is possible that this will fail: if the user has removed
// the Remote Tabs panel, it won't exist. (The new tab will open
// to the default panel, which is confusing but not
// catastrophic.) Querying the current configuration to
// determine if the panel is present is not worth the effort; we
// expect very few configurations to not include the Remote Tabs
// panel.
Tabs.getInstance().loadUrl(AboutPages.getURLForBuiltinPanelType(PanelType.REMOTE_TABS),
Tabs.LOADURL_NEW_TAB);
if (tabsPanel != null) {
tabsPanel.autoHidePanel();
}