Commit 1c332697 authored by Grigory Fedorov's avatar Grigory Fedorov

OccupantList activity: "up" button added.

parent fcbb6053
......@@ -123,7 +123,14 @@
<activity
android:label="@string/occupant_list"
android:name="com.xabber.android.ui.OccupantList"
/>
android:parentActivityName="com.xabber.android.ui.ChatViewer"
>
<!-- Parent activity meta-data to support 4.0 and lower -->
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.xabber.android.ui.ChatViewer" />
</activity>
<activity
android:label="@string/chat_viewer"
android:name="com.xabber.android.ui.ChatViewer"
......
......@@ -61,6 +61,8 @@ public class OccupantList extends ManagedListActivity implements
setContentView(R.layout.list);
listAdapter = new OccupantListAdapter(this, account, room);
setListAdapter(listAdapter);
getSupportActionBar().setDisplayHomeAsUpEnabled(true);
}
@Override
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment