diff options
| author | Sander Alewijnse <salewijnse@google.com> | 2014-08-07 11:49:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-08-05 00:19:02 +0000 |
| commit | 6a39bc68aea91483804d2ab8635159803208095d (patch) | |
| tree | 0b88466dd48175575fb60cc86c8c8a1b95f50ef2 /res/layout | |
| parent | f34c3501948190acf44defefba8eb161ec6dc07b (diff) | |
| parent | cd40220372e3bac5bd52a8bfa4d4fce0e7d30078 (diff) | |
| download | packages_apps_Settings-6a39bc68aea91483804d2ab8635159803208095d.zip packages_apps_Settings-6a39bc68aea91483804d2ab8635159803208095d.tar.gz packages_apps_Settings-6a39bc68aea91483804d2ab8635159803208095d.tar.bz2 | |
Merge "Prevent launcher switching in Settings app." into lmp-dev
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/preference_home_app.xml | 38 |
1 files changed, 30 insertions, 8 deletions
diff --git a/res/layout/preference_home_app.xml b/res/layout/preference_home_app.xml index 0ee154e..9415752 100644 --- a/res/layout/preference_home_app.xml +++ b/res/layout/preference_home_app.xml @@ -30,6 +30,7 @@ android:clickable="true" android:gravity="center_vertical" android:background="?android:attr/selectableItemBackground" > + <RadioButton android:id="@+id/home_radio" android:layout_width="wrap_content" @@ -40,6 +41,7 @@ android:orientation="vertical" android:clickable="false" android:focusable="false" /> + <ImageView android:id="@+android:id/icon" android:layout_width="48dp" @@ -47,17 +49,35 @@ android:layout_gravity="center" android:minWidth="48dp" android:scaleType="centerInside" - android:layout_marginEnd="@*android:dimen/preference_item_padding_inner" - /> - <TextView - android:id="@+android:id/title" + android:layout_marginEnd="@*android:dimen/preference_item_padding_inner" /> + + <LinearLayout android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:singleLine="true" + android:layout_height="match_parent" android:layout_weight="1" - android:textAppearance="?android:attr/textAppearanceMedium" - android:ellipsize="end" /> + android:focusable="true" + android:clickable="true" + android:gravity="center_vertical" + android:orientation="vertical"> + + <TextView + android:id="@+android:id/title" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:singleLine="true" + android:textAppearance="?android:attr/textAppearanceMedium" + android:ellipsize="end" /> + + <TextView + android:id="@+android:id/summary" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceSmall" /> + + </LinearLayout> + </LinearLayout> + <View android:id="@+id/home_divider" android:layout_width="2dip" @@ -65,6 +85,7 @@ android:layout_marginTop="5dip" android:layout_marginBottom="5dip" android:background="@android:drawable/divider_horizontal_dark" /> + <ImageView android:id="@+id/home_app_uninstall" android:layout_width="wrap_content" @@ -77,4 +98,5 @@ android:clickable="true" android:focusable="true" android:background="?android:attr/selectableItemBackground" /> + </LinearLayout> |