Unverified Commit a3159ad7 authored by Vitalii Koshura's avatar Vitalii Koshura

Merge branch 'android-fix-collapse-issue' into upstream_master

Signed-off-by: default avatarVitalii Koshura <lestat.de.lionkur@gmail.com>
parents bffce602 94e2f2ff
...@@ -44,7 +44,6 @@ ...@@ -44,7 +44,6 @@
android:layout_height="0dip" android:layout_height="0dip"
android:padding="5dp" android:padding="5dp"
android:clickable="true" android:clickable="true"
android:focusable="true"
android:layout_margin="5dp" android:layout_margin="5dp"
android:background="@drawable/shape_button_blue" android:background="@drawable/shape_button_blue"
android:textColor="@color/white_smoke" android:textColor="@color/white_smoke"
......
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:clickable="true" android:clickable="true">
android:focusable="true">
<RelativeLayout <RelativeLayout
android:layout_width="60dp" android:layout_width="60dp"
......
...@@ -50,7 +50,6 @@ ...@@ -50,7 +50,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="5dp" android:padding="5dp"
android:clickable="true" android:clickable="true"
android:focusable="true"
android:layout_margin="5dp" android:layout_margin="5dp"
android:background="@drawable/shape_button_blue" android:background="@drawable/shape_button_blue"
android:textColor="@color/white_smoke" android:textColor="@color/white_smoke"
...@@ -64,7 +63,6 @@ ...@@ -64,7 +63,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="5dp" android:padding="5dp"
android:clickable="true" android:clickable="true"
android:focusable="true"
android:layout_margin="5dp" android:layout_margin="5dp"
android:background="@drawable/shape_button_red" android:background="@drawable/shape_button_red"
android:textColor="@color/white_smoke" android:textColor="@color/white_smoke"
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:clickable="true" android:clickable="true"
android:focusable="true"
android:padding="5dp"> android:padding="5dp">
<LinearLayout <LinearLayout
......
...@@ -163,7 +163,6 @@ ...@@ -163,7 +163,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:clickable="true" android:clickable="true"
android:focusable="true"
android:textColor="@color/dark_blue"/> android:textColor="@color/dark_blue"/>
</LinearLayout> </LinearLayout>
......
...@@ -21,8 +21,7 @@ ...@@ -21,8 +21,7 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:clickable="true" android:clickable="true">
android:focusable="true">
<RelativeLayout <RelativeLayout
android:id="@+id/icon_background" android:id="@+id/icon_background"
......
...@@ -22,7 +22,6 @@ ...@@ -22,7 +22,6 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:clickable="true" android:clickable="true"
android:focusable="true"
android:background="@drawable/shape_light_blue_background_wo_stroke"> android:background="@drawable/shape_light_blue_background_wo_stroke">
<RelativeLayout <RelativeLayout
......
...@@ -25,7 +25,6 @@ ...@@ -25,7 +25,6 @@
android:id="@+id/tasksList" android:id="@+id/tasksList"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:clickable="true" android:clickable="true"></ListView>
android:focusable="true"></ListView>
</LinearLayout> </LinearLayout>
...@@ -208,7 +208,6 @@ ...@@ -208,7 +208,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="true" android:clickable="true"
android:focusable="true"
android:contentDescription="@drawable/resumetask" android:contentDescription="@drawable/resumetask"
android:src="@drawable/resumetask" android:src="@drawable/resumetask"
android:layout_marginTop="5dp"/> android:layout_marginTop="5dp"/>
...@@ -218,7 +217,6 @@ ...@@ -218,7 +217,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:clickable="true" android:clickable="true"
android:focusable="true"
android:contentDescription="@drawable/aborttask" android:contentDescription="@drawable/aborttask"
android:src="@drawable/aborttask" android:src="@drawable/aborttask"
android:layout_marginTop="5dp" android:layout_marginTop="5dp"
......
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