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

Merge "[Panlingual] Add a new layout for top intro on app preferences" into tm-dev am: af3351b539 am: b597bc267c

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

Change-Id: I23b61a85460f0fe4b2dfbc412b9b3ba4fde09612
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tom Hsu
2022-05-13 17:45:13 +00:00
committed by Automerger Merge Worker
parent ce303ca9a1 b597bc267c
commit b8d5211fca
4 changed files with 44 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
packages/SettingsLib/AppPreference/res/layout/preference_app_header.xml Normal file
View File

@@ -0,0 +1,36 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (C) 2022 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:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:paddingBottom="16dp"
android:paddingTop="8dp"
android:clickable="false">
<TextView
android:id="@+id/apps_top_intro_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textDirection="locale"
android:clickable="false"
android:longClickable="false"
android:textAppearance="@style/TextAppearance.TopIntroText" />
</LinearLayout>

7
packages/SettingsLib/SettingsTheme/res/values/styles.xml
View File

@@ -26,4 +26,11 @@
<style name="TextAppearance.CategoryTitle.SettingsLib"
parent="@android:style/TextAppearance.DeviceDefault.Medium">
</style>
<style name="TextAppearance.TopIntroText"
parent="@android:style/TextAppearance.DeviceDefault">
<item name="android:textSize">14sp</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
</resources>

1
packages/SettingsLib/TopIntroPreference/Android.bp
View File

@@ -16,6 +16,7 @@ android_library {
static_libs: [
"androidx.annotation_annotation",
"androidx.preference_preference",
"SettingsLibSettingsTheme",
],
sdk_version: "system_current",
min_sdk_version: "21",

23
packages/SettingsLib/TopIntroPreference/res/values/styles.xml
View File

@@ -1,23 +0,0 @@
<?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.
-->
<resources>
<style name="TextAppearance.TopIntroText"
parent="@android:style/TextAppearance.DeviceDefault">
<item name="android:textSize">14sp</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
</resources>