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 977161 - Part 1: Add hide/show context menu items to remote clients. r=rnewman

Browse Source 
We're not (yet) using show, but we may as well add it while we're here.
This commit is contained in:
Nick Alexander 2014-09-16 15:41:12 -07:00
parent 9d86f6e029
commit f5ab0b7ea2
2 changed files with 88 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
mobile/android/base/home/RemoteTabsExpandableListFragment.java
View File

@ -28,7 +28,11 @@ import android.os.Bundle;
import android.support.v4.app.LoaderManager.LoaderCallbacks;
import android.support.v4.content.Loader;
import android.util.Log;
import android.view.ContextMenu;
import android.view.ContextMenu.ContextMenuInfo;
import android.view.LayoutInflater;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View;
import android.view.ViewGroup;
import android.view.ViewStub;
@ -139,18 +143,19 @@ public class RemoteTabsExpandableListFragment extends HomeFragment {
@Override
public HomeContextMenuInfo makeInfoForAdapter(View view, int position, long id, ExpandableListAdapter adapter) {
long packedPosition = mList.getExpandableListPosition(position);
if (ExpandableListView.getPackedPositionType(packedPosition) != ExpandableListView.PACKED_POSITION_TYPE_CHILD) {
return null;
}
final int groupPosition = ExpandableListView.getPackedPositionGroup(packedPosition);
final int childPosition = ExpandableListView.getPackedPositionChild(packedPosition);
final Object child = adapter.getChild(groupPosition, childPosition);
if (child instanceof RemoteTab) {
final RemoteTab tab = (RemoteTab) child;
final int type = ExpandableListView.getPackedPositionType(packedPosition);
if (type == ExpandableListView.PACKED_POSITION_TYPE_CHILD) {
final int childPosition = ExpandableListView.getPackedPositionChild(packedPosition);
final RemoteTab tab = (RemoteTab) adapter.getChild(groupPosition, childPosition);
final HomeContextMenuInfo info = new HomeContextMenuInfo(view, position, id);
info.url = tab.url;
info.title = tab.title;
return info;
} else if (type == ExpandableListView.PACKED_POSITION_TYPE_GROUP) {
final RemoteClient client = (RemoteClient) adapter.getGroup(groupPosition);
final RemoteTabsClientContextMenuInfo info = new RemoteTabsClientContextMenuInfo(view, position, id, client);
return info;
} else {
return null;
}
@ -194,6 +199,56 @@ public class RemoteTabsExpandableListFragment extends HomeFragment {
loadIfVisible();
}
@Override
public void onCreateContextMenu(ContextMenu menu, View view, ContextMenuInfo menuInfo) {
if (!(menuInfo instanceof RemoteTabsClientContextMenuInfo)) {
// Long pressed item was not a RemoteTabsGroup item. Superclass
// can handle this.
super.onCreateContextMenu(menu, view, menuInfo);
return;
}
// Long pressed item was a remote client; provide the appropriate menu.
final MenuInflater inflater = new MenuInflater(view.getContext());
inflater.inflate(R.menu.home_remote_tabs_client_contextmenu, menu);
final RemoteTabsClientContextMenuInfo info = (RemoteTabsClientContextMenuInfo) menuInfo;
menu.setHeaderTitle(info.client.name);
// Hide unused menu items.
final boolean isHidden = sState.isClientHidden(info.client.guid);
final MenuItem item = menu.findItem(isHidden
? R.id.home_remote_tabs_hide_client
: R.id.home_remote_tabs_show_client);
item.setVisible(false);
}
@Override
public boolean onContextItemSelected(MenuItem item) {
if (super.onContextItemSelected(item)) {
// HomeFragment was able to handle to selected item.
return true;
}
final ContextMenuInfo menuInfo = item.getMenuInfo();
if (!(menuInfo instanceof RemoteTabsClientContextMenuInfo)) {
return false;
}
final RemoteTabsClientContextMenuInfo info = (RemoteTabsClientContextMenuInfo) menuInfo;
final int itemId = item.getItemId();
if (itemId == R.id.home_remote_tabs_hide_client) {
sState.setClientHidden(info.client.guid, true);
return true;
} else if (itemId == R.id.home_remote_tabs_show_client) {
sState.setClientHidden(info.client.guid, false);
return true;
} else {
return false;
}
}
private void updateUiFromClients(List<RemoteClient> clients) {
if (clients != null && !clients.isEmpty()) {
// No sense crashing if we've made an error.
@ -291,4 +346,16 @@ public class RemoteTabsExpandableListFragment extends HomeFragment {
mRefreshLayout.setRefreshing(false);
}
}
/**
* Stores information regarding the creation of the context menu for a remote client.
*/
protected static class RemoteTabsClientContextMenuInfo extends HomeContextMenuInfo {
protected final RemoteClient client;
public RemoteTabsClientContextMenuInfo(View targetView, int position, long id, RemoteClient client) {
super(targetView, position, id);
this.client = client;
}
}
}

14
mobile/android/base/resources/menu/home_remote_tabs_client_contextmenu.xml Normal file
View File

@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<!-- This Source Code Form is subject to the terms of the Mozilla Public
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/. -->
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<item android:id="@+id/home_remote_tabs_hide_client"
android:title="@string/pref_panels_hide"/>
<item android:id="@+id/home_remote_tabs_show_client"
android:title="@string/pref_panels_show"/>
</menu>