diff options
| author | Mario Bertschler <bmario@google.com> | 2017-11-14 11:32:00 -0800 |
|---|---|---|
| committer | Mario Bertschler <bmario@google.com> | 2017-11-16 17:07:44 -0800 |
| commit | 2153e1c814d571a3666a13df8e0919bb30fdd855 (patch) | |
| tree | 88b6f667db667f13742ee8be556924eeef66ab79 /res | |
| parent | 7149889dc08b3b86126dead1276ec577f44ec6b5 (diff) | |
| download | android_packages_apps_Trebuchet-2153e1c814d571a3666a13df8e0919bb30fdd855.tar.gz android_packages_apps_Trebuchet-2153e1c814d571a3666a13df8e0919bb30fdd855.tar.bz2 android_packages_apps_Trebuchet-2153e1c814d571a3666a13df8e0919bb30fdd855.zip | |
Implementation of PredictionRowView.
> Enable to use floating for prediction row even without tabs.
> Behind ALL_APPS_PREDICTION_ROW_VIEW feature flag.
> Expand/Collapse personal/work tabs in stopped intermediate state.
Bug: 68713881
Change-Id: I7817e7b7c6f572358f2b9a7a347339a9081708ee
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/all_apps.xml | 15 | ||||
| -rw-r--r-- | res/layout/all_apps_tabs.xml | 2 | ||||
| -rw-r--r-- | res/values/dimens.xml | 2 |
3 files changed, 13 insertions, 6 deletions
diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml index 832aaeff4..c42c15c70 100644 --- a/res/layout/all_apps.xml +++ b/res/layout/all_apps.xml @@ -35,21 +35,27 @@ android:id="@+id/all_apps_header" android:layout_width="match_parent" android:layout_height="wrap_content" - android:clickable="true" - android:paddingTop="30dp" + android:paddingTop="@dimen/all_apps_header_top_padding" + android:clipToPadding="false" android:layout_below="@id/search_container_all_apps" > <com.android.launcher3.allapps.PredictionRowView android:id="@+id/header_content" android:layout_width="match_parent" - android:layout_height="wrap_content"/> + android:layout_height="wrap_content" /> + + <include layout="@layout/all_apps_divider" + android:id="@+id/divider" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignBottom="@+id/tabs" /> <com.android.launcher3.views.SlidingTabStrip android:id="@+id/tabs" android:layout_width="match_parent" android:layout_height="@dimen/all_apps_header_tab_height" android:layout_below="@id/header_content" - android:orientation="horizontal"> + android:orientation="horizontal" > <Button android:id="@+id/tab_personal" android:layout_width="0dp" @@ -67,7 +73,6 @@ android:textColor="@color/all_apps_tab_text" android:background="?android:attr/selectableItemBackground"/> </com.android.launcher3.views.SlidingTabStrip> - </RelativeLayout> <!-- Note: we are reusing/repurposing a system attribute for search layout, because of a diff --git a/res/layout/all_apps_tabs.xml b/res/layout/all_apps_tabs.xml index fa1d5914c..54a9b8854 100644 --- a/res/layout/all_apps_tabs.xml +++ b/res/layout/all_apps_tabs.xml @@ -25,7 +25,7 @@ android:clipChildren="false" android:clipToPadding="false" android:descendantFocusability="afterDescendants" - android:paddingTop="30dp"> + android:paddingTop="@dimen/all_apps_header_top_padding"> <include layout="@layout/all_apps_rv_layout" /> diff --git a/res/values/dimens.xml b/res/values/dimens.xml index efe504394..266e0b0ad 100644 --- a/res/values/dimens.xml +++ b/res/values/dimens.xml @@ -92,6 +92,8 @@ <dimen name="all_apps_caret_workspace_offset">18dp</dimen> <dimen name="all_apps_header_tab_height">50dp</dimen> <dimen name="all_apps_tabs_indicator_height">2dp</dimen> + <dimen name="all_apps_header_top_padding">36dp</dimen> + <dimen name="all_apps_prediction_row_divider_height">17dp</dimen> <!-- Search bar in All Apps --> <dimen name="all_apps_header_max_elevation">3dp</dimen> |