diff options
Diffstat (limited to 'res')
| -rw-r--r-- | res/layout/all_apps.xml | 43 | ||||
| -rw-r--r-- | res/layout/all_apps_floating_header.xml | 58 | ||||
| -rw-r--r-- | res/layout/predictions_view.xml | 19 | ||||
| -rw-r--r-- | res/values/config.xml | 3 |
4 files changed, 62 insertions, 61 deletions
diff --git a/res/layout/all_apps.xml b/res/layout/all_apps.xml index 8cf32bd0e..2ce6b8cfd 100644 --- a/res/layout/all_apps.xml +++ b/res/layout/all_apps.xml @@ -31,48 +31,7 @@ <include layout="@layout/all_apps_fast_scroller" /> - <com.android.launcher3.allapps.FloatingHeaderView - android:id="@+id/all_apps_header" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="@dimen/all_apps_header_top_padding" - android:clipToPadding="false" - android:layout_below="@id/search_container_all_apps" > - - <include layout="@layout/predictions_view" android:id="@+id/header_content" /> - - <com.android.launcher3.allapps.PersonalWorkSlidingTabStrip - android:id="@+id/tabs" - android:layout_width="match_parent" - android:layout_height="@dimen/all_apps_header_tab_height" - android:layout_marginLeft="@dimen/all_apps_tabs_side_padding" - android:layout_marginRight="@dimen/all_apps_tabs_side_padding" - android:layout_below="@id/header_content" - android:orientation="horizontal"> - <Button - android:id="@+id/tab_personal" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="1" - android:background="?android:attr/selectableItemBackground" - android:fontFamily="sans-serif-medium" - android:text="@string/all_apps_personal_tab" - android:textAllCaps="true" - android:textColor="@color/all_apps_tab_text" - android:textSize="14sp"/> - <Button - android:id="@+id/tab_work" - android:layout_width="0dp" - android:layout_height="match_parent" - android:layout_weight="1" - android:background="?android:attr/selectableItemBackground" - android:fontFamily="sans-serif-medium" - android:text="@string/all_apps_work_tab" - android:textAllCaps="true" - android:textColor="@color/all_apps_work_tab_text" - android:textSize="14sp"/> - </com.android.launcher3.allapps.PersonalWorkSlidingTabStrip> - </com.android.launcher3.allapps.FloatingHeaderView> + <include layout="@layout/all_apps_floating_header" /> <!-- Note: we are reusing/repurposing a system attribute for search layout, because of a platform bug, which prevents using custom attributes in <include> tag --> diff --git a/res/layout/all_apps_floating_header.xml b/res/layout/all_apps_floating_header.xml new file mode 100644 index 000000000..166725da3 --- /dev/null +++ b/res/layout/all_apps_floating_header.xml @@ -0,0 +1,58 @@ +<?xml version="1.0" encoding="utf-8"?> +<!-- Copyright (C) 2018 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.allapps.FloatingHeaderView + xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/all_apps_header" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@id/search_container_all_apps" + android:clipToPadding="false" + android:paddingTop="@dimen/all_apps_header_top_padding" + android:orientation="vertical" > + + <com.android.launcher3.allapps.PersonalWorkSlidingTabStrip + android:id="@+id/tabs" + android:layout_width="match_parent" + android:layout_height="@dimen/all_apps_header_tab_height" + android:layout_marginLeft="@dimen/all_apps_tabs_side_padding" + android:layout_marginRight="@dimen/all_apps_tabs_side_padding" + android:orientation="horizontal"> + + <Button + android:id="@+id/tab_personal" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:background="?android:attr/selectableItemBackground" + android:fontFamily="sans-serif-medium" + android:text="@string/all_apps_personal_tab" + android:textAllCaps="true" + android:textColor="@color/all_apps_tab_text" + android:textSize="14sp" /> + + <Button + android:id="@+id/tab_work" + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:background="?android:attr/selectableItemBackground" + android:fontFamily="sans-serif-medium" + android:text="@string/all_apps_work_tab" + android:textAllCaps="true" + android:textColor="@color/all_apps_work_tab_text" + android:textSize="14sp" /> + </com.android.launcher3.allapps.PersonalWorkSlidingTabStrip> +</com.android.launcher3.allapps.FloatingHeaderView> diff --git a/res/layout/predictions_view.xml b/res/layout/predictions_view.xml deleted file mode 100644 index 280290c6a..000000000 --- a/res/layout/predictions_view.xml +++ /dev/null @@ -1,19 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- Copyright (C) 2017 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.allapps.PredictionRowView - xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="wrap_content" />
\ No newline at end of file diff --git a/res/values/config.xml b/res/values/config.xml index 209620038..3dddac22d 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -92,6 +92,9 @@ <!-- Name of a user event dispatcher class. --> <string name="user_event_dispatcher_class" translatable="false"></string> + <!-- Name of an app transition manager class. --> + <string name="app_transition_manager_class" translatable="false"></string> + <!-- Name of a color extraction implementation class. --> <string name="color_extraction_impl_class" translatable="false"></string> |