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

Commit a282614f authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Automerger Merge Worker
Browse files

Merge "Separate initial layout from placeholder layout" into sc-dev am: 0190323c 

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

Change-Id: If7af6c246141827b6d4e7dbc95379b9f7cfb58ed
parents 2ede2563 0190323c

packages/SystemUI/res/layout/people_space_initial_layout.xml

0 → 100644
+69 −0
Original line number Diff line number Diff line 
<!--

  ~ 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"

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

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">



    <LinearLayout

        android:background="@drawable/people_space_tile_view_card"

        android:id="@+id/item"

        android:orientation="horizontal"

        android:gravity="center"

        android:layout_gravity="top"

        android:paddingVertical="16dp"

        android:paddingHorizontal="16dp"

        android:layout_width="match_parent"

        android:layout_height="match_parent">



        <LinearLayout

            android:orientation="vertical"

            android:paddingEnd="20dp"

            android:gravity="bottom"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content">



            <ImageView

                android:background="@drawable/ic_person"

                android:layout_width="48dp"

                android:layout_height="48dp" />



            <TextView

                android:id="@+id/name"

                android:paddingTop="2dp"

                android:text="@string/empty_user_name"

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

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

                android:textSize="12sp"

                android:maxLines="1"

                android:ellipsize="end"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content" />

        </LinearLayout>



        <TextView

            android:text="@string/status_before_loading"

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

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

            android:textSize="12sp"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:maxLines="3"

            android:ellipsize="end" />

    </LinearLayout>

</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/people_space_placeholder_layout.xml

+36 −43
Original line number Diff line number Diff line
@@ -14,56 +14,51 @@ 
  ~ limitations under the License.

  -->

<LinearLayout 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:layout_width="match_parent"

    android:layout_height="match_parent"

    android:orientation="vertical">



    <LinearLayout

        android:background="@drawable/people_space_tile_view_card"

        android:id="@+id/item"

        android:orientation="vertical"

        android:layout_width="match_parent"

        android:layout_height="match_parent">



        <LinearLayout

        android:orientation="horizontal"

        android:gravity="center"

            android:paddingVertical="2dp"

            android:paddingHorizontal="8dp"

        android:layout_gravity="top"

        android:paddingVertical="16dp"

        android:paddingHorizontal="16dp"

        android:layout_width="match_parent"

        android:layout_height="match_parent">

            <ImageView

                android:background="@drawable/ic_person"

                android:id="@+id/person_icon_only"

                android:layout_width="60dp"

                android:layout_height="60dp"/>



        <LinearLayout

            android:orientation="vertical"

                android:paddingStart="8dp"

                android:layout_width="match_parent"

            android:paddingEnd="20dp"

            android:gravity="bottom"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content">



            <ImageView

                    android:id="@+id/availability"

                    android:layout_width="10dp"

                    android:layout_height="10dp"

                    android:background="@drawable/circle_green_10dp"/>

                android:background="@drawable/ic_person"

                android:layout_width="48dp"

                android:layout_height="48dp" />



            <TextView

                android:id="@+id/name"

                android:paddingTop="2dp"

                android:text="@string/empty_user_name"

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

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

                    android:textSize="14sp"

                android:textSize="12sp"

                android:maxLines="1"

                android:ellipsize="end"

                android:layout_width="wrap_content"

                android:layout_height="wrap_content" />

        </LinearLayout>



        <TextView

                    android:id="@+id/last_interaction"

            android:text="@string/empty_status"

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

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

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

            android:textSize="12sp"

            android:layout_width="wrap_content"
@@ -72,5 +67,3 @@ 
            android:ellipsize="end" />

    </LinearLayout>

</LinearLayout>
 
 No newline at end of file
 
    </LinearLayout>

</LinearLayout>
 
 No newline at end of file

packages/SystemUI/res/xml/people_space_widget_info.xml

+1 −1
Original line number Diff line number Diff line
@@ -26,5 +26,5 @@ 
    android:previewLayout="@layout/people_space_placeholder_layout"

    android:resizeMode="horizontal|vertical"

    android:configure="com.android.systemui.people.PeopleSpaceActivity"

    android:initialLayout="@layout/people_space_placeholder_layout">

    android:initialLayout="@layout/people_space_initial_layout">

</appwidget-provider>