aboutsummaryrefslogtreecommitdiff
path: root/res/layout/option_item_radio_button.xml
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout/option_item_radio_button.xml')
-rw-r--r--res/layout/option_item_radio_button.xml54
1 files changed, 29 insertions, 25 deletions
diff --git a/res/layout/option_item_radio_button.xml b/res/layout/option_item_radio_button.xml
index 6e6a05a4..2e4fa11a 100644
--- a/res/layout/option_item_radio_button.xml
+++ b/res/layout/option_item_radio_button.xml
@@ -1,36 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
+<!--
+ ~ Copyright (C) 2015 The Android Open Source Project
+ ~
+ ~ Licensed under the Apache License, Version 2.0 (the "License");
+ ~ you may not use this file except in compliance with the License.
+ ~ You may obtain a copy of the License at
+ ~
+ ~ http://www.apache.org/licenses/LICENSE-2.0
+ ~
+ ~ Unless required by applicable law or agreed to in writing, software
+ ~ distributed under the License is distributed on an "AS IS" BASIS,
+ ~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ ~ See the License for the specific language governing permissions and
+ ~ limitations under the License.
+ -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="horizontal"
android:layout_width="match_parent"
- android:layout_height="@dimen/option_item_height"
- android:paddingLeft="@dimen/side_panel_padding_left"
+ android:layout_height="wrap_content"
+ android:paddingStart="@dimen/side_panel_padding_start"
+ android:paddingEnd="@dimen/side_panel_padding_end"
android:focusable="true"
- android:focusableInTouchMode="true"
- android:background="@drawable/debug_option_background" >
+ android:background="?android:attr/selectableItemBackground" >
<RadioButton
android:id="@+id/radio_button"
- android:layout_width="match_parent"
+ android:layout_width="@dimen/option_item_compound_button_width"
+ android:layout_height="match_parent"
+ android:layout_weight="0"
+ android:background="@null"
+ android:clickable="false" />
+
+ <include layout="@layout/option_item_common"
+ android:layout_width="0dp"
android:layout_height="match_parent"
- android:paddingLeft="@dimen/option_item_padding_left"
- android:clickable="false"
- android:fontFamily="@string/font"
- android:textSize="@dimen/option_item_text_size"
- android:textColor="@color/side_panel_item_text" />
+ android:layout_weight="1" />
-</LinearLayout> \ No newline at end of file
+</LinearLayout>