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

Commit 30103c1c authored by Anna Zappone's avatar Anna Zappone Committed by Automerger Merge Worker
Browse files

Merge "UX polish updates" into sc-dev am: 0c94c3f6 

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

Change-Id: I8e9b176f911474992e6e1e5176aac0e61dcb5808
parents e878841f 0c94c3f6

packages/SystemUI/AndroidManifest.xml

+3 −1
Original line number Diff line number Diff line
@@ -588,13 +588,15 @@ 
            android:label="@string/people_tile_title"

            android:enabled="true"

            android:exported="true"

            android:windowDisablePreview="true"

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

            <intent-filter>

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

            </intent-filter>

        </activity>



        <activity android:name=".people.widget.LaunchConversationActivity" />

        <activity android:name=".people.widget.LaunchConversationActivity"

            android:windowDisablePreview="true" />



        <!-- People Space Widget -->

        <receiver

packages/SystemUI/res/drawable/circle_green_10dp.xml→packages/SystemUI/res/drawable/availability_dot_10dp.xml

+6 −4
Original line number Diff line number Diff line
@@ -15,8 +15,10 @@ 
  ~ limitations under the License.

  -->

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

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

    android:shape="oval">

    <size android:height="10dp"

    <size

        android:height="10dp"

        android:width="10dp" />

    <solid android:color="#34A853" />

    <solid android:color="?androidprv:attr/colorAccentPrimaryVariant" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/people_space_messages_count_background.xml

+3 −2
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

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

    <solid android:color="#9ED582" />

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

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

    <solid android:color="?androidprv:attr/colorAccentPrimary" />

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

</shape>

packages/SystemUI/res/layout/people_tile_large_empty.xml

+17 −21
Original line number Diff line number Diff line
@@ -14,30 +14,28 @@ 
  ~ limitations under the License.

  -->

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

    android:id="@+id/item"

    android:background="@drawable/people_space_tile_view_card"

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

    android:layout_width="match_parent"

    android:layout_height="match_parent">

    android:layout_height="match_parent"

    android:paddingHorizontal="16dp"

    android:paddingTop="14dp"

    android:paddingBottom="16dp">



    <LinearLayout

        android:id="@+id/item"

        android:layout_width="match_parent"

        android:layout_height="match_parent"

        android:layout_gravity="center"

        android:gravity="center"

        android:background="@drawable/people_space_tile_view_card"

        android:orientation="vertical"

        android:paddingHorizontal="16dp"

        android:paddingVertical="16dp">

        android:layout_height="wrap_content"

        android:gravity="top|center_horizontal"

        android:orientation="vertical">



        <ImageView

            android:id="@+id/person_icon"

            android:layout_gravity="center"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content" />



        <TextView

            android:id="@+id/name"

            android:layout_gravity="center"

            android:paddingTop="14dp"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"
@@ -45,24 +43,22 @@ 
            android:singleLine="true"

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

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

            android:textSize="16sp" />

            android:textSize="@dimen/name_text_size_for_large" />

        <TextView

            android:id="@+id/last_interaction"

            android:layout_gravity="center"

            android:text="@string/empty_status"

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

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

            android:textSize="14sp"

            android:textSize="@dimen/content_text_size_for_large"

            android:layout_width="wrap_content"

            android:layout_height="wrap_content"

            android:ellipsize="end"

            android:singleLine="true"/>

    </LinearLayout>

    <ImageView

        android:id="@+id/availability"

            android:layout_gravity="center"

        android:layout_gravity="bottom|center_horizontal"

        android:layout_width="10dp"

            android:layout_height="26dp"

            android:paddingTop="16dp"

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

    </LinearLayout>

        android:layout_height="10dp"

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

</FrameLayout>
 
 No newline at end of file

packages/SystemUI/res/layout/people_tile_large_with_content.xml

+109 −120
Original line number Diff line number Diff line
@@ -13,18 +13,7 @@ 
~ 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:background="@drawable/people_space_tile_view_card"

    android:id="@+id/item"

    android:clipToOutline="true"

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

    android:layout_gravity="center"

    android:layout_width="match_parent"

    android:layout_height="match_parent">



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



    <LinearLayout

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

    android:layout_width="match_parent"

    android:layout_height="match_parent"

    android:layout_gravity="center"
@@ -56,7 +45,7 @@ 
                android:layout_marginStart="-2dp"

                android:layout_width="10dp"

                android:layout_height="10dp"

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

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

        </LinearLayout>



        <TextView
@@ -83,25 +72,26 @@ 


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



            <LinearLayout

                android:id="@+id/content"

                android:layout_width="match_parent"

                android:layout_height="match_parent"

                android:orientation="vertical">



        <TextView

                    android:layout_gravity="center"

            android:layout_gravity="top"

            android:id="@+id/name"

            android:layout_width="match_parent"

            android:layout_height="wrap_content"

                    android:paddingBottom="12dp"

                    android:gravity="start"

            android:paddingBottom="@dimen/below_name_text_padding"

            android:gravity="start|top"

            android:singleLine="true"

            android:ellipsize="end"

            android:text="@string/empty_user_name"

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

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

                    android:textSize="14sp" />

            android:textSize="@dimen/name_text_size_for_content" />



        <LinearLayout

            android:id="@+id/content"

            android:layout_below="@id/name"

            android:layout_width="match_parent"

            android:layout_height="match_parent"

            android:orientation="vertical">



            <LinearLayout

                android:id="@+id/status_icon_and_label"
@@ -115,13 +105,13 @@ 
                    android:id="@+id/predefined_icon"

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

                    android:gravity="start|center_vertical"

                        android:paddingEnd="6dp"

                        android:layout_width="24dp"

                        android:layout_height="18dp" />

                    android:layout_width="@dimen/regular_predefined_icon"

                    android:layout_height="@dimen/regular_predefined_icon" />



                <TextView

                    android:layout_gravity="center"

                    android:id="@+id/subtext"

                    android:paddingBottom="4dp"

                    android:gravity="center_vertical"

                    android:layout_width="match_parent"

                    android:layout_height="wrap_content"
@@ -156,4 +146,3 @@ 
        </LinearLayout>

    </RelativeLayout>

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