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

Commit 36a51588 authored by Flavio Fiszman's avatar Flavio Fiszman Committed by Automerger Merge Worker
Browse files

Merge "Change People Tile config activity layout" into sc-dev am: 79b3f052 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13996771

Change-Id: I5d79b5fb81ba08dda107da47ce290dd982cabb43
parents bd327e07 79b3f052

packages/SystemUI/AndroidManifest.xml

+1 −1
Original line number Diff line number Diff line
@@ -583,7 +583,7 @@ 
            android:label="@string/people_tile_title"

            android:enabled="true"

            android:exported="true"

            android:theme="@android:style/Theme.Material.NoActionBar">

            android:theme="@style/Theme.PeopleTileConfigActivity">

            <intent-filter>

                <action android:name="android.appwidget.action.APPWIDGET_CONFIGURE"/>

            </intent-filter>

packages/SystemUI/res/drawable/people_space_activity_card.xml

+1 −2
Original line number Diff line number Diff line
@@ -14,6 +14,5 @@ 
  ~ limitations under the License.

  -->

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

    <solid android:color="?android:attr/colorAccent" />

    <corners android:radius="@dimen/people_space_widget_radius" />

    <solid android:color="?android:attr/colorBackgroundFloating" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/rounded_bg_full_large_radius.xml

0 → 100644
+20 −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="?android:attr/colorBackgroundFloating" />

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

</shape>

packages/SystemUI/res/layout/people_space_activity.xml

+88 −29
Original line number Diff line number Diff line
@@ -13,42 +13,101 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

<androidx.core.widget.NestedScrollView

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

    android:id="@+id/scroll"

    android:layout_width="match_parent"

    android:layout_height="match_parent">



<LinearLayout

        android:id="@+id/people_space_layout"

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

    android:id="@+id/top_level"

    android:layout_width="match_parent"

        android:layout_height="wrap_content"

        android:layout_marginTop="16dp"

    android:layout_height="match_parent"

    android:orientation="vertical"

        android:padding="24dp"

        android:clipChildren="false"

        android:clipToPadding="false">



    android:padding="8dp">

    <TextView

        android:id="@+id/select_conversation_title"

            android:gravity="center"

        android:text="@string/select_conversation_title"

        android:gravity="center"

        android:layout_width="wrap_content"

            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"

            android:textSize="24sp"

        android:layout_height="wrap_content"

            android:layout_gravity="center_horizontal"/>

        android:layout_gravity="center_horizontal"

        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"

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

        android:textSize="24sp"/>



    <TextView

        android:id="@+id/select_conversation"

            android:gravity="center"

        android:text="@string/select_conversation_text"

        android:gravity="center"

        android:layout_width="match_parent"

            android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"

            android:textSize="16sp"

        android:layout_height="wrap_content"

        android:layout_gravity="center_horizontal"

        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"

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

        android:textSize="16sp"

        android:padding="24dp" />



    <androidx.core.widget.NestedScrollView

        android:id="@+id/scroll_view"

        android:layout_width="match_parent"

        android:layout_height="match_parent">



        <LinearLayout

            android:id="@+id/scroll_layout"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

            android:layout_marginTop="16dp"

            android:orientation="vertical">



            <LinearLayout

                android:id="@+id/priority"

                android:orientation="vertical"

                android:layout_width="match_parent"

                android:layout_height="wrap_content"

                android:layout_marginBottom="35dp">

                <TextView

                    android:id="@+id/priority_header"

                    android:text="@string/priority_conversations"

                    android:layout_width="wrap_content"

                    android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"

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

                    android:textSize="14sp"

                    android:paddingStart="16dp"

                    android:layout_height="wrap_content"/>



                <LinearLayout

                    android:id="@+id/priority_tiles"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:layout_marginTop="10dp"

                    android:orientation="vertical"

                    android:background="@drawable/rounded_bg_full_large_radius"

                    android:clipToOutline="true">

                </LinearLayout>

            </LinearLayout>



            <LinearLayout

                android:id="@+id/recent"

                android:orientation="vertical"

                android:layout_width="match_parent"

                android:layout_height="wrap_content">

                <TextView

                    android:id="@+id/recent_header"

                    android:gravity="start"

                    android:text="@string/recent_conversations"

                    android:layout_width="wrap_content"

                    android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"

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

                    android:textSize="14sp"

                    android:paddingStart="16dp"

                    android:layout_height="wrap_content"/>



                <LinearLayout

                    android:id="@+id/recent_tiles"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"

                    android:layout_marginTop="10dp"

                    android:orientation="vertical"

                    android:background="@drawable/rounded_bg_full_large_radius"

                    android:clipToOutline="true">

                </LinearLayout>

            </LinearLayout>

        </LinearLayout>

    </androidx.core.widget.NestedScrollView>

</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/people_space_activity_list_divider.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.

-->

<View

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

    android:layout_width="match_parent"

    android:layout_height="2dp"

    android:background="?android:attr/colorBackground" />