Use a separate personal/work tabs layout for the widget picker

1. Apps are feminine while widgets are masculine in some languages.
   We should use a different set of strings to ensure strings are
   translated with the right context.
2. We will be using a different theme for widget tabs. Let's keep
   the layout separate.

Bug: 184613311
Test: manual
Change-Id: I88df8ca6091e4b6ddf81f34f180a6ce2cada16e3
This commit is contained in:
Steven Ng
2021-04-06 19:22:21 +01:00
parent d69407c02e
commit fd604ee7ae
5 changed files with 54 additions and 2 deletions

View File

@@ -40,7 +40,7 @@
<include layout="@layout/floating_header_content" />
<include layout="@layout/personal_work_tabs" />
<include layout="@layout/all_apps_personal_work_tabs" />
</com.android.launcher3.allapps.FloatingHeaderView>
<include

View File

@@ -38,7 +38,7 @@
</com.android.launcher3.workprofile.PersonalWorkPagedView>
<include layout="@layout/personal_work_tabs"
<include layout="@layout/widgets_personal_work_tabs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp" />

View File

@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
~ Copyright (C) 2021 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.workprofile.PersonalWorkSlidingTabStrip
xmlns:android="http://schemas.android.com/apk/res/android"
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"
android:elevation="2dp"
style="@style/TextHeadline">
<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:text="@string/widgets_full_sheet_personal_tab"
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:text="@string/widgets_full_sheet_work_tab"
android:textColor="@color/all_apps_tab_text"
android:textSize="14sp" />
</com.android.launcher3.workprofile.PersonalWorkSlidingTabStrip>

View File

@@ -90,6 +90,10 @@
<!-- Text shown when there are no matching widget search results for user's search query.
[CHAR_LIMIT=none] -->
<string name="no_search_results">No search results</string>
<!-- Tab label. A user can tap this tab to access their personal widgets. [CHAR_LIMIT=25] -->
<string name="widgets_full_sheet_personal_tab">Personal</string>
<!-- Tab label. A user can tap this tab to access their work widgets. [CHAR_LIMIT=25] -->
<string name="widgets_full_sheet_work_tab">Work</string>
<!-- All Apps -->
<!-- Search bar text in the apps view. [CHAR_LIMIT=50] -->