diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2014-07-21 20:46:35 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-07-21 15:42:19 +0000 |
| commit | fecda6181dcb4197268fd9846cf01207f5ae3249 (patch) | |
| tree | c39fb4475b0955f4660d5449030ce187c2d1cda5 /res/layout | |
| parent | 193cd11c4b52e313422b74fec46c792aec9a9c06 (diff) | |
| parent | 20b32f25f0867bebfd138749f7ed45cf898942ef (diff) | |
| download | packages_apps_Settings-fecda6181dcb4197268fd9846cf01207f5ae3249.zip packages_apps_Settings-fecda6181dcb4197268fd9846cf01207f5ae3249.tar.gz packages_apps_Settings-fecda6181dcb4197268fd9846cf01207f5ae3249.tar.bz2 | |
Merge "Fix Notification Access layout for tabletUI support" into lmp-dev
Diffstat (limited to 'res/layout')
| -rw-r--r-- | res/layout/managed_service_item.xml | 4 | ||||
| -rw-r--r-- | res/layout/managed_service_settings.xml | 10 | ||||
| -rw-r--r-- | res/layout/notification_app_list.xml | 1 |
3 files changed, 11 insertions, 4 deletions
diff --git a/res/layout/managed_service_item.xml b/res/layout/managed_service_item.xml index 67aaa61..f05c77f 100644 --- a/res/layout/managed_service_item.xml +++ b/res/layout/managed_service_item.xml @@ -22,7 +22,8 @@ android:layout_height="wrap_content" android:minHeight="?android:attr/listPreferredItemHeight" android:orientation="horizontal" - android:paddingEnd="6dip" + android:paddingStart="?android:attr/listPreferredItemPaddingStart" + android:paddingEnd="?android:attr/listPreferredItemPaddingEnd" android:gravity="center_vertical" > @@ -69,7 +70,6 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_vertical" - android:layout_marginEnd="16dip" android:layout_marginStart="16dip" android:focusable="false" android:clickable="false" /> diff --git a/res/layout/managed_service_settings.xml b/res/layout/managed_service_settings.xml index e01da59..b2fc0b2 100644 --- a/res/layout/managed_service_settings.xml +++ b/res/layout/managed_service_settings.xml @@ -18,19 +18,27 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> + <FrameLayout android:layout_width="match_parent" android:layout_height="0px" android:layout_weight="1"> + <ListView android:id="@android:id/list" android:layout_width="match_parent" android:layout_height="match_parent" + android:paddingStart="@dimen/settings_side_margin" + android:paddingEnd="@dimen/settings_side_margin" android:drawSelectorOnTop="false" - android:fastScrollEnabled="true" /> + android:fastScrollEnabled="true" + android:scrollbarStyle="outsideInset" /> + <TextView android:id="@android:id/empty" android:layout_width="match_parent" android:layout_height="match_parent" android:gravity="center" android:textAppearance="?android:attr/textAppearanceMedium" /> + </FrameLayout> + </LinearLayout> diff --git a/res/layout/notification_app_list.xml b/res/layout/notification_app_list.xml index f680e38..2eac287 100644 --- a/res/layout/notification_app_list.xml +++ b/res/layout/notification_app_list.xml @@ -28,7 +28,6 @@ android:paddingEnd="@dimen/settings_side_margin" android:divider="#0000" android:dividerHeight="0px" - android:fastScrollAlwaysVisible="true" android:fastScrollEnabled="true" android:listSelector="#0000" android:scrollbarStyle="outsideInset" /> |