diff options
Diffstat (limited to 'res/layout/dream_info_row.xml')
-rw-r--r-- | res/layout/dream_info_row.xml | 101 |
1 files changed, 38 insertions, 63 deletions
diff --git a/res/layout/dream_info_row.xml b/res/layout/dream_info_row.xml index 7ed26cb..ef07c43 100644 --- a/res/layout/dream_info_row.xml +++ b/res/layout/dream_info_row.xml @@ -13,94 +13,69 @@ See the License for the specific language governing permissions and limitations under the License. --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="wrap_content" + android:minHeight="?android:attr/listPreferredItemHeight" + android:orientation="horizontal" android:paddingStart="?android:attr/listPreferredItemPaddingStart" - android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"> + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" + android:background="?android:attr/selectableItemBackground" > - <!-- Dream selectable row (icon, caption, radio button) --> + <!-- Dream icon --> - <RelativeLayout - android:id="@android:id/widget_frame" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_toStartOf="@+id/divider" - android:clickable="true" - android:focusable="true" - android:background="?android:attr/selectableItemBackground" > - - <!-- Dream icon --> - - <ImageView - android:id="@android:id/icon" - android:layout_width="@android:dimen/app_icon_size" - android:layout_height="@android:dimen/app_icon_size" - android:layout_centerVertical="true" - android:layout_marginBottom="10dp" - android:layout_marginStart="0dp" - android:layout_marginEnd="6dp" - android:layout_marginTop="10dp" - android:contentDescription="@null" - android:maxHeight="@android:dimen/app_icon_size" - android:maxWidth="@android:dimen/app_icon_size" - android:scaleType="fitCenter" /> + <ImageView + android:id="@android:id/icon" + android:layout_width="@android:dimen/app_icon_size" + android:layout_height="@android:dimen/app_icon_size" + android:layout_gravity="center_vertical" + android:layout_marginEnd="6dp" + android:contentDescription="@null" + android:scaleType="fitCenter" /> - <!-- Dream caption --> + <!-- Dream caption --> - <TextView - android:id="@android:id/title" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_toStartOf="@android:id/button1" - android:layout_toEndOf="@android:id/icon" - android:ellipsize="end" - android:singleLine="true" - android:textAppearance="?android:attr/textAppearanceMedium" - android:textAlignment="viewStart" - android:labelFor="@android:id/button2" /> + <TextView + android:id="@android:id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_gravity="center_vertical" + android:ellipsize="end" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceMedium" + android:textAlignment="viewStart" /> - <!-- Dream radio button --> + <!-- Dream radio button --> - <RadioButton - android:id="@android:id/button1" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_alignParentEnd="true" - android:layout_centerVertical="true" - android:duplicateParentState="true" - android:clickable="false" - android:focusable="false" /> - </RelativeLayout> + <RadioButton + android:id="@+id/radio" + android:layout_width="wrap_content" + android:layout_height="match_parent" + android:duplicateParentState="true" + android:clickable="false" + android:focusable="false" /> <!-- Divider --> <ImageView - android:id="@id/divider" + android:id="@+id/divider" android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_centerVertical="true" - android:layout_toStartOf="@android:id/button2" android:contentDescription="@null" android:src="@drawable/nav_divider" /> <!-- Settings icon --> <ImageView - android:id="@android:id/button2" + android:id="@+id/settings" android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_alignBottom="@android:id/widget_frame" - android:layout_alignParentEnd="true" - android:layout_alignTop="@android:id/widget_frame" - android:layout_centerVertical="true" - android:layout_margin="0dip" - android:background="?android:attr/selectableItemBackground" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" android:contentDescription="@string/screensaver_settings_button" android:padding="8dip" android:clickable="true" android:focusable="true" android:src="@drawable/ic_bt_config" /> -</RelativeLayout> +</LinearLayout> |