diff options
| author | Yorke Lee <yorkelee@google.com> | 2014-11-17 17:41:39 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-17 17:41:40 +0000 |
| commit | 91fd2c00f2e27ec08f8075fd332ae6fd2418967e (patch) | |
| tree | 48d68f0e15bb7fdb91f1eb426c1f562196f6f532 | |
| parent | fa14d610083fcdd3cc327a534d4a2a83008c3509 (diff) | |
| parent | b6f9f4a64b3d61d7dfcdf827c899c18581ea867d (diff) | |
Merge "Fix for empty list view text being obscured" into lmp-mr1-dev
| -rw-r--r-- | res/layout/empty_list_view.xml | 49 | ||||
| -rw-r--r-- | res/values/dimens.xml | 1 |
2 files changed, 22 insertions, 28 deletions
diff --git a/res/layout/empty_list_view.xml b/res/layout/empty_list_view.xml index 0313b0073..7f961a350 100644 --- a/res/layout/empty_list_view.xml +++ b/res/layout/empty_list_view.xml @@ -13,37 +13,30 @@ See the License for the specific language governing permissions and limitations under the License. --> - -<RelativeLayout +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + android:paddingTop="@dimen/empty_list_message_top_padding" + android:paddingBottom="@dimen/actionbar_and_tab_height" android:minHeight="?android:attr/listPreferredItemHeight"> - <LinearLayout - android:layout_width="match_parent" + <ImageView + android:id="@+id/emptyListViewImage" android:layout_height="wrap_content" - android:orientation="vertical" - android:paddingBottom="@dimen/actionbar_and_tab_height" - android:layout_centerInParent="true" > - - <ImageView - android:id="@+id/emptyListViewImage" - android:layout_height="wrap_content" - android:layout_width="match_parent" - android:gravity="center_horizontal" /> - - <TextView - android:id="@+id/emptyListViewMessage" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:minHeight="84dp" - android:gravity="center_horizontal|top" - android:textSize="@dimen/empty_list_message_text_size" - android:textColor="@color/empty_list_text_color" - android:paddingRight="16dp" - android:paddingLeft="16dp" /> - - </LinearLayout> + android:layout_width="match_parent" + android:gravity="center_horizontal" /> -</RelativeLayout> + <TextView + android:id="@+id/emptyListViewMessage" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:minHeight="84dp" + android:gravity="center_horizontal|top" + android:textSize="@dimen/empty_list_message_text_size" + android:textColor="@color/empty_list_text_color" + android:paddingRight="16dp" + android:paddingLeft="16dp" /> + +</LinearLayout> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 7096148a1..b8b93cb0a 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -138,6 +138,7 @@ <!-- Length of dialpad's shadows in dialer. --> <dimen name="shadow_length">10dp</dimen> + <dimen name="empty_list_message_top_padding">20dp</dimen> <dimen name="empty_list_message_text_size">16sp</dimen> <!-- Dimensions for individual preference cards --> |