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

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

Merge "Polish Configuration activity" into sc-dev am: d15c6390 

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

Change-Id: I13506531a572f80d4713d9b5ee9798d50bf29895
parents a652e224 d15c6390

packages/SystemUI/res/drawable/people_space_activity_card.xml

deleted100644 → 0
+0 −18
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2020 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">

    <solid android:color="@color/people_tile_background" />

</shape>
 
 No newline at end of file

packages/SystemUI/res/drawable/rounded_bg_full_large_radius.xml

+2 −1
Original line number Diff line number Diff line
@@ -14,7 +14,8 @@ 
     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="rectangle">

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

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

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

</shape>

packages/SystemUI/res/layout/people_space_activity.xml

+7 −5
Original line number Diff line number Diff line
@@ -15,6 +15,7 @@ 
  -->

<LinearLayout

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

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

    android:id="@+id/top_level"

    android:layout_width="match_parent"

    android:layout_height="match_parent"
@@ -41,7 +42,8 @@ 
        android:textAppearance="@*android:style/TextAppearance.DeviceDefault.ListItem"

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

        android:textSize="16sp"

        android:padding="24dp" />

        android:paddingVertical="24dp"

        android:paddingHorizontal="48dp"/>



    <androidx.core.widget.NestedScrollView

        android:id="@+id/scroll_view"
@@ -65,8 +67,8 @@ 
                    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:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"

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

                    android:textSize="14sp"

                    android:paddingStart="16dp"

                    android:layout_height="wrap_content"/>
@@ -92,8 +94,8 @@ 
                    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:textAppearance="@*android:style/TextAppearance.DeviceDefault.Notification.Title"

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

                    android:textSize="14sp"

                    android:paddingStart="16dp"

                    android:layout_height="wrap_content"/>

packages/SystemUI/res/layout/people_space_activity_no_conversations.xml

+1 −0
Original line number Diff line number Diff line
@@ -55,6 +55,7 @@ 
        android:background="@drawable/rounded_bg_full_large_radius"

        android:onClick="dismissActivity"

        android:text="@string/okay"

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

        android:layout_marginBottom="60dp"

        android:layout_alignParentBottom="true" />

packages/SystemUI/res/layout/people_space_tile_view.xml

+4 −2
Original line number Diff line number Diff line
@@ -13,7 +13,9 @@ 
  ~ See the License for the specific language governing permissions and

  ~ limitations under the License.

  -->

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

<LinearLayout

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

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

    android:id="@+id/tile_view"

    android:layout_width="match_parent"

    android:layout_height="wrap_content"
@@ -21,7 +23,7 @@ 


    <LinearLayout

        android:orientation="vertical"

        android:background="@drawable/people_space_activity_card"

        android:background="?androidprv:attr/colorSurface"

        android:padding="12dp"

        android:elevation="4dp"

        android:layout_width="match_parent"