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 1003610 - Remote Tabs shouldn't lose scroll position, r=nalexander

Browse Source
This commit is contained in:
Mark Capella 2014-07-07 16:19:12 -04:00
parent 72320cec82
commit 7a424a6ccf
1 changed files with 38 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
mobile/android/base/tabspanel/RemoteTabsList.java
View File

@ -38,8 +38,15 @@ class RemoteTabsList extends ExpandableListView
private final Context context;
private TabsPanel tabsPanel;
private ArrayList <HashMap <String, String>> clients;
private ArrayList <ArrayList <HashMap <String, String>>> tabsList;
// A list of the clients that are currently expanded.
private List<String> expandedClientList = new ArrayList<String>();
// The client that previously had an item selected is used to restore the scroll position.
private String clientScrollPosition;
public RemoteTabsList(Context context, AttributeSet attrs) {
super(context, attrs);
this.context = context;
@ -57,8 +64,18 @@ class RemoteTabsList extends ExpandableListView
}
@Override
public boolean onGroupClick(ExpandableListView parent, View view, int position, long id) {
// By default, the group collapses/expands. Consume the event.
public boolean onGroupClick(ExpandableListView parent, View view, int groupPosition, long id) {
final String clientGuid = clients.get(groupPosition).get("guid");
if (isGroupExpanded(groupPosition)) {
collapseGroup(groupPosition);
expandedClientList.remove(clientGuid);
} else {
expandGroup(groupPosition);
expandedClientList.add(clientGuid);
}
clientScrollPosition = clientGuid;
return true;
}
@ -74,6 +91,8 @@ class RemoteTabsList extends ExpandableListView
Tabs.getInstance().loadUrl(tab.get("url"), Tabs.LOADURL_NEW_TAB);
autoHidePanel();
clientScrollPosition = clients.get(groupPosition).get("guid");
return true;
}
@ -83,8 +102,7 @@ class RemoteTabsList extends ExpandableListView
if (remoteTabs == null || remoteTabs.size() == 0)
return;
ArrayList <HashMap <String, String>> clients = new ArrayList <HashMap <String, String>>();
clients = new ArrayList <HashMap <String, String>>();
tabsList = new ArrayList <ArrayList <HashMap <String, String>>>();
String oldGuid = null;
@ -95,16 +113,18 @@ class RemoteTabsList extends ExpandableListView
final long now = System.currentTimeMillis();
for (TabsAccessor.RemoteTab remoteTab : remoteTabs) {
if (oldGuid == null || !TextUtils.equals(oldGuid, remoteTab.guid)) {
final String clientGuid = remoteTab.guid;
if (oldGuid == null || !TextUtils.equals(oldGuid, clientGuid)) {
client = new HashMap <String, String>();
client.put("name", remoteTab.name);
client.put("last_synced", getLastSyncedString(now, remoteTab.lastModified));
client.put("guid", clientGuid);
clients.add(client);
tabsForClient = new ArrayList <HashMap <String, String>>();
tabsList.add(tabsForClient);
oldGuid = new String(remoteTab.guid);
oldGuid = new String(clientGuid);
}
tab = new HashMap<String, String>();
@ -123,9 +143,20 @@ class RemoteTabsList extends ExpandableListView
TAB_KEY,
TAB_RESOURCE));
// Expand the client groups, and restore the previous scroll position.
List<String> newExpandedClientList = new ArrayList<String>();
for (int i = 0; i < clients.size(); i++) {
expandGroup(i);
final String clientGuid = clients.get(i).get("guid");
if (expandedClientList.contains(clientGuid)) {
newExpandedClientList.add(clientGuid);
expandGroup(i);
}
if (clientGuid.equals(clientScrollPosition)) {
setSelectedGroup(i);
}
}
expandedClientList = newExpandedClientList;
}
/**