Revision db9092dd
b/src/com/rackspace/cloud/android/ListContainerActivity.java | ||
---|---|---|
16 | 16 |
import android.view.View; |
17 | 17 |
import android.view.ViewGroup; |
18 | 18 |
import android.widget.ArrayAdapter; |
19 |
import android.widget.ImageView; |
|
19 | 20 |
import android.widget.ListView; |
20 | 21 |
import android.widget.TextView; |
21 | 22 |
|
... | ... | |
307 | 308 |
TextView label = (TextView) row.findViewById(R.id.label); |
308 | 309 |
if(container.getOtherUser()!=null) |
309 | 310 |
label.setText(container.getOtherUser()+"/"+container.getName()); |
310 |
else |
|
311 |
else{
|
|
311 | 312 |
label.setText(container.getName()); |
313 |
ImageView img = (ImageView)row.findViewById(R.id.file_type_image); |
|
314 |
if(container.getName().equalsIgnoreCase("pithos")) |
|
315 |
img.setImageResource(R.drawable.pithoscontainer); |
|
316 |
if(container.getName().equalsIgnoreCase("trash")) |
|
317 |
img.setImageResource(R.drawable.trashicon); |
|
318 |
|
|
319 |
} |
|
320 |
|
|
312 | 321 |
|
313 | 322 |
if (container.getBytes() >= bConver) { |
314 | 323 |
megaBytes = Math.abs(container.getBytes() / bConver + 0.2); |
b/src/com/rackspace/cloud/android/PithosOthersActivity.java | ||
---|---|---|
4 | 4 |
import java.util.List; |
5 | 5 |
|
6 | 6 |
import android.os.Bundle; |
7 |
import android.view.Menu; |
|
8 |
import android.view.MenuInflater; |
|
7 | 9 |
|
8 | 10 |
import com.rackspace.cloud.android.ListContainerActivity.FileAdapter; |
9 | 11 |
import com.rackspace.cloud.files.api.client.Container; |
... | ... | |
45 | 47 |
registerForContextMenu(getListView()); |
46 | 48 |
} |
47 | 49 |
} |
48 |
|
|
50 |
@Override |
|
51 |
public boolean onCreateOptionsMenu(Menu menu) { |
|
52 |
super.onCreateOptionsMenu(menu); |
|
53 |
menu.findItem(R.id.add_container).setVisible(false); |
|
54 |
return true; |
|
55 |
} |
|
49 | 56 |
protected ArrayList<Container> loadContainersInner() throws CloudServersException{ |
50 | 57 |
ArrayList<Container> result = new ArrayList<Container>(); |
51 | 58 |
List<String> users = ((AndroidCloudApplication)getContext().getApplicationContext()).getOthers(); |
b/src/com/rackspace/cloud/android/TabViewActivity.java | ||
---|---|---|
37 | 37 |
|
38 | 38 |
TabHost.TabSpec spec = tabs.newTabSpec("tab1"); |
39 | 39 |
spec.setContent(new Intent(this, ListContainerActivity.class)); |
40 |
spec.setIndicator("Cloud Files",
|
|
41 |
getResources().getDrawable(R.drawable.cloudfiles));
|
|
40 |
spec.setIndicator("Pithos",
|
|
41 |
getResources().getDrawable(R.drawable.pithos_tab_icon));
|
|
42 | 42 |
tabs.addTab(spec); |
43 | 43 |
|
44 | 44 |
spec = tabs.newTabSpec("tab2"); |
45 | 45 |
spec.setContent(new Intent(this, PithosMySharedActivity.class)); |
46 | 46 |
spec.setIndicator("MyShared", |
47 |
getResources().getDrawable(R.drawable.cloudfiles));
|
|
47 |
getResources().getDrawable(R.drawable.myshared));
|
|
48 | 48 |
tabs.addTab(spec); |
49 | 49 |
|
50 | 50 |
spec = tabs.newTabSpec("tab3"); |
51 | 51 |
spec.setContent(new Intent(this, PithosOthersActivity.class)); |
52 | 52 |
spec.setIndicator("Others", |
53 |
getResources().getDrawable(R.drawable.cloudfiles));
|
|
53 |
getResources().getDrawable(R.drawable.othersshared));
|
|
54 | 54 |
tabs.addTab(spec); |
55 | 55 |
|
56 | 56 |
spec = tabs.newTabSpec("tab4"); |
57 | 57 |
spec.setContent(new Intent(this, PithosGroupsActivity.class)); |
58 | 58 |
spec.setIndicator("Groups", |
59 |
getResources().getDrawable(R.drawable.cloudfiles));
|
|
59 |
getResources().getDrawable(R.drawable.groups_tab));
|
|
60 | 60 |
tabs.addTab(spec); |
61 | 61 |
/* |
62 | 62 |
spec = tabs.newTabSpec("tab1"); |
Also available in: Unified diff