Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 21803095 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add a header container view to the widgets full sheet" into sc-dev

parents 4ffd4f03 167f81b9

res/drawable/bg_widgets_searchbox.xml

0 → 100644
+19 −0
Original line number Diff line number Diff line 
<?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.

-->

<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">

    <solid android:color="#FFFFF7" />

    <corners android:radius="24dp" />

</shape>
 
 No newline at end of file

res/layout/personal_work_tabs.xml

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ 
    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

res/layout/widgets_full_sheet_paged_view.xml

+4 −2
Original line number Diff line number Diff line
@@ -16,13 +16,15 @@ 
<merge xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:launcher="http://schemas.android.com/apk/res-auto">



    <include layout="@layout/personal_work_tabs" />

    <include layout="@layout/personal_work_tabs"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginHorizontal="16dp" />



    <com.android.launcher3.workprofile.PersonalWorkPagedView

        android:id="@+id/widgets_view_pager"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_below="@+id/tabs"

        android:clipToPadding="false"

        android:descendantFocusability="afterDescendants"

        launcher:pageIndicator="@+id/tabs">

res/layout/widgets_full_sheet_search_and_recommendations.xml

0 → 100644
+49 −0
Original line number Diff line number Diff line 
<?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.

-->

<LinearLayout

    xmlns:android="http://schemas.android.com/apk/res/android"

    android:id="@+id/search_and_recommendations_container"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:padding="16dp"

    android:orientation="vertical">

    <View

        android:id="@+id/collapse_handle"

        android:layout_width="48dp"

        android:layout_height="2dp"

        android:layout_gravity="center_horizontal"

        android:background="@color/popup_color_primary_dark"/>

    <TextView

        android:id="@+id/title"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:gravity="center_horizontal"

        android:textSize="24sp"

        android:layout_marginTop="16dp"

        android:text="@string/widget_button_text"/>

    <!-- Disable the search bar because it has not been implemented. -->

    <EditText

        android:id="@+id/widgets_search_bar"

        android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:visibility="gone"

        android:layout_marginTop="16dp"

        android:background="@drawable/bg_widgets_searchbox"

        android:drawablePadding="8dp"

        android:drawableStart="@drawable/ic_allapps_search"

        android:hint="@string/widgets_full_sheet_search_bar_hint"

        android:padding="12dp" />

</LinearLayout>

res/values/strings.xml

+6 −2
Original line number Diff line number Diff line
@@ -57,6 +57,12 @@ 
        <item quantity="one"><xliff:g id="widget_count" example="1">%1$d</xliff:g> widget</item>

        <item quantity="other"><xliff:g id="widget_count" example="2">%1$d</xliff:g> widgets</item>

    </plurals>

    <!-- Text for both the tile of a popup view, which shows all available widgets installed on

         the device, and the text of a button, which opens this popup view. [CHAR LIMIT=30]-->

    <string name="widget_button_text">Widgets</string>

    <!-- Search bar text shown in the popup view showing all available widgets installed on the

         device. [CHAR_LIMIT=50] -->

    <string name="widgets_full_sheet_search_bar_hint">Search</string>



    <!-- All Apps -->

    <!-- Search bar text in the apps view. [CHAR_LIMIT=50] -->
@@ -185,8 +191,6 @@ 
    <string name="folder_name_format_overflow">Folder: <xliff:g id="name" example="Games">%1$s</xliff:g>, <xliff:g id="size" example="2">%2$d</xliff:g> or more items</string>



    <!-- Strings for the customization mode -->

    <!-- Text for widget add button [CHAR LIMIT=30]-->

    <string name="widget_button_text">Widgets</string>

    <!-- Text for wallpaper change button [CHAR LIMIT=30]-->

    <string name="wallpaper_button_text">Wallpapers</string>

    <!-- Text for wallpaper change button [CHAR LIMIT=30]-->