Commit 0928130c authored by Grigory Fedorov's avatar Grigory Fedorov

Old style "up" button removed. Status indicator made unclickable.

parent 60df3a6d
...@@ -65,8 +65,6 @@ public class ContactTitleInflater { ...@@ -65,8 +65,6 @@ public class ContactTitleInflater {
final TextView statusTextView = (TextView) titleView final TextView statusTextView = (TextView) titleView
.findViewById(R.id.status_text); .findViewById(R.id.status_text);
final View shadowView = titleView.findViewById(R.id.shadow); final View shadowView = titleView.findViewById(R.id.shadow);
final ImageButton backButton = (ImageButton) titleView
.findViewById(R.id.back_button);
titleView.setBackgroundDrawable(titleAccountBackground); titleView.setBackgroundDrawable(titleAccountBackground);
nameView.setText(abstractContact.getName()); nameView.setText(abstractContact.getName());
statusModeView.setImageLevel(abstractContact.getStatusMode() statusModeView.setImageLevel(abstractContact.getStatusMode()
...@@ -95,12 +93,6 @@ public class ContactTitleInflater { ...@@ -95,12 +93,6 @@ public class ContactTitleInflater {
shadowView.setVisibility(View.GONE); shadowView.setVisibility(View.GONE);
else else
shadowView.setVisibility(View.VISIBLE); shadowView.setVisibility(View.VISIBLE);
backButton.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
activity.finish();
}
});
} }
} }
...@@ -13,15 +13,6 @@ ...@@ -13,15 +13,6 @@
along with this program. If not, see http://www.gnu.org/licenses/. along with this program. If not, see http://www.gnu.org/licenses/.
--> -->
<selector xmlns:android="http://schemas.android.com/apk/res/android"> <selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_pressed="true"
android:drawable="@drawable/btn_status_mode_pressed" />
<item
android:state_selected="true"
android:drawable="@drawable/btn_status_mode_focused" />
<item
android:state_focused="true"
android:drawable="@drawable/btn_status_mode_focused" />
<item <item
android:drawable="@drawable/btn_status_mode_normal" /> android:drawable="@drawable/btn_status_mode_normal" />
</selector> </selector>
...@@ -25,13 +25,6 @@ ...@@ -25,13 +25,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
> >
<ImageButton
android:id="@+id/back_button"
android:src="@drawable/btn_title_back"
android:background="@drawable/title_logo"
android:layout_width="wrap_content"
android:layout_height="match_parent"
/>
<LinearLayout <LinearLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
...@@ -86,7 +79,6 @@ ...@@ -86,7 +79,6 @@
android:src="@drawable/ic_status" android:src="@drawable/ic_status"
android:paddingLeft="@dimen/active_chat_padding_right" android:paddingLeft="@dimen/active_chat_padding_right"
android:paddingRight="@dimen/active_chat_padding_right" android:paddingRight="@dimen/active_chat_padding_right"
android:background="@drawable/btn_status_mode"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
/> />
......
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