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

Commit d2526d6a authored by Steven Ng's avatar Steven Ng Committed by Android (Google) Code Review
Browse files

Merge "Make all widgets collapsed in the full widget picker by default" into sc-dev

parents 9dbb9fe8 e92bc55d

res/drawable/ic_expand_less.xml

0 → 100644
+25 −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.

-->

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?android:attr/textColorHint">

    <path

        android:fillColor="#FF000000"

        android:pathData="M18.59,16.41L20,15l-8,-8 -8,8 1.41,1.41L12,9.83"/>

</vector>

res/drawable/ic_expand_more.xml

0 → 100644
+25 −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.

-->

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

    android:width="24dp"

    android:height="24dp"

    android:viewportWidth="24"

    android:viewportHeight="24"

    android:tint="?android:attr/textColorHint">

    <path

        android:fillColor="#FF000000"

        android:pathData="M5.41,7.59L4,9l8,8 8,-8 -1.41,-1.41L12,14.17"/>

</vector>

res/drawable/widgets_tray_expand_button.xml

0 → 100644
+21 −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.

-->

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

    <item android:state_checked="true"

        android:drawable="@drawable/ic_expand_less" />

    <item android:state_checked="false"

        android:drawable="@drawable/ic_expand_more" />

</selector>

res/layout/widgets_list_row_header.xml

0 → 100644
+71 −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.

-->

<com.android.launcher3.widget.picker.WidgetsListHeader xmlns:android="http://schemas.android.com/apk/res/android"

    xmlns:tools="http://schemas.android.com/tools"

    android:id="@+id/widgets_list_header"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"

    android:background="?android:attr/selectableItemBackground"

    android:paddingVertical="20dp"

    android:orientation="horizontal">



    <ImageView

        android:id="@+id/app_icon"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_marginHorizontal="16dp"

        android:importantForAccessibility="no"

        tools:src="@drawable/ic_corp"/>



    <LinearLayout

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_weight="1"

        android:orientation="vertical"

        android:focusable="true"

        android:descendantFocusability="afterDescendants">



        <TextView

            android:id="@+id/app_title"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:layout_gravity="center_vertical"

            android:textColor="?android:attr/textColorPrimary"

            android:textSize="16sp"

            tools:text="App name" />



        <TextView

            android:id="@+id/app_subtitle"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            tools:text="n widgets" />



    </LinearLayout>



    <!-- This checkbox is not clickable. The outermost LinearLayout is responsible to handle all

         click event and update the checkbox state. -->

    <CheckBox

        android:id="@+id/toggle"

        android:layout_marginHorizontal="16dp"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_gravity="center_vertical"

        android:layout_alignParentEnd="true"

        android:clickable="false"

        android:button="@drawable/widgets_tray_expand_button"/>



</com.android.launcher3.widget.picker.WidgetsListHeader>
 
 No newline at end of file

res/values/attrs.xml

+4 −0
Original line number Diff line number Diff line
@@ -185,4 +185,8 @@ 
        <attr name="android:name" />

        <attr name="android:id" />

    </declare-styleable>



    <declare-styleable name="WidgetsListRowHeader">

        <attr name="appIconSize" format="dimension" />

    </declare-styleable>

</resources>