diff options
author | Winson Chung <winsonc@google.com> | 2015-05-13 16:28:15 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-05-13 16:30:07 +0000 |
commit | 927b36ae0b5bf85ba26bd8c8f88918fdb18df1ff (patch) | |
tree | 1d6af56d53d70e2b7ae9f6a9d1e234b53055126c /res/layout | |
parent | bfcb652c77fe47fe75115ca299eac93217677e1c (diff) | |
parent | 208ed75cfdb02e571273d73d056d8ed7f6f756eb (diff) | |
download | android_packages_apps_Trebuchet-927b36ae0b5bf85ba26bd8c8f88918fdb18df1ff.tar.gz android_packages_apps_Trebuchet-927b36ae0b5bf85ba26bd8c8f88918fdb18df1ff.tar.bz2 android_packages_apps_Trebuchet-927b36ae0b5bf85ba26bd8c8f88918fdb18df1ff.zip |
Merge "Pulling out predictions into another row view." into ub-launcher3-burnaby
Diffstat (limited to 'res/layout')
-rw-r--r-- | res/layout/all_apps_button.xml | 2 | ||||
-rw-r--r-- | res/layout/application.xml | 2 | ||||
-rw-r--r-- | res/layout/apps_grid_icon_view.xml (renamed from res/layout/apps_grid_row_icon_view.xml) | 2 | ||||
-rw-r--r-- | res/layout/apps_list_view.xml | 43 | ||||
-rw-r--r-- | res/layout/apps_prediction_bar_icon_view.xml | 29 | ||||
-rw-r--r-- | res/layout/folder_application.xml | 2 | ||||
-rw-r--r-- | res/layout/folder_icon.xml | 2 |
7 files changed, 59 insertions, 23 deletions
diff --git a/res/layout/all_apps_button.xml b/res/layout/all_apps_button.xml index 9d6d82bb2..68cc10932 100644 --- a/res/layout/all_apps_button.xml +++ b/res/layout/all_apps_button.xml @@ -15,5 +15,5 @@ --> <TextView xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/WorkspaceIcon" + style="@style/Icon" android:focusable="true" /> diff --git a/res/layout/application.xml b/res/layout/application.xml index c21dea070..831cee5b0 100644 --- a/res/layout/application.xml +++ b/res/layout/application.xml @@ -15,5 +15,5 @@ --> <com.android.launcher3.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/WorkspaceIcon" + style="@style/Icon" android:focusable="true" /> diff --git a/res/layout/apps_grid_row_icon_view.xml b/res/layout/apps_grid_icon_view.xml index acb3da334..67d7d50e7 100644 --- a/res/layout/apps_grid_row_icon_view.xml +++ b/res/layout/apps_grid_icon_view.xml @@ -16,7 +16,7 @@ <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" + style="@style/Icon.AllApps" android:id="@+id/icon" android:layout_width="wrap_content" android:layout_height="wrap_content" diff --git a/res/layout/apps_list_view.xml b/res/layout/apps_list_view.xml index ddcb639b8..ef20323c1 100644 --- a/res/layout/apps_list_view.xml +++ b/res/layout/apps_list_view.xml @@ -13,20 +13,37 @@ See the License for the specific language governing permissions and limitations under the License. --> -<LinearLayout +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/apps_list" android:layout_width="match_parent" android:layout_height="match_parent" - android:orientation="vertical" android:elevation="15dp" android:visibility="gone" android:focusableInTouchMode="true"> + <com.android.launcher3.AppsContainerRecyclerView + android:id="@+id/apps_list_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_marginTop="@dimen/apps_search_bar_height" + android:layout_gravity="center_horizontal|top" + android:clipToPadding="false" + android:focusable="true" + android:descendantFocusability="afterDescendants" /> + <LinearLayout + android:id="@+id/prediction_bar" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/apps_search_bar_height" + android:orientation="horizontal" + android:visibility="invisible"> + </LinearLayout> + + <!-- We always want the search bar on top, so it goes last. --> <FrameLayout android:id="@+id/header" android:layout_width="match_parent" android:layout_height="@dimen/apps_search_bar_height" - android:orientation="horizontal" android:background="@drawable/apps_search_bg"> <LinearLayout android:id="@+id/app_search_container" @@ -40,8 +57,8 @@ android:layout_height="wrap_content" android:layout_gravity="start|center_vertical" android:layout_marginStart="4dp" - android:paddingTop="12dp" - android:paddingBottom="12dp" + android:paddingTop="13dp" + android:paddingBottom="13dp" android:contentDescription="@string/all_apps_button_label" android:src="@drawable/ic_arrow_back_grey" /> <com.android.launcher3.AppsContainerSearchEditTextView @@ -69,19 +86,9 @@ android:layout_height="wrap_content" android:layout_gravity="end|center_vertical" android:layout_marginEnd="6dp" - android:paddingTop="12dp" - android:paddingBottom="12dp" + android:paddingTop="13dp" + android:paddingBottom="13dp" android:contentDescription="@string/apps_view_search_bar_hint" android:src="@drawable/ic_search_grey" /> </FrameLayout> - <com.android.launcher3.AppsContainerRecyclerView - android:id="@+id/apps_list_view" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_gravity="center" - android:paddingTop="12dp" - android:paddingBottom="12dp" - android:clipToPadding="false" - android:focusable="true" - android:descendantFocusability="afterDescendants" /> -</LinearLayout>
\ No newline at end of file +</FrameLayout>
\ No newline at end of file diff --git a/res/layout/apps_prediction_bar_icon_view.xml b/res/layout/apps_prediction_bar_icon_view.xml new file mode 100644 index 000000000..4a6f1574b --- /dev/null +++ b/res/layout/apps_prediction_bar_icon_view.xml @@ -0,0 +1,29 @@ +<?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/Icon.AllApps" + android:id="@+id/icon" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_gravity="center" + android:layout_weight="1" + android:focusable="true" + android:background="@drawable/focusable_view_bg" + launcher:deferShadowGeneration="true" + launcher:iconDisplay="all_apps" /> + diff --git a/res/layout/folder_application.xml b/res/layout/folder_application.xml index b48b61331..4d003313e 100644 --- a/res/layout/folder_application.xml +++ b/res/layout/folder_application.xml @@ -15,5 +15,5 @@ --> <com.android.launcher3.BubbleTextView xmlns:android="http://schemas.android.com/apk/res/android" - style="@style/WorkspaceIcon.Folder" + style="@style/Icon.Folder" android:focusable="true" /> diff --git a/res/layout/folder_icon.xml b/res/layout/folder_icon.xml index fd45d7685..d9a7671af 100644 --- a/res/layout/folder_icon.xml +++ b/res/layout/folder_icon.xml @@ -28,7 +28,7 @@ android:antialias="true" android:src="@drawable/portal_ring_inner_holo"/> <com.android.launcher3.BubbleTextView - style="@style/WorkspaceIcon" + style="@style/Icon" android:id="@+id/folder_icon_name" android:layout_gravity="top" android:layout_width="match_parent" |