diff options
author | Winson Chung <winsonc@google.com> | 2015-05-11 22:04:36 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-11 22:04:36 +0000 |
commit | 814f1eb8058565f6a1299dd1cd858b163f4cbfdc (patch) | |
tree | e22add4221d3179dfd117a34c0fab1924b3ef111 /res | |
parent | 1d7a55668e0a36a7ab150db2df4007dd5810bde8 (diff) | |
parent | 4ac30068732c7216288999d255a823adb7ca7c12 (diff) | |
download | android_packages_apps_Trebuchet-814f1eb8058565f6a1299dd1cd858b163f4cbfdc.tar.gz android_packages_apps_Trebuchet-814f1eb8058565f6a1299dd1cd858b163f4cbfdc.tar.bz2 android_packages_apps_Trebuchet-814f1eb8058565f6a1299dd1cd858b163f4cbfdc.zip |
Merge "Initial changes to support predicted apps." into ub-launcher3-burnaby
Diffstat (limited to 'res')
-rw-r--r-- | res/layout/apps_grid_row_icon_view.xml | 4 | ||||
-rw-r--r-- | res/layout/apps_list_row_icon_view.xml | 29 | ||||
-rw-r--r-- | res/layout/apps_list_view.xml | 4 | ||||
-rw-r--r-- | res/values-sw600dp/dimens.xml | 1 | ||||
-rw-r--r-- | res/values-sw720dp/dimens.xml | 2 | ||||
-rw-r--r-- | res/values/dimens.xml | 2 |
6 files changed, 10 insertions, 32 deletions
diff --git a/res/layout/apps_grid_row_icon_view.xml b/res/layout/apps_grid_row_icon_view.xml index 81e74b985..149e28e2d 100644 --- a/res/layout/apps_grid_row_icon_view.xml +++ b/res/layout/apps_grid_row_icon_view.xml @@ -21,8 +21,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="left|center_vertical" - android:paddingTop="8dp" - android:paddingBottom="8dp" + android:paddingTop="@dimen/apps_icon_top_bottom_padding" + android:paddingBottom="@dimen/apps_icon_top_bottom_padding" android:focusable="true" android:background="@drawable/focusable_view_bg" launcher:deferShadowGeneration="true" /> diff --git a/res/layout/apps_list_row_icon_view.xml b/res/layout/apps_list_row_icon_view.xml deleted file mode 100644 index 867dbdc99..000000000 --- a/res/layout/apps_list_row_icon_view.xml +++ /dev/null @@ -1,29 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- 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. ---> - -<com.android.launcher3.BubbleTextView - xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:launcher="http://schemas.android.com/apk/res-auto" - style="@style/WorkspaceIcon.AppsCustomize" - android:id="@+id/application_icon" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:focusable="true" - android:background="@drawable/focusable_view_bg" - launcher:iconPaddingOverride="24dp" - launcher:textSizeOverride="16dp" - launcher:layoutHorizontal="true" - launcher:deferShadowGeneration="true" /> diff --git a/res/layout/apps_list_view.xml b/res/layout/apps_list_view.xml index a726cd8fe..ddcb639b8 100644 --- a/res/layout/apps_list_view.xml +++ b/res/layout/apps_list_view.xml @@ -25,7 +25,7 @@ <FrameLayout android:id="@+id/header" android:layout_width="match_parent" - android:layout_height="52dp" + android:layout_height="@dimen/apps_search_bar_height" android:orientation="horizontal" android:background="@drawable/apps_search_bg"> <LinearLayout @@ -39,6 +39,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="start|center_vertical" + android:layout_marginStart="4dp" android:paddingTop="12dp" android:paddingBottom="12dp" android:contentDescription="@string/all_apps_button_label" @@ -67,6 +68,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="end|center_vertical" + android:layout_marginEnd="6dp" android:paddingTop="12dp" android:paddingBottom="12dp" android:contentDescription="@string/apps_view_search_bar_hint" diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml index 9ecd07dd1..b18464292 100644 --- a/res/values-sw600dp/dimens.xml +++ b/res/values-sw600dp/dimens.xml @@ -22,6 +22,7 @@ <dimen name="apps_grid_view_start_margin">64dp</dimen> <dimen name="apps_view_section_text_size">26sp</dimen> <dimen name="apps_view_row_height">76dp</dimen> + <dimen name="apps_icon_top_bottom_padding">12dp</dimen> <!-- AppsCustomize --> <dimen name="widget_preview_label_margin_top">8dp</dimen> diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml index 68fc1ecaf..cec6b7db0 100644 --- a/res/values-sw720dp/dimens.xml +++ b/res/values-sw720dp/dimens.xml @@ -16,6 +16,8 @@ <resources> <dimen name="app_icon_size">72dp</dimen> + <dimen name="apps_search_bar_height">56dp</dimen> + <dimen name="apps_icon_top_bottom_padding">16dp</dimen> <!-- QSB --> <dimen name="toolbar_button_vertical_padding">8dip</dimen> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index 4d33b88bc..0d066bb7a 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -59,6 +59,8 @@ <dimen name="apps_view_fast_scroll_scrubber_touch_inset">-16dp</dimen> <dimen name="apps_view_fast_scroll_popup_size">64dp</dimen> <dimen name="apps_view_fast_scroll_text_size">40dp</dimen> + <dimen name="apps_search_bar_height">52dp</dimen> + <dimen name="apps_icon_top_bottom_padding">8dp</dimen> <!-- Note: This needs to match the fixed insets for the search box. --> <dimen name="container_fixed_bounds_inset">8dp</dimen> |