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

Commit 39b10194 authored by Flavio Fiszman's avatar Flavio Fiszman Committed by Automerger Merge Worker
Browse files

Merge "Decorating People Tile background" into sc-dev am: 7f5d243a am: 759f835b 

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

Change-Id: Ib668f56b7a35d29754f06044d65d7c3d3ee55956
parents 0fc8d6df 759f835b

packages/SystemUI/res/layout/people_tile_emoji_background_large.xml

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

 -->

<RelativeLayout

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

    android:id="@+id/emojis"

    android:theme="@android:style/Theme.DeviceDefault.DayNight"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingTop="10dp">

    <TextView

        android:id="@+id/emoji1"

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

        android:textSize="34sp"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentTop="true"

        android:layout_centerHorizontal="true"

        android:paddingStart="40dp"

        android:maxLines="1"

        android:alpha="0.2"/>

    <TextView

        android:id="@+id/emoji2"

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

        android:textSize="34sp"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_centerVertical="true"

        android:layout_alignParentStart="true"

        android:paddingTop="5dp"

        android:paddingStart="27dp"

        android:maxLines="1"

        android:alpha="0.2"/>

    <TextView

        android:id="@+id/emoji3"

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

        android:textSize="34sp"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentBottom="true"

        android:layout_alignParentEnd="true"

        android:paddingEnd="25dp"

        android:maxLines="1"

        android:alpha="0.2"/>

</RelativeLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/people_tile_emoji_background_medium.xml

0 → 100644
+58 −0
Original line number Original line 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/emojis"

    android:theme="@android:style/Theme.DeviceDefault.DayNight"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="horizontal"

    android:gravity="center_vertical">

    <TextView

        android:id="@+id/emoji1"

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

        android:textSize="27sp"

        android:paddingTop="-2dp"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="2"

        android:gravity="end"

        android:maxLines="1"

        android:alpha="0.2"/>

    <TextView

        android:id="@+id/emoji2"

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

        android:textSize="27sp"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:gravity="end"

        android:paddingTop="20dp"

        android:maxLines="1"

        android:alpha="0.2"/>

    <TextView

        android:id="@+id/emoji3"

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

        android:textSize="27sp"

        android:layout_width="0dp"

        android:layout_height="wrap_content"

        android:layout_weight="1"

        android:layout_gravity="top"

        android:paddingTop="10dp"

        android:maxLines="1"

        android:alpha="0.2"/>

</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/people_tile_large_with_content.xml

+63 −52
Original line number Original line Diff line number Diff line
@@ -67,7 +67,16 @@ 
            android:visibility="gone"

            android:visibility="gone"

            />

            />

    </RelativeLayout>

    </RelativeLayout>

    <RelativeLayout

        android:layout_width="match_parent"

        android:layout_height="match_parent">

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

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





        <LinearLayout

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:orientation="vertical">

        <TextView

        <TextView

            android:layout_gravity="center"

            android:layout_gravity="center"

            android:id="@+id/name"

            android:id="@+id/name"
@@ -132,3 +141,5 @@ 
            android:textColor="?android:attr/textColorPrimary"

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

            android:textSize="12sp" />

            android:textSize="12sp" />

        </LinearLayout>

        </LinearLayout>

    </RelativeLayout>

</LinearLayout>

packages/SystemUI/res/layout/people_tile_medium_with_content.xml

+102 −96
Original line number Original line Diff line number Diff line
@@ -21,8 +21,13 @@ 
    android:layout_width="match_parent"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">

    android:orientation="vertical">

    <LinearLayout

    <RelativeLayout

        android:background="@drawable/people_space_tile_view_card"

        android:background="@drawable/people_space_tile_view_card"

        android:layout_width="match_parent"

        android:layout_height="match_parent">

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

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

        <LinearLayout

            android:id="@+id/item"

            android:id="@+id/item"

            android:orientation="vertical"

            android:orientation="vertical"

            android:layout_gravity="center"

            android:layout_gravity="center"
@@ -137,5 +142,6 @@ 
                    android:layout_height="18dp" />

                    android:layout_height="18dp" />

            </LinearLayout>

            </LinearLayout>

        </LinearLayout>

        </LinearLayout>

    </RelativeLayout>

</LinearLayout>

</LinearLayout>

packages/SystemUI/res/layout/people_tile_punctuation_background_large.xml

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

 -->

<RelativeLayout

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

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

    android:theme="@android:style/Theme.DeviceDefault.DayNight"

    android:id="@+id/punctuations"

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:paddingTop="10dp">

    <TextView

        android:id="@+id/punctuation1"

        android:textColor="?androidprv:attr/colorSurfaceVariant"

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

        android:textSize="34sp"

        android:textStyle="bold"

        android:paddingTop="-2dp"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentTop="true"

        android:layout_centerHorizontal="true"

        android:maxLines="1"

        android:rotation="5"/>

    <TextView

        android:id="@+id/punctuation2"

        android:textColor="?androidprv:attr/colorSurfaceVariant"

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

        android:textSize="34sp"

        android:textStyle="bold"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_centerVertical="true"

        android:layout_alignParentStart="true"

        android:paddingTop="5dp"

        android:paddingStart="27dp"

        android:includeFontPadding="false"

        android:maxLines="1"

        android:rotation="350"/>

    <TextView

        android:id="@+id/punctuation3"

        android:textColor="?androidprv:attr/colorSurfaceVariant"

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

        android:textSize="34sp"

        android:textStyle="bold"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentBottom="true"

        android:layout_alignParentEnd="true"

        android:paddingEnd="25dp"

        android:includeFontPadding="false"

        android:maxLines="1"

        android:rotation="350"/>

    <TextView

        android:id="@+id/punctuation4"

        android:textColor="?androidprv:attr/colorSurfaceVariant"

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

        android:textSize="34sp"

        android:textStyle="bold"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentBottom="true"

        android:layout_alignParentStart="true"

        android:paddingStart="15dp"

        android:includeFontPadding="false"

        android:maxLines="1"

        android:rotation="10"/>

    <TextView

        android:id="@+id/punctuation5"

        android:textColor="?androidprv:attr/colorSurfaceVariant"

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

        android:textSize="34sp"

        android:textStyle="bold"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_alignParentTop="true"

        android:layout_alignParentEnd="true"

        android:paddingTop="15dp"

        android:includeFontPadding="false"

        android:maxLines="1"

        android:rotation="5"/>

    <TextView

        android:id="@+id/punctuation6"

        android:textColor="?androidprv:attr/colorSurfaceVariant"

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

        android:textSize="34sp"

        android:textStyle="bold"

        android:paddingStart="20dp"

        android:paddingTop="30dp"

        android:layout_width="wrap_content"

        android:layout_height="wrap_content"

        android:layout_centerVertical="true"

        android:layout_centerHorizontal="true"

        android:maxLines="1"

        android:rotation="350"/>

</RelativeLayout>
 
 No newline at end of file