Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Polish Configuration activity

Browse Source 
Change-Id: Iae9f224b4fe77876d4e23576bfebd400ba6df353
Test: manual
Bug: 183721209
This commit is contained in:
Flavio Fiszman
2021-06-15 10:50:49 +01:00
parent 271c600617
commit 91d0db2023
6 changed files with 16 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SystemUI/res/drawable/people_space_activity_card.xml
View File

@@ -1,18 +0,0 @@
<!--
~ 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>

3
packages/SystemUI/res/drawable/rounded_bg_full_large_radius.xml
View File

@@ -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>

12
packages/SystemUI/res/layout/people_space_activity.xml
View File

@@ -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"/>

1
packages/SystemUI/res/layout/people_space_activity_no_conversations.xml
View File

@@ -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" />

6
packages/SystemUI/res/layout/people_space_tile_view.xml
View File

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

4
packages/SystemUI/src/com/android/systemui/people/PeopleSpaceActivity.java
View File

@@ -91,8 +91,8 @@ public class PeopleSpaceActivity extends Activity {
// than the activity's background.
LinearLayout item = findViewById(R.id.item);
GradientDrawable shape = (GradientDrawable) item.getBackground();
final TypedArray ta = mContext.obtainStyledAttributes(
new int[]{android.R.attr.colorBackgroundFloating});
final TypedArray ta = mContext.getTheme().obtainStyledAttributes(
new int[]{com.android.internal.R.attr.colorSurface});
shape.setColor(ta.getColor(0, Color.WHITE));
return;
}