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

Merge "Intro text now left aligned with header" into sc-dev am: 2441a6bb3a

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

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifc4395866f2ac3b8ca6b694ff25a6df977987a5c
This commit is contained in:
TreeHugger Robot
2021-02-22 10:17:16 +00:00
committed by Automerger Merge Worker
parent 55a6725e03 2441a6bb3a
commit 42889d3c68
2 changed files with 26 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
packages/SettingsLib/TopIntroPreference/res/layout/top_intro_preference.xml
View File

@@ -20,27 +20,11 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:minHeight="?android:attr/listPreferredItemHeight"
android:paddingStart="?android:attr/listPreferredItemPaddingStart"
android:paddingStart="20dp"
android:paddingEnd="?android:attr/listPreferredItemPaddingEnd"
android:background="?android:attr/selectableItemBackground"
android:clipToPadding="false">
<LinearLayout
android:id="@+id/icon_frame"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:minWidth="56dp"
android:gravity="start|top"
android:orientation="horizontal"
android:paddingEnd="12dp"
android:paddingTop="16dp"
android:paddingBottom="4dp">
<ImageView
android:id="@android:id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content" />
</LinearLayout>
<TextView
android:id="@android:id/title"
android:layout_width="wrap_content"
@@ -50,5 +34,5 @@
android:clickable="false"
android:longClickable="false"
android:maxLines="10"
android:textColor="?android:attr/textColorSecondary"/>
android:textAppearance="@style/TextAppearance.TopIntroText"/>
</LinearLayout>

24
packages/SettingsLib/TopIntroPreference/res/values/styles.xml Normal file
View File

@@ -0,0 +1,24 @@
<?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:fontFamily">@*android:string/config_headlineFontFamily</item>
<item name="android:textSize">14sp</item>
<item name="android:textColor">?android:attr/textColorSecondary</item>
</style>
</resources>